grpc-rest 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c3044d8f6813a33030d336a91e4d86b4305a781d178d85a07e5e287ab22264
-  data.tar.gz: 659013b9ab51cd05f4e1b9570eeb71fb48f07992bd0f1eba80eb37aca1093921
+  metadata.gz: 3ed7db60b29738e635e7b776539fc8207a5ec264e43912cb83562b1a44efdc58
+  data.tar.gz: a1653a18dab17be5abad7968ae405254ccc23973f799f9c7def7cd318b485681
 SHA512:
-  metadata.gz: 04ed1b2acf85c8ec4c069195dd1cd8711e7b68209dcf24cf62a60e832c89158364946d4da72012cc2b7bc037b6f2ac06df36a33a5a43b956e12e7dfe1b9d393b
-  data.tar.gz: 64f846bc132c121521c4ba1c8c1189bfed3ebfc4c1ee78473fac297aba84b1254037922a08859f165569a366c23df2b6da0ea391e08ef1e50c4430db713b9f86
+  metadata.gz: 04b70b84065aa66b4441a4987519a351e0cafca0b58d5392a4e3a5a3b64429ca6bc4d6be877dfcf28f3c34fd77b04f7592500d89989737eab513b7c40591580f
+  data.tar.gz: fd35771ff21bbd7dc98550633a0eb96cb44b518f3356f792ce92dc02e9655f2683d0eab08bc1d36a1f8abf36f23fbabdd68e8bdb7f0dd4423ad311a27e7f80e6

data/CHANGELOG

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 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/lib/grpc_rest/version.rb

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

data/lib/grpc_rest.rb

@@ -33,6 +33,29 @@ module GrpcRest
       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
+        case descriptor.subtype&.name
+        when 'google.protobuf.Struct'
+          params[field] = Google::Protobuf::Struct.from_hash(params[field])
+        when 'google.protobuf.Timestamp'
+          params[field] = Google::Protobuf::Timestamp.from_time(Time.new(params[field]))
+        when 'google.protobuf.Value'
+          params[field] = Google::Protobuf::Value.from_ruby(params[field])
+        when 'google.protobuf.ListValue'
+          params[field] = Google::Protobuf::ListValue.from_a(params[field])
+        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

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

@@ -59,7 +59,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

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

@@ -23,21 +23,21 @@ class MyServiceController < ActionController::Base
 
 	def test
     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"], "*", 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Orner