Use the ruby_package when specified

protoc-gen-twirp_ruby/main.go

@@ -234,7 +234,9 @@ func (g *generator) toRubyType(protoType string) string {
 	}
 
 	var prefix string
-	if pkg := g.fileToGoPackageName[def.File]; pkg != "" {
+	if pkg := def.File.GetOptions().GetRubyPackage(); pkg != "" {
+		prefix = strings.Join(splitRubyConstants(pkg), "::") + "::"
+	} else if pkg := g.fileToGoPackageName[def.File]; pkg != "" {
 		prefix = strings.Join(splitRubyConstants(pkg), "::") + "::"
 	}
 

protoc-gen-twirp_ruby/main_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func loadTestPb(t *testing.T) []*descriptor.FileDescriptorProto {
-	f, err := ioutil.ReadFile(filepath.Join("testdata", "fileset.pb"))
+func loadTestPb(t *testing.T, file string) []*descriptor.FileDescriptorProto {
+	f, err := ioutil.ReadFile(filepath.Join("testdata", file))
 	require.NoError(t, err, "unable to read testdata protobuf file")
 
 	set := new(descriptor.FileDescriptorSet)
@@ -27,7 +27,7 @@ func loadTestPb(t *testing.T) []*descriptor.FileDescriptorProto {
 func testGenerator(t *testing.T) *generator {
 	genReq := &plugin_go.CodeGeneratorRequest{
 		FileToGenerate: []string{"rubytypes.proto"},
-		ProtoFile:      loadTestPb(t),
+		ProtoFile:      loadTestPb(t, "fileset.pb"),
 	}
 	return newGenerator(genReq)
 }
@@ -80,6 +80,20 @@ func TestToRubyType(t *testing.T) {
 			t.Errorf("expected %v; actual %v", tt.expected, actual)
 		}
 	}
+
+	t.Run("ruby_package", func(t *testing.T) {
+		gen := newGenerator(
+			&plugin_go.CodeGeneratorRequest{
+				FileToGenerate: []string{"ruby_package.proto"},
+				ProtoFile:      loadTestPb(t, "ruby_package.pb"),
+			},
+		)
+
+		actual := gen.toRubyType(".twirp.rubytypes.request")
+		if actual != "The::API::Request" {
+			t.Errorf("expected %v; actual %v", "The::API::Request", actual)
+		}
+	})
 }
 
 func TestSplitRubyConstants(t *testing.T) {

protoc-gen-twirp_ruby/testdata/gen.go

@@ -14,3 +14,4 @@
 package testdata
 
 //go:generate protoc --descriptor_set_out=fileset.pb --include_imports --include_source_info ./rubytypes.proto
+//go:generate protoc --descriptor_set_out=ruby_package.pb --include_imports --include_source_info ./ruby_package.proto

protoc-gen-twirp_ruby/testdata/ruby_package.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package twirp.rubytypes;
+
+option ruby_package = "The::API";
+
+message request {}