grpc-rest 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c3044d8f6813a33030d336a91e4d86b4305a781d178d85a07e5e287ab22264
-  data.tar.gz: 659013b9ab51cd05f4e1b9570eeb71fb48f07992bd0f1eba80eb37aca1093921
+  metadata.gz: 8851853946d82493dd832a39be201f3b5b0bc5e70c7837e9be7a3db4d1d30460
+  data.tar.gz: a44a3d29c174df98af07cc91693127fbfc8e6a5c42b282bb7119573af53e5d28
 SHA512:
-  metadata.gz: 04ed1b2acf85c8ec4c069195dd1cd8711e7b68209dcf24cf62a60e832c89158364946d4da72012cc2b7bc037b6f2ac06df36a33a5a43b956e12e7dfe1b9d393b
-  data.tar.gz: 64f846bc132c121521c4ba1c8c1189bfed3ebfc4c1ee78473fac297aba84b1254037922a08859f165569a366c23df2b6da0ea391e08ef1e50c4430db713b9f86
+  metadata.gz: dfa0ed32f96706a4d8e6b0bfccc72d2e0d018f64fa4e5e87372bc3527c7b7521d8b1aecc48520df695dda54ac717cc5d7440319ea767c075204464d1965c668c
+  data.tar.gz: bbaa98db8d37ec4b91325438422fa1681fc0a35186f3c3e427cd1cb933bceaba7f806fe9cbf4269f4bdbd7315bbe1870b28aae14f4c1d59294dc974333652c4c

data/.github/workflows/CI.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
+  test-go:
     runs-on: [ubuntu-latest]
     steps:
     - name: Checkout code
@@ -25,8 +25,22 @@ jobs:
     - run: git clean -f -d
     - run: cd protoc-gen-rails && go test ./...
 
+  test-ruby:
+    runs-on: [ubuntu-latest]
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.3'
+        bundler-cache: true
+    - run: bundle exec rspec
+
   build_and_deploy:
-    needs: test
+    needs: [test-go, test-ruby]
     runs-on: [ubuntu-latest]
     steps:
     - name: Checkout code

data/.gitignore

@@ -21,3 +21,5 @@
 go.work
 
 .idea
+log
+tmp

data/CHANGELOG

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 0.1.7 - 2024-04-09
+- Added tests.
+- Fixed some bugs around path globbing.
+
+# 0.1.6 - 2024-04-05
+- Fixed bug where a blank routes file would be emitted when no services were found.
+- Added a comment line indicating that files are auto-generated.
+
+# 0.1.5 - 2024-04-04
+- Parse Google Well Known Types (WKT) in request.
+
 # 0.1.4 - 2024-04-04
 - Remove geo-admin hardcoded requirement.
 - Use baked-in Protobuf initialization to support nested objects properly.

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,190 @@
+PATH
+  remote: .
+  specs:
+    grpc-rest (0.1.6)
+      grpc
+      rails (>= 6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.8.1)
+      actionview (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.8.1)
+      activesupport (= 7.0.8.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.8.1)
+      activesupport (= 7.0.8.1)
+      globalid (>= 0.3.6)
+    activemodel (7.0.8.1)
+      activesupport (= 7.0.8.1)
+    activerecord (7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+    activestorage (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    builder (3.2.4)
+    concurrent-ruby (1.2.3)
+    crass (1.0.6)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    erubi (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
+    googleapis-common-protos-types (1.14.0)
+      google-protobuf (~> 3.18)
+    grpc (1.62.0-arm64-darwin)
+      google-protobuf (~> 3.25)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.62.0-x86_64-linux)
+      google-protobuf (~> 3.25)
+      googleapis-common-protos-types (~> 1.0)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.0.0)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
+    net-imap (0.4.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.1)
+    nokogiri (1.16.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86_64-linux)
+      racc (~> 1.4)
+    racc (1.7.3)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.8.1)
+      actioncable (= 7.0.8.1)
+      actionmailbox (= 7.0.8.1)
+      actionmailer (= 7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actiontext (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      bundler (>= 1.15.0)
+      railties (= 7.0.8.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.2.1)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.13)
+
+PLATFORMS
+  arm64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  grpc-rest!
+  rspec-rails
+
+BUNDLED WITH
+   2.5.6

data/README.md

@@ -79,7 +79,7 @@ plugins:
   - name: rails
     out: .
 ```
-    
+
 Then, you can run `buf generate` to generate the Ruby files. This will generate:
 * the Protobuf Ruby files for grpc, in `app/gen`
 * A new route file, in `config/routes/grpc.rb`
@@ -126,40 +126,24 @@ Rails.application.routes.draw do
 end
 ```
 
-### Hooking up Callbacks
-
-If you're using [gruf](https://github.com/bigcommerce/gruf), as long as your Gruf controllers are loaded on application load, you don't have to do anything else - grpc-rest will automatically hook the callbacks up. If you're not, you have to tell GrpcRest about your server. An example might look like this:
-
-```ruby
-# grpc_setup.rb, a shared library file somewhere in the app
-
-def grpc_server
-  s = GRPC::RpcServer.new
-  s.handle(MyImpl.new) # handler inheriting from your service class - see https://grpc.io/docs/languages/ruby/basics/
-  s
-end
-
-# startup script for gRPC
+## Caveats
 
-require "grpc_setup"
-server = grpc_server
-server.run_till_terminated_or_interrupted([1, 'int', 'SIGQUIT'])
-
-# Rails initializer
-require "grpc_setup"
-server = grpc_server
-GrpcRest.register_server(server)
-```
+This gem does not currently support the full path expression capabilities of grpc-gateway or the Google [http proto](https://github.com/googleapis/googleapis/blob/master/google/api/http.proto). It only supports very basic single wildcard globbing (`*`). Contributions are welcome for more complex cases if they are needed.
 
 ## To Do
 
-* Support repeated fields via comma-separation (matches grpc-gateway, but is it really useful?)
-* Install via homebrew and/or have the binary in the gem itself
+* Replace Go implementation with Ruby (+ executable) once [service and method lookup](https://github.com/protocolbuffers/protobuf/pull/15817) is released.
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/flipp-oss/grpc-rest.
 
+To regenerate Ruby protobuf code for tests, install the `grpc-tools` gem and run this from the base directory:
+
+```
+grpc_tools_ruby_protoc -I=./protoc-gen-rails/testdata --proto_path=./protoc-gen-rails/google-deps --ruby_out=./spec --grpc_out=./spec ./protoc-gen-rails/testdata/test_service.proto
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/grpc-rest.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency('grpc')
   spec.add_runtime_dependency('rails', '>= 6.0')
+
+  spec.add_development_dependency('rspec-rails')
 end

data/lib/grpc_rest/version.rb

@@ -1,3 +1,3 @@
 module GrpcRest
-  VERSION = "0.1.4"
+  VERSION = "0.1.7"
 end

data/lib/grpc_rest.rb

@@ -1,17 +1,16 @@
+require 'google/protobuf/well_known_types'
+require 'grpc'
+
 module GrpcRest
   class << self
 
-    def register_server(server)
-      @server = server
-    end
-
     def underscore(s)
       GRPC::GenericService.underscore(s)
     end
 
     # Gets a sub record from a proto. If it doesn't exist, initialize it and set it to the proto,
     # then return it.
-    def sub_field(proto, name)
+    def sub_field(proto, name, parameters)
       existing = proto.public_send(name.to_sym)
       return existing if existing
 
@@ -19,7 +18,11 @@ module GrpcRest
       return nil if descriptor.nil?
 
       klass = descriptor.submsg_name.split('.').map(&:camelize).join('::').constantize
-      sub_record = klass.new
+      params = klass.descriptor.to_a.map(&:name).to_h do |key|
+        [key, parameters.delete(key)]
+      end
+
+      sub_record = klass.new(params)
       proto.public_send(:"#{name}=", sub_record)
       sub_record
     end
@@ -27,12 +30,42 @@ module GrpcRest
     def assign_value(proto, path, value)
       tokens = path.split('.')
       tokens[0...-1].each do |path_seg|
-        proto = sub_field(proto, path_seg)
+        proto = sub_field(proto, path_seg, {})
         return if proto.nil?
       end
       proto.public_send(:"#{tokens.last}=", value) if proto.respond_to?(:"#{tokens.last}=")
     end
 
+    def map_wkt(proto, params)
+      proto.to_a.each do |descriptor|
+        field = descriptor.name
+        val = params[field]
+        next if val.nil?
+
+        case descriptor.subtype&.name
+        when 'google.protobuf.Struct'
+          params[field] = Google::Protobuf::Struct.from_hash(val)
+        when 'google.protobuf.Timestamp'
+          if val.is_a?(Numeric)
+            params[field] = Google::Protobuf::Timestamp.from_time(Time.at(val))
+          else
+            params[field] = Google::Protobuf::Timestamp.from_time(Time.new(val))
+          end
+        when 'google.protobuf.Value'
+          params[field] = Google::Protobuf::Value.from_ruby(val)
+        when 'google.protobuf.ListValue'
+          params[field] = Google::Protobuf::ListValue.from_a(val)
+        else
+          map_wkt(descriptor.subtype, params[field]) if descriptor.subtype
+        end
+      end
+    end
+
+    def init_request(request_class, params)
+      map_wkt(request_class.descriptor, params)
+      request_class.new(params)
+    end
+
     def assign_params(request, param_hash, body_string, params)
       parameters = params.to_h.deep_dup
       # each instance of {variable} means that we set the corresponding param variable into the
@@ -45,16 +78,14 @@ module GrpcRest
         name_tokens = entry[:split_name]
         value_to_use = parameters.delete(name_tokens.last)
         if entry[:val]
-          value_to_use = value_to_use.gsub('*', entry[:val])
+          regex = entry[:val].tr('*', '')
+          value_to_use = value_to_use.gsub(regex, '')
         end
         assign_value(request, entry[:name], value_to_use)
       end
       if body_string.present? && body_string != '*'
         # we need to "splat" the body parameters into the given sub-record rather than into the top-level.
-        sub_record = sub_field(request, body_string)
-        sub_record.class.descriptor.to_a.map(&:name).each do |key|
-          sub_record.public_send(:"#{key}=", parameters.delete(key))
-        end
+        sub_record = sub_field(request, body_string, parameters)
       end
     end
 
@@ -83,11 +114,8 @@ module GrpcRest
     end
 
     def send_grpc_request(service, method, request)
-      server_parts = service.split('::')
-      service_name = (server_parts[..-2].map { |p| underscore(p)} + [server_parts[-1]]).join('.')
-      route = "/#{service_name}/#{method.classify}"
-      handler = @server.send(:rpc_handlers)[route.to_sym]
-      handler.call(request)
+      klass = service.constantize::Service.subclasses.first
+      klass.new.public_send(method, request)
     end
 
     def send_request(service, method, request)

data/protoc-gen-rails/internal/output.go

@@ -39,6 +39,8 @@ type Route struct {
 }
 
 var controllerTemplate = `
+####### THIS FILE IS AUTOMATICALLY GENERATED BY protoc-gen-rails. DO NOT MODIFY. #######
+
 require 'grpc_rest'
 class {{.ControllerName}}Controller < ActionController::Base
   protect_from_forgery with: :null_session
@@ -59,7 +61,7 @@ class {{.ControllerName}}Controller < ActionController::Base
 {{range .Methods }}
 	def {{.Name}}
     fields = {{.RequestType}}.descriptor.to_a.map(&:name)
-    grpc_request = {{.RequestType}}.new(request.parameters.to_h.slice(*fields))
+    grpc_request = GrpcRest.init_request({{.RequestType}}, request.parameters.to_h.slice(*fields))
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["{{.Name}}"], "{{.Body}}", request.parameters)
     render json: GrpcRest.send_request("{{$fullServiceName}}", "{{.Name}}", grpc_request)
   end
@@ -116,9 +118,12 @@ func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (F
 	}, routes, nil
 }
 
-var routeTemplate = `
+var routeTemplate = `# frozen_string_literal: true
+
+####### THIS FILE IS AUTOMATICALLY GENERATED BY protoc-gen-rails. DO NOT MODIFY. #######
+
 {{range . -}}
-{{.HttpMethod}} "{{.Path}}" => "{{.Controller}}#{{.MethodName}}"
+{{.HttpMethod}} '{{.Path}}' => '{{.Controller}}#{{.MethodName}}'
 {{end -}}
 `
 

data/protoc-gen-rails/internal/utils.go

@@ -51,7 +51,7 @@ func SanitizePath(s string) string {
 		if dot != -1 {
 			repl = repl[dot+1:]
 		}
-		s = strings.Replace(s, match[0], ":"+repl, 1)
+		s = strings.Replace(s, match[0], "*"+repl, 1)
 	}
   return s
 }

data/protoc-gen-rails/main.go

@@ -49,11 +49,13 @@ func main() {
 			files = append(files, fileResult)
 		}
 	}
-	routeOutput, err := routeFile()
-	if err != nil {
-		log.Fatalf("%s", fmt.Errorf("error processing routes: %w", err))
+	if len(files) > 0 {
+		routeOutput, err := routeFile()
+		if err != nil {
+			log.Fatalf("%s", fmt.Errorf("error processing routes: %w", err))
+		}
+		files = append(files, routeOutput)
 	}
-	files = append(files, routeOutput)
 
 	// process registry
 	writeResponse(files)

data/protoc-gen-rails/main_test.go

@@ -33,7 +33,9 @@ func fileNames(directory string, appendDirectory bool, extension string) ([]stri
             return nil
         }
         files = append(files, info)
-        fullPaths = append(fullPaths, path)
+        if info.Name() != ".keep" {
+            fullPaths = append(fullPaths, path)
+        }
         if err != nil {
             fmt.Println("ERROR:", err)
         }
@@ -89,6 +91,25 @@ func Test_Base(t *testing.T) {
     runTest(t, "base", map[string]string{})
 }
 
+func Test_NoServices(t *testing.T) {
+    workdir, _ := os.Getwd()
+    tmpdir, err := os.MkdirTemp(workdir, "proto-test.")
+    if err != nil {
+        t.Fatal(err)
+    }
+    defer os.RemoveAll(tmpdir)
+
+    args := []string{
+        "-I.",
+        "--rails_out=" + tmpdir,
+    }
+    args = append(args, fmt.Sprintf("testdata/test.proto"))
+    protoc(t, args)
+
+    testDir := workdir + "/testdata/no_service"
+    assertEqualFiles(t, testDir, tmpdir)
+}
+
 func assertEqualFiles(t *testing.T, original, generated string) {
     names, err := fileNames(original, false, "")
     if err != nil {

data/protoc-gen-rails/testdata/base/app/controllers/my_service_controller.rb

@@ -1,4 +1,6 @@
 
+####### THIS FILE IS AUTOMATICALLY GENERATED BY protoc-gen-rails. DO NOT MODIFY. #######
+
 require 'grpc_rest'
 class MyServiceController < ActionController::Base
   protect_from_forgery with: :null_session
@@ -9,8 +11,7 @@ class MyServiceController < ActionController::Base
   METHOD_PARAM_MAP = {
 
     "test" => [
-       {name: "blah", val: "foobar/*", split_name:["blah"]},
-			 {name: "repeated_string", val: nil, split_name:["repeated_string"]},
+       {name: "foobar", val: "blah/*", split_name:["foobar"]},
 			 ],
 
     "test_2" => [
@@ -19,27 +20,37 @@ class MyServiceController < ActionController::Base
     "test_3" => [
        {name: "sub_record.sub_id", val: nil, split_name:["sub_record","sub_id"]},
 			 ],
+
+    "test_4" => [
+       ],
 }.freeze
 
 	def test
     fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
-    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
-    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "*", request.parameters)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request)
   end
 
 	def test_2
     fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
-    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_2"], "second_record", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_2", grpc_request)
   end
 
 	def test_3
     fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
-    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_3"], "", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_3", grpc_request)
   end
 
+	def test_4
+    fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_4"], "*", request.parameters)
+    render json: GrpcRest.send_request("Testdata::MyService", "test_4", grpc_request)
+  end
+
 end

data/protoc-gen-rails/testdata/base/config/routes/grpc.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
 
-get "/test/:blah/:repeated_string" => "my_service#test"
-post "/test2" => "my_service#test_2"
-post "/test3/:sub_id" => "my_service#test_3"
+####### THIS FILE IS AUTOMATICALLY GENERATED BY protoc-gen-rails. DO NOT MODIFY. #######
+
+get '/test/*foobar' => 'my_service#test'
+post '/test2' => 'my_service#test_2'
+post '/test3/*sub_id' => 'my_service#test_3'
+post '/test4' => 'my_service#test_4'

data/protoc-gen-rails/testdata/test.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+package test;
+
+message Test {
+  string test = 1;
+}

data/protoc-gen-rails/testdata/test_service.proto

@@ -3,6 +3,8 @@ syntax = "proto3";
 package testdata;
 
 import "google/api/annotations.proto";
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
 
 message TestRequest {
   string test_id = 1;
@@ -10,6 +12,10 @@ message TestRequest {
   repeated string repeated_string = 3;
   SubRecord sub_record = 4;
   SubRecord second_record = 5;
+  google.protobuf.Struct struct_field = 6;
+  google.protobuf.Timestamp timestamp_field = 7;
+  google.protobuf.ListValue list_value = 8;
+  google.protobuf.Value bare_value = 9;
 }
 
 message SubRecord {
@@ -25,8 +31,7 @@ message TestResponse {
 service MyService {
   rpc Test(TestRequest) returns (TestResponse) {
     option (google.api.http) = {
-      get: "/test/{blah=foobar/*}/{repeated_string}"
-      body: "*"
+      get: "/test/{foobar=blah/*}"
     };
   }
 
@@ -43,4 +48,11 @@ service MyService {
     };
   }
 
+  rpc Test4(TestRequest) returns (TestResponse) {
+    option (google.api.http) = {
+      post: "/test4",
+      body: '*'
+    };
+  }
+
 }

data/spec/grpc_rest_spec.rb

@@ -0,0 +1,117 @@
+# See https://github.com/rspec/rspec-rails/issues/1596#issuecomment-834282306
+
+require_relative './spec_helper'
+require_relative './test_service_services_pb'
+
+class ServerImpl < Testdata::MyService::Service
+  def test(req)
+    Testdata::TestResponse.new(some_int: 1, full_response: req.to_json)
+  end
+
+  def test_2(req)
+    Testdata::TestResponse.new(some_int: 2, full_response: req.to_json)
+  end
+
+  def test_3(req)
+    Testdata::TestResponse.new(some_int: 3, full_response: req.to_json)
+  end
+
+  def test_4(req)
+    Testdata::TestResponse.new(some_int: 4, full_response: req.to_json)
+  end
+end
+
+RSpec.describe MyServiceController, type: :request do
+
+  describe 'using get' do
+    it 'should be successful' do
+      get "/test/blah/xyz?test_id=abc"
+      expect(response).to be_successful
+      expect(response.parsed_body).to eq({
+                                           'some_int' => 1,
+                                           'full_response' => %({"testId":"abc","foobar":"xyz"})
+                                         })
+    end
+  end
+
+  describe 'using body parameter' do
+    it "should be successful" do
+      params = {
+        sub_id: "id1",
+        another_id: "id2"
+      }
+
+      post '/test2?test_id=abc&foobar=xyz&timestamp_field=2024-04-03+01:02:03+UTC', params: params, as: :json
+      expect(response).to be_successful
+      expect(response.parsed_body).to eq({
+                                           'some_int' => 2,
+                                           'full_response' => %({"testId":"abc","foobar":"xyz","secondRecord":{"subId":"id1","anotherId":"id2"},"timestampField":"2024-04-03T01:02:03Z"})
+                                         })
+    end
+
+  end
+
+  describe 'using sub-record splat' do
+    it 'should be successful' do
+      post '/test3/xyz?test_id=abc'
+      expect(response).to be_successful
+      expect(response.parsed_body).to eq({
+                                           'some_int' => 3,
+                                           'full_response' => %({"testId":"abc","subRecord":{"subId":"xyz"}})
+                                         })
+    end
+  end
+
+  describe 'full body splat' do
+    it 'should be successful' do
+      params = {
+        test_id: 'abc',
+        foobar: 'xyz',
+        repeated_string: ['W', 'T', 'F'],
+        sub_record: {
+          sub_id: 'id1',
+          another_id: 'id2'
+        },
+        second_record: {
+          sub_id: 'id3',
+          another_id: 'id4'
+        },
+        struct_field: {
+          "str_key": "val",
+          "int_key": 123,
+          "bool_key": true,
+          "nil_key": nil,
+          "list_key": [
+                       {
+                         "inner_key": "inner_val"
+                       }
+                     ]
+        },
+        list_value: ['F', 'Y', 'I'],
+        bare_value: 45,
+        timestamp_field: '2024-04-03 01:02:03 UTC',
+      }
+      post '/test4', params: params, as: :json
+      expect(response).to be_successful
+      expect(response.parsed_body).to eq({
+                                           'some_int' => 4,
+                                           'full_response' => %({"testId":"abc","foobar":"xyz","repeatedString":["W","T","F"],"subRecord":{"subId":"id1","anotherId":"id2"},"secondRecord":{"subId":"id3","anotherId":"id4"},"structField":{"bool_key":true,"str_key":"val","nil_key":null,"list_key":[{"inner_key":"inner_val"}],"int_key":123},"timestampField":"2024-04-03T01:02:03Z","listValue":["F","Y","I"],"bareValue":45})
+                                         })
+    end
+  end
+
+  describe 'numeric timestamp' do
+    it 'should be successful' do
+      params = {
+        timestamp_field: 1712692452
+      }
+      post "/test4", params: params, as: :json
+      expect(response).to be_successful
+      expect(response.parsed_body).to eq({
+                                           'some_int' => 4,
+                                           'full_response' => %({"timestampField":"2024-04-09T19:54:12Z"})
+                                         })
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "action_controller/railtie"
+
+class GrpcApp < Rails::Application
+  initializer(:host_config) do
+    Rails.application.config.hosts << "www.example.com"
+  end
+end
+GrpcApp.initialize!
+
+require 'rspec/rails'
+
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+
+RSpec.configure do |config|
+  config.full_backtrace = true
+  config.render_views
+
+  config.mock_with(:rspec) do |mocks|
+    mocks.yield_receiver_to_any_instance_implementation_blocks = true
+    mocks.verify_partial_doubles = true
+  end
+end
+
+require_relative '../protoc-gen-rails/testdata/base/app/controllers/my_service_controller'
+Rails.application.routes.draw_paths.push("#{Rails.root}/protoc-gen-rails/testdata/base/config/routes")
+Rails.application.routes.draw do
+  draw(:grpc)
+end

data/spec/test_service_pb.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: test_service.proto
+
+require 'google/protobuf'
+
+require 'google/api/annotations_pb'
+require 'google/protobuf/struct_pb'
+require 'google/protobuf/timestamp_pb'
+
+
+descriptor_data = "\n\x12test_service.proto\x12\x08testdata\x1a\x1cgoogle/api/annotations.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xdc\x02\n\x0bTestRequest\x12\x0f\n\x07test_id\x18\x01 \x01(\t\x12\x0e\n\x06\x66oobar\x18\x02 \x01(\t\x12\x17\n\x0frepeated_string\x18\x03 \x03(\t\x12\'\n\nsub_record\x18\x04 \x01(\x0b\x32\x13.testdata.SubRecord\x12*\n\rsecond_record\x18\x05 \x01(\x0b\x32\x13.testdata.SubRecord\x12-\n\x0cstruct_field\x18\x06 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x33\n\x0ftimestamp_field\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nlist_value\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.ListValue\x12*\n\nbare_value\x18\t \x01(\x0b\x32\x16.google.protobuf.Value\"/\n\tSubRecord\x12\x0e\n\x06sub_id\x18\x01 \x01(\t\x12\x12\n\nanother_id\x18\x02 \x01(\t\"7\n\x0cTestResponse\x12\x10\n\x08some_int\x18\x01 \x01(\x05\x12\x15\n\rfull_response\x18\x02 \x01(\t2\xdf\x02\n\tMyService\x12T\n\x04Test\x12\x15.testdata.TestRequest\x1a\x16.testdata.TestResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/test/{foobar=blah/*}\x12U\n\x05Test2\x12\x15.testdata.TestRequest\x1a\x16.testdata.TestResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\"\x06/test2:\rsecond_record\x12Z\n\x05Test3\x12\x15.testdata.TestRequest\x1a\x16.testdata.TestResponse\"\"\x82\xd3\xe4\x93\x02\x1c\"\x1a/test3/{sub_record.sub_id}\x12I\n\x05Test4\x12\x15.testdata.TestRequest\x1a\x16.testdata.TestResponse\"\x11\x82\xd3\xe4\x93\x02\x0b\"\x06/test4:\x01*b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.protobuf.Struct", "google/protobuf/struct.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
+    end
+  end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
+end
+
+module Testdata
+  TestRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("testdata.TestRequest").msgclass
+  SubRecord = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("testdata.SubRecord").msgclass
+  TestResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("testdata.TestResponse").msgclass
+end

data/spec/test_service_services_pb.rb

@@ -0,0 +1,25 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: test_service.proto for package 'testdata'
+
+require 'grpc'
+require 'test_service_pb'
+
+module Testdata
+  module MyService
+    class Service
+
+      include ::GRPC::GenericService
+
+      self.marshal_class_method = :encode
+      self.unmarshal_class_method = :decode
+      self.service_name = 'testdata.MyService'
+
+      rpc :Test, ::Testdata::TestRequest, ::Testdata::TestResponse
+      rpc :Test2, ::Testdata::TestRequest, ::Testdata::TestResponse
+      rpc :Test3, ::Testdata::TestRequest, ::Testdata::TestResponse
+      rpc :Test4, ::Testdata::TestRequest, ::Testdata::TestResponse
+    end
+
+    Stub = Service.rpc_stub_class
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - daniel.orner@flipp.com
@@ -49,6 +63,8 @@ files:
 - ".gitignore"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
+- Gemfile
+- Gemfile.lock
 - README.md
 - grpc-rest.gemspec
 - lib/grpc_rest.rb
@@ -66,7 +82,13 @@ files:
 - protoc-gen-rails/main_test.go
 - protoc-gen-rails/testdata/base/app/controllers/my_service_controller.rb
 - protoc-gen-rails/testdata/base/config/routes/grpc.rb
+- protoc-gen-rails/testdata/no_service/.keep
+- protoc-gen-rails/testdata/test.proto
 - protoc-gen-rails/testdata/test_service.proto
+- spec/grpc_rest_spec.rb
+- spec/spec_helper.rb
+- spec/test_service_pb.rb
+- spec/test_service_services_pb.rb
 homepage: ''
 licenses:
 - MIT
@@ -90,4 +112,8 @@ rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Generate Rails controllers and routes from gRPC definitions.
-test_files: []
+test_files:
+- spec/grpc_rest_spec.rb
+- spec/spec_helper.rb
+- spec/test_service_pb.rb
+- spec/test_service_services_pb.rb