grpc-rest 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3dc93105554c8c92a3229f693ab0c93ed5833796ef7b7f11e94cb8821f2c425
-  data.tar.gz: ac3ec407c674d16fb33e6bddccfa10b9e66859af3d5ecbad58d1ff2603e7c098
+  metadata.gz: 3ed7db60b29738e635e7b776539fc8207a5ec264e43912cb83562b1a44efdc58
+  data.tar.gz: a1653a18dab17be5abad7968ae405254ccc23973f799f9c7def7cd318b485681
 SHA512:
-  metadata.gz: b1c05d823f083722774025bf8772d535b211b4ef01f3022baa92003a179ab2f3c1fcd6646c6b7eb5acf9ced1ff5abd3e962eea541ddfa7c0d9766bcc2649cb44
-  data.tar.gz: c4c40a55b73429c7716ed2e6164c546f8d1c2e53030d6b1182475b66ec430590c637c691bac7af21294a62b39782a4ecc2d332c4afa68879cef4b803a170beb1
+  metadata.gz: 04b70b84065aa66b4441a4987519a351e0cafca0b58d5392a4e3a5a3b64429ca6bc4d6be877dfcf28f3c34fd77b04f7592500d89989737eab513b7c40591580f
+  data.tar.gz: fd35771ff21bbd7dc98550633a0eb96cb44b518f3356f792ce92dc02e9655f2683d0eab08bc1d36a1f8abf36f23fbabdd68e8bdb7f0dd4423ad311a27e7f80e6

data/CHANGELOG

@@ -7,6 +7,13 @@ 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.
+
 # 0.1.0 - 2024-03-01
 
 * Initial release.

data/lib/grpc_rest/version.rb

@@ -1,3 +1,3 @@
 module GrpcRest
-  VERSION = "0.1.2"
+  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
@@ -56,11 +79,6 @@ module GrpcRest
           sub_record.public_send(:"#{key}=", parameters.delete(key))
         end
       end
-
-      # assign remaining parameters
-      parameters.each do |k, v|
-        assign_value(request, k, v)
-      end
     end
 
     def error_msg(error)

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

@@ -16,7 +16,6 @@ type FileResult struct {
 
 type controller struct {
 	ControllerName string
-	ServiceFilePath string
 	Methods []method
 	ServiceName string
 	FullServiceName string
@@ -41,7 +40,6 @@ type Route struct {
 
 var controllerTemplate = `
 require 'grpc_rest'
-require 'services/geo_admin/v1/test_services_pb'
 class {{.ControllerName}}Controller < ActionController::Base
   protect_from_forgery with: :null_session
 
@@ -60,8 +58,9 @@ class {{.ControllerName}}Controller < ActionController::Base
 {{$fullServiceName := .FullServiceName -}}
 {{range .Methods }}
 	def {{.Name}}
-	  grpc_request = {{.RequestType}}.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["{{.Name}}"], "{{.Body}}", request.parameters)
+    fields = {{.RequestType}}.descriptor.to_a.map(&:name)
+    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
 {{end}}
@@ -74,7 +73,6 @@ func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (F
 		Methods: []method{},
 		ServiceName: Classify(service.GetName()),
 		ControllerName: Demodulize(service.GetName()),
-		ServiceFilePath: FilePathify(pkg + "." + service.GetName()),
 		FullServiceName: Classify(pkg + "." + service.GetName()),
 	}
 	for _, m := range service.GetMethod() {

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

@@ -1,6 +1,5 @@
 
 require 'grpc_rest'
-require 'services/geo_admin/v1/test_services_pb'
 class MyServiceController < ActionController::Base
   protect_from_forgery with: :null_session
 
@@ -23,20 +22,23 @@ class MyServiceController < ActionController::Base
 }.freeze
 
 	def test
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "*", request.parameters)
+    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"], "*", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request)
   end
 
 	def test_2
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_2"], "second_record", request.parameters)
+    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_2"], "second_record", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_2", grpc_request)
   end
 
 	def test_3
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_3"], "", request.parameters)
+    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_3"], "", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_3", grpc_request)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc