grpc-rest 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca423be5a7314061750adbe2e151db9780fa33fd81f6737520ba697d8f71d43
-  data.tar.gz: 6729fbbd231299780f71ae9fcf437c969f04975ecca2bd871fa733cc8ee4fa6a
+  metadata.gz: b9c3044d8f6813a33030d336a91e4d86b4305a781d178d85a07e5e287ab22264
+  data.tar.gz: 659013b9ab51cd05f4e1b9570eeb71fb48f07992bd0f1eba80eb37aca1093921
 SHA512:
-  metadata.gz: 47b4b888dc91c03388bb6a20c2cdafd12ee0d6e9e6c0e288cb84696009df07b5ed30312038eda6b479a806f4fbf929122e5a5d05b7ca149b8e7a415a55fc67cd
-  data.tar.gz: 20263c167837551a33f9b69ea2f923bf55f8c251ad7d4c11d4aa6832aa873955180fdd4946a6f2b7f9f101a6643c2d86bea8d36f2e229dddf1b70deeddc5ea6a
+  metadata.gz: 04ed1b2acf85c8ec4c069195dd1cd8711e7b68209dcf24cf62a60e832c89158364946d4da72012cc2b7bc037b6f2ac06df36a33a5a43b956e12e7dfe1b9d393b
+  data.tar.gz: 64f846bc132c121521c4ba1c8c1189bfed3ebfc4c1ee78473fac297aba84b1254037922a08859f165569a366c23df2b6da0ea391e08ef1e50c4430db713b9f86

data/.github/workflows/CI.yml

@@ -23,7 +23,7 @@ jobs:
       uses: arduino/setup-protoc@v2
     - run: git reset --hard
     - run: git clean -f -d
-    - run: go test ./...
+    - run: cd protoc-gen-rails && go test ./...
 
   build_and_deploy:
     needs: test

data/CHANGELOG

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 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.1"
+  VERSION = "0.1.4"
 end

data/lib/grpc_rest.rb

@@ -56,11 +56,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 = {{.RequestType}}.new(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/main_test.go

@@ -78,7 +78,7 @@ func runTest(t *testing.T, directory string, options map[string]string) {
 
     testDir := workdir + "/testdata/" + directory
     if os.Getenv("UPDATE_SNAPSHOTS") != "" {
-        cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("cp %v/* %v", tmpdir, testDir))
+        cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("cp -R %v/* %v", tmpdir, testDir))
         cmd.Run()
     } else {
         assertEqualFiles(t, testDir, tmpdir)

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

@@ -1,28 +1,44 @@
 
 require 'grpc_rest'
-require 'services/geo_admin/v1/test_services_pb'
 class MyServiceController < ActionController::Base
   protect_from_forgery with: :null_session
 
-	rescue_from Google::Protobuf::TypeError do |e|
+	rescue_from StandardError do |e|
 		render json: GrpcRest.error_msg(e)
 	end
+  METHOD_PARAM_MAP = {
+
+    "test" => [
+       {name: "blah", val: "foobar/*", split_name:["blah"]},
+			 {name: "repeated_string", val: nil, split_name:["repeated_string"]},
+			 ],
+
+    "test_2" => [
+       ],
+
+    "test_3" => [
+       {name: "sub_record.sub_id", val: nil, split_name:["sub_record","sub_id"]},
+			 ],
+}.freeze
 
 	def test
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, "/test/{blah=foobar/*}/{repeated_string}", "*", request.parameters)
+    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)
     render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request)
   end
 
 	def test_2
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, "/test2", "second_record", request.parameters)
+    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_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, "/test3/{sub_record.sub_id}", "", request.parameters)
+    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_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.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-03 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc