grpc-rest 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca423be5a7314061750adbe2e151db9780fa33fd81f6737520ba697d8f71d43
-  data.tar.gz: 6729fbbd231299780f71ae9fcf437c969f04975ecca2bd871fa733cc8ee4fa6a
+  metadata.gz: c3dc93105554c8c92a3229f693ab0c93ed5833796ef7b7f11e94cb8821f2c425
+  data.tar.gz: ac3ec407c674d16fb33e6bddccfa10b9e66859af3d5ecbad58d1ff2603e7c098
 SHA512:
-  metadata.gz: 47b4b888dc91c03388bb6a20c2cdafd12ee0d6e9e6c0e288cb84696009df07b5ed30312038eda6b479a806f4fbf929122e5a5d05b7ca149b8e7a415a55fc67cd
-  data.tar.gz: 20263c167837551a33f9b69ea2f923bf55f8c251ad7d4c11d4aa6832aa873955180fdd4946a6f2b7f9f101a6643c2d86bea8d36f2e229dddf1b70deeddc5ea6a
+  metadata.gz: b1c05d823f083722774025bf8772d535b211b4ef01f3022baa92003a179ab2f3c1fcd6646c6b7eb5acf9ced1ff5abd3e962eea541ddfa7c0d9766bcc2649cb44
+  data.tar.gz: c4c40a55b73429c7716ed2e6164c546f8d1c2e53030d6b1182475b66ec430590c637c691bac7af21294a62b39782a4ecc2d332c4afa68879cef4b803a170beb1

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/lib/grpc_rest/version.rb

@@ -1,3 +1,3 @@
 module GrpcRest
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

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

@@ -4,25 +4,39 @@ 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)
+	  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)
+	  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)
+	  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.2
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-03 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc