grpc-rest 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c130f717134177cf54979446039f2be1144a66f1fb8e0eb85b64f4bdf70bcc
-  data.tar.gz: bf5fdf842d2f8c1aa20e45fdd88eff0f0d7cabeb8decf77c9bcb6ae7e3794a1a
+  metadata.gz: c9364ed8060e0d6d89f6082f0da592a34adb7977c36b776be56ee8e816bf9575
+  data.tar.gz: 8358915b2c4cea7d0950fb9198395b11d70a94e8800e3e52f9781bfcf18707be
 SHA512:
-  metadata.gz: 006c5943b3bc2b497fcc591527c3d14558a0a6f54922baca7d8d445248ded8718c3debb406440411c48cf869061a28dbd5b3e2135c6aee1a168dd5b149e7ee43
-  data.tar.gz: e667e1f72ae7ba6cfea978e9e075f4758e101bfd9b8c3b07b5c4f0110d7c51b18bc1304baf923da5279a7b8d9b6a18e69e44c8918b71e746e0d8557b47095eaf
+  metadata.gz: cfaea51fd7addb1aedc0c3f4c7ea8450af57716c146d46342331d52c4d6df56df835609477692c3c8ec0985f5164f82be7b0261f60a7241b2723b6aa9c62f8ba
+  data.tar.gz: 665cf40abf886db39d3c34d253b1eeb457a3b204d8c254a0737cdb41b8e754a7c1d2f2159bccdf89a8d1efdad075d10b67982bac23d2cbf5c1238510449c1280

data/CHANGELOG

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 0.1.17 - 2024-07-30
+- Ignore unknown fields in JSON decoding
+
+# 0.1.16 - 2024-07-09
+- Support requests in camel case
+
 # 0.1.15 - 2024-06-26
 - Actually emit the correct error code on failure. :(
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grpc-rest (0.1.14)
+    grpc-rest (0.1.17)
       grpc
       rails (>= 6.0)
 

data/lib/grpc_rest/version.rb

@@ -1,3 +1,3 @@
 module GrpcRest
-  VERSION = '0.1.15'
+  VERSION = '0.1.17'
 end

data/lib/grpc_rest.rb

@@ -80,7 +80,7 @@ module GrpcRest
 
     def init_request(request_class, params)
       map_proto_type(request_class.descriptor, params)
-      request_class.decode_json(JSON.generate(params))
+      request_class.decode_json(JSON.generate(params), ignore_unknown_fields: true)
     end
 
     def assign_params(request, param_hash, body_string, params)

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

@@ -1,39 +1,40 @@
 package internal
 
 import (
-  "bytes"
-  "fmt"
-  "github.com/iancoleman/strcase"
-  "google.golang.org/protobuf/types/descriptorpb"
+	"bytes"
+	"fmt"
 	"strings"
 	"text/template"
+
+	"github.com/iancoleman/strcase"
+	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 type FileResult struct {
-	Name string
+	Name    string
 	Content string
 }
 
 type controller struct {
-	ControllerName string
-	Methods []method
-	ServiceName string
+	ControllerName  string
+	Methods         []method
+	ServiceName     string
 	FullServiceName string
-	MethodName string
+	MethodName      string
 }
 
 type method struct {
-	Name string
+	Name        string
 	RequestType string
-	Path string
-	PathInfo []PathInfo
-	Body string
-	HttpMethod string
+	Path        string
+	PathInfo    []PathInfo
+	Body        string
+	HttpMethod  string
 }
 
 type Route struct {
 	MethodName string
-	Path string
+	Path       string
 	Controller string
 	HttpMethod string
 }
@@ -67,7 +68,8 @@ class {{.ControllerName}}Controller < ActionController::Base
 {{range .Methods }}
 	def {{.Name}}
     fields = {{.RequestType}}.descriptor.to_a.map(&:name)
-    grpc_request = GrpcRest.init_request({{.RequestType}}, request.parameters.to_h.slice(*fields))
+    parameters = request.parameters.to_h.deep_transform_keys(&:underscore)
+    grpc_request = GrpcRest.init_request({{.RequestType}}, parameters.slice(*fields))
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["{{.Name}}"], "{{.Body}}", request.parameters)
     render json: GrpcRest.send_request("{{$fullServiceName}}", "{{.Name}}", grpc_request)
   end
@@ -76,11 +78,11 @@ end
 `
 
 func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (FileResult, []Route, error) {
-  var routes []Route
+	var routes []Route
 	data := controller{
-		Methods: []method{},
-		ServiceName: Classify(service.GetName()),
-		ControllerName: Demodulize(service.GetName()),
+		Methods:         []method{},
+		ServiceName:     Classify(service.GetName()),
+		ControllerName:  Demodulize(service.GetName()),
 		FullServiceName: Classify(pkg + "." + service.GetName()),
 	}
 	for _, m := range service.GetMethod() {
@@ -94,17 +96,17 @@ func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (F
 			return FileResult{}, routes, err
 		}
 		controllerMethod := method{
-			Name: strcase.ToSnake(m.GetName()),
+			Name:        strcase.ToSnake(m.GetName()),
 			RequestType: Classify(m.GetInputType()),
-			Path: path,
-			HttpMethod: httpMethod,
-			Body: opts.Body,
-			PathInfo: pathInfo,
+			Path:        path,
+			HttpMethod:  httpMethod,
+			Body:        opts.Body,
+			PathInfo:    pathInfo,
 		}
 		data.Methods = append(data.Methods, controllerMethod)
 		routes = append(routes, Route{
 			HttpMethod: strings.ToLower(httpMethod),
-			Path: SanitizePath(path),
+			Path:       SanitizePath(path),
 			Controller: strcase.ToSnake(data.ControllerName),
 			MethodName: strcase.ToSnake(m.GetName()),
 		})
@@ -120,7 +122,7 @@ func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (F
 	}
 	return FileResult{
 		Content: resultContent.String(),
-		Name: fmt.Sprintf("app/controllers/%s_controller.rb", strcase.ToSnake(data.ControllerName)),
+		Name:    fmt.Sprintf("app/controllers/%s_controller.rb", strcase.ToSnake(data.ControllerName)),
 	}, routes, nil
 }
 

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

@@ -33,28 +33,32 @@ class MyServiceController < ActionController::Base
 
 	def test
     fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
-    grpc_request = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
+    parameters = request.parameters.to_h.deep_transform_keys(&:underscore)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters.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 = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
+    parameters = request.parameters.to_h.deep_transform_keys(&:underscore)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters.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 = GrpcRest.init_request(Testdata::TestRequest, request.parameters.to_h.slice(*fields))
+    parameters = request.parameters.to_h.deep_transform_keys(&:underscore)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters.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))
+    parameters = request.parameters.to_h.deep_transform_keys(&:underscore)
+    grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc