protoc-gen-twirp_ruby: obey ruby_package

Gopkg.toml

@@ -0,0 +1,42 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "1.3.1"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.1"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.3.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

internal/gen/typemap/testdata/gen.go

@@ -0,0 +1,16 @@
+// Copyright 2018 Twitch Interactive, Inc.  All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may not
+// use this file except in compliance with the License. A copy of the License is
+// located at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// or in the "license" file accompanying this file. This file is distributed on
+// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package testdata
+
+//go:generate protoc --descriptor_set_out=fileset.pb --include_imports --include_source_info ./service.proto

internal/gen/typemap/testdata/importer.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package twirp.internal.gen.typemap.testdata.importer;
+
+import "root_pkg.proto";
+
+message ImporterMsg {
+  root_pkg.RootMsg a = 1;
+
+  message ImporterInner {}
+}

internal/gen/typemap/testdata/public_importer.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package twirp.internal.gen.typemap.testdata.public_importer;
+
+import public "root_pkg.proto";
+import public "importer.proto";
+
+message PublicImporterMsgA {
+  importer.ImporterMsg a = 1;
+}
+
+message PublicImporterMsgB {
+  root_pkg.RootMsg a = 1;
+}

internal/gen/typemap/testdata/public_reimporter.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package twirp.internal.gen.typemap.testdata.public_reimporter;
+
+import public "public_importer.proto";
+
+message PublicReimporterMsg {
+  public_importer.PublicImporterMsgA a = 1;
+  public_importer.PublicImporterMsgB b = 2;
+  root_pkg.RootMsg c = 3;
+  importer.ImporterMsg d = 4;
+}

internal/gen/typemap/testdata/root_pkg.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+package twirp.internal.gen.typemap.testdata.root_pkg;
+
+// RootMsg leading
+message RootMsg {}

internal/gen/typemap/testdata/service.proto

@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package twirp.internal.gen.typemap.testdata.public_reimporter;
+
+import public "public_reimporter.proto";
+
+message ServiceMsg {
+  public_importer.PublicImporterMsgA a = 1;
+  public_importer.PublicImporterMsgB b = 2;
+  root_pkg.RootMsg c = 3;
+  importer.ImporterMsg d = 4;
+}
+
+message Parent {
+  message NestedOuter{
+    message NestedInner{}
+  }
+}
+
+service EmptyService {}
+
+service ServiceWithOneMethod{
+  // Method1 leading
+  rpc Method1(root_pkg.RootMsg) returns (importer.ImporterMsg);
+  // Method1 trailing
+}
+
+// ServiceWithManyMethods leading
+service ServiceWithManyMethods{
+  // Method1 leading
+  rpc Method1(root_pkg.RootMsg) returns (importer.ImporterMsg);
+  // Method2 leading
+  rpc Method2(Parent) returns (Parent.NestedOuter);
+  // Method2 trailing
+
+  rpc Method3(importer.ImporterMsg.ImporterInner) returns (Parent.NestedOuter.NestedInner);
+}