grpc-rest 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb358eab4313d2e6f4bc27e6e6e7f41694c4828bc176f91430696cc3153fabf
-  data.tar.gz: f73e835ef854696b65e2d92f2d650748f25e5d7ce2a16c9bcc397cfc4d96686d
+  metadata.gz: 61c130f717134177cf54979446039f2be1144a66f1fb8e0eb85b64f4bdf70bcc
+  data.tar.gz: bf5fdf842d2f8c1aa20e45fdd88eff0f0d7cabeb8decf77c9bcb6ae7e3794a1a
 SHA512:
-  metadata.gz: dc94a596a11a98b0bf69fa2f3215139d555429b1208d2c91c52266dfad9ddd2e867a1e40de258c8fc2f414b0234decfc5c00c17758291c2ac87d160c8d0c5b10
-  data.tar.gz: 95f30263280cf09bc426843c27a41afaf35c009079d238c3b611a20fc766b53cc57c16c566f94f3f526b31356cf8509bf1548be2e12322791773594e37699e71
+  metadata.gz: 006c5943b3bc2b497fcc591527c3d14558a0a6f54922baca7d8d445248ded8718c3debb406440411c48cf869061a28dbd5b3e2135c6aee1a168dd5b149e7ee43
+  data.tar.gz: e667e1f72ae7ba6cfea978e9e075f4758e101bfd9b8c3b07b5c4f0110d7c51b18bc1304baf923da5279a7b8d9b6a18e69e44c8918b71e746e0d8557b47095eaf

data/CHANGELOG

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 0.1.15 - 2024-06-26
+- Actually emit the correct error code on failure. :(
+
+# 0.1.14 - 2024-06-25
+- Emit the correct error code on failure.
+
 # 0.1.13 - 2024-06-24
-- Use JSON parsing / generation to fix inaccurate transformations (e.g. Timestamp).
+- Use grpc's `to_json` methods to output fields correctly.
 
 # 0.1.12 - 2024-05-15
 - Parse numbers into Ruby number objects.

data/Gemfile.lock

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

data/lib/grpc_rest/version.rb

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

data/lib/grpc_rest.rb

@@ -1,5 +1,6 @@
 require 'google/protobuf/well_known_types'
 require 'grpc'
+require 'grpc/core/status_codes'
 
 module GrpcRest
   class << self
@@ -105,16 +106,60 @@ module GrpcRest
       end
     end
 
+    # Ported from https://github.com/grpc-ecosystem/grpc-gateway/blob/main/runtime/errors.go#L36
+    def grpc_http_status(code)
+      case code
+      when GRPC::Core::StatusCodes::OK
+        :ok
+      when GRPC::Core::StatusCodes::CANCELLED
+        499
+      when GRPC::Core::StatusCodes::INVALID_ARGUMENT,
+        GRPC::Core::StatusCodes::FAILED_PRECONDITION,
+        GRPC::Core::StatusCodes::OUT_OF_RANGE
+        :bad_request
+      when GRPC::Core::StatusCodes::DEADLINE_EXCEEDED
+        :gateway_timeout
+      when GRPC::Core::StatusCodes::NOT_FOUND
+        :not_found
+      when GRPC::Core::StatusCodes::ALREADY_EXISTS, GRPC::Core::StatusCodes::ABORTED
+        :conflict
+      when GRPC::Core::StatusCodes::PERMISSION_DENIED
+        :forbidden
+      when GRPC::Core::StatusCodes::UNAUTHENTICATED
+        :unauthorized
+      when GRPC::Core::StatusCodes::RESOURCE_EXHAUSTED
+        :too_many_requests
+      when GRPC::Core::StatusCodes::UNIMPLEMENTED
+        :not_implemented
+      when GRPC::Core::StatusCodes::UNAVAILABLE
+        :service_unavailable
+      else
+        :internal_server_error
+      end
+    end
+
     def error_msg(error)
+      if error.respond_to?(:code)
       {
-          code: 3,
-          message: "InvalidArgument: #{error.message}",
+          code: error.code,
+          message: error.message,
           details: [
                     {
                       backtrace: error.backtrace
                     }
           ]
       }
+      else
+        {
+            code: 3,
+            message: "InvalidArgument: #{error.message}",
+            details: [
+                      {
+                        backtrace: error.backtrace
+                      }
+            ]
+        }
+      end
     end
 
     def send_gruf_request(klass, service_obj, method, request)

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

@@ -46,8 +46,14 @@ class {{.ControllerName}}Controller < ActionController::Base
   protect_from_forgery with: :null_session
 
 	rescue_from StandardError do |e|
-		render json: GrpcRest.error_msg(e)
+		render json: GrpcRest.error_msg(e), status: :internal_server_error
 	end
+  rescue_from GRPC::BadStatus do |e|
+		render json: GrpcRest.error_msg(e), status: GrpcRest.grpc_http_status(e.code)
+  end
+  rescue_from Google::Protobuf::TypeError do |e|
+    render json: GrpcRest.error_msg(e), status: :bad_request
+  end
   METHOD_PARAM_MAP = {
 {{range .Methods }}
     "{{.Name}}" => [

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

@@ -6,8 +6,14 @@ class MyServiceController < ActionController::Base
   protect_from_forgery with: :null_session
 
 	rescue_from StandardError do |e|
-		render json: GrpcRest.error_msg(e)
+		render json: GrpcRest.error_msg(e), status: :internal_server_error
 	end
+  rescue_from GRPC::BadStatus do |e|
+		render json: GrpcRest.error_msg(e), status: GrpcRest.grpc_http_status(e.code)
+  end
+  rescue_from Google::Protobuf::TypeError do |e|
+    render json: GrpcRest.error_msg(e), status: :bad_request
+  end
   METHOD_PARAM_MAP = {
 
     "test" => [

metadata

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