gruf 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7765e1ba50ecdc417020e4083e304f900845fa1b
-  data.tar.gz: e615c4331dac126796b304c0056070de88faeb15
+  metadata.gz: 475f72d5e3590bcbdbc32f8698bf835540c964c1
+  data.tar.gz: 877dd14c01855fba9e2006bf50df04b07cfbb804
 SHA512:
-  metadata.gz: 2372e9d8ebd9d18edad57ba5985af76e28b9062503cd4c53658d5eb0b765c96a0a28a29ef50da0dd832607f7c9046a75560cd357ed0aee3cb229c33250bdf2d9
-  data.tar.gz: 3d8e0d3d1632f31c2e0838b2e1469059bebc5ce7fc8b153becffe51d29bd96d2b4997cfd115b98c6f8ae6aa5626d0b179cc4b31f3c0865f42cd0f2e9ea748e61
+  metadata.gz: 2451565946bade99073f6dc7d567d623761a2f35a6c7541fdfc6dd431c29046635e057a1da9441390cbae5e32c8a6eb85e8a913ea851a9f7cc3079ea8971d4e1
+  data.tar.gz: 95d1fe70fde36eb85fae02c97cb518277f0d182f8d7bb5f659125b5d6bbcfa390e09707379c8969144384f34be782715d52c145ec83945bb37834f69405cf1be

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 1.2.6
+
+- Fix issues with arity and bidirectional streaming
+
 ### 1.2.5
 
 - Fix reference issue for client and bidirectional streaming calls

data/lib/gruf/client.rb

@@ -89,7 +89,7 @@ module Gruf
     # @return [Gruf::Response] The response from the server
     # @raise [Gruf::Client::Error|GRPC::BadStatus] If an error occurs, an exception will be raised according to the
     # error type that was returned
-    def call(request_method, params = {}, metadata = {}, opts = {})
+    def call(request_method, params = {}, metadata = {}, opts = {}, &block)
       request_method = request_method.to_sym
       req = streaming_request?(request_method) ? params : request_object(request_method, params)
       md = build_metadata(metadata)
@@ -97,11 +97,16 @@ module Gruf
 
       raise NotImplementedError, "The method #{request_method} has not been implemented in this service." unless call_sig
 
-      execute(call_sig, req, md, opts)
+      resp = execute(call_sig, req, md, opts, &block)
+
+      Gruf::Response.new(resp.result, resp.time)
     rescue GRPC::BadStatus => e
       emk = Gruf.error_metadata_key.to_s
       raise Gruf::Client::Error, error_deserializer_class.new(e.metadata[emk]).deserialize if e.respond_to?(:metadata) && e.metadata.key?(emk)
       raise # passthrough
+    rescue => e
+      Gruf.logger.error e.message
+      raise
     end
 
     private
@@ -123,13 +128,12 @@ module Gruf
     # @param [Hash] md (Optional) A hash of metadata key/values that are transported with the client request
     # @param [Hash] opts (Optional) A hash of options to send to the gRPC request_response method
     #
-    def execute(call_sig, req, md, opts = {})
-      timed = Timer.time do
+    def execute(call_sig, req, md, opts = {}, &block)
+      Timer.time do
         opts[:return_op] = true
         opts[:metadata] = md
-        send(call_sig, req, opts)
+        send(call_sig, req, opts, &block)
       end
-      Gruf::Response.new(timed.result, timed.time)
     end
 
     ##

data/lib/gruf/server.rb

@@ -25,6 +25,8 @@ module Gruf
     # @return [Array<Class>] The services this server is handling
     attr_accessor :services
 
+    attr_reader :server
+
     ##
     # Initialize the server and load and setup the services
     #
@@ -35,17 +37,26 @@ module Gruf
       load_services(services)
     end
 
+    ##
+    # @return [GRPC::RpcServer] The GRPC server running
+    #
+    def server
+      unless @server
+        @server = GRPC::RpcServer.new(Gruf.server_options)
+        @server.add_http2_port(Gruf.server_binding_url, ssl_credentials)
+        services.each do |s|
+          @server.handle(s)
+        end
+      end
+      @server
+    end
+
     ##
     # Start the gRPC server
     #
     # :nocov:
     def start!
       logger.info { 'Booting gRPC Server...' }
-      server = GRPC::RpcServer.new(Gruf.server_options)
-      server.add_http2_port Gruf.server_binding_url, ssl_credentials
-      services.each do |s|
-        server.handle(s)
-      end
       server.run_till_terminated
       logger.info { 'Shutting down gRPC server...' }
     end

data/lib/gruf/service.rb

@@ -36,12 +36,37 @@ module Gruf
         return if @__last_methods_added && @__last_methods_added.include?(method_name)
         return unless rpc_handler_names.include?(method_name)
 
+        rpc_desc = rpc_descs[method_name.to_s.camelcase.to_sym]
+
         with = :"#{method_name}_with_intercept"
         without = :"#{method_name}_without_intercept"
         @__last_methods_added = [method_name, with, without]
-        define_method with do |*args, &block|
-          call_chain(method_name, args[0], args[1], &block)
+
+        if rpc_desc
+          if rpc_desc.request_response?
+            define_method(with) do |request, call|
+              call_chain(method_name, request, call)
+            end
+          elsif rpc_desc.client_streamer?
+            define_method(with) do |call|
+              call_chain(method_name, nil, call)
+            end
+          elsif rpc_desc.server_streamer?
+            define_method(with) do |request, call, &block|
+              call_chain(method_name, request, call, &block)
+            end
+          else # bidi
+            define_method(with) do |requests, call, &block|
+              call_chain(method_name, requests, call, &block)
+            end
+          end
+        else
+          # fallback to the catch-all
+          define_method with do |*args, &block|
+            call_chain(method_name, *args, &block)
+          end
         end
+
         alias_method without, method_name
         alias_method method_name, with
         @__last_methods_added = nil
@@ -216,23 +241,13 @@ module Gruf
     # @return [Object] The response object
     #
     def call_chain(original_call_sig, req, call, &block)
-      # this is a workaround until the gRPC core Ruby client implements interceptors
-      # due to the signatures being different for the different types of requests. After
-      # interceptors are added to gRPC core, we will need to release gruf 2.0 and redo
-      # the interceptor signatures for gruf
-      streamed_request = call.nil?
-      if streamed_request
-        call = req
-        req = nil
-      end
-
       outer_around_call(original_call_sig, req, call) do
         begin
           before_call(original_call_sig, req, call)
 
           result = around_call(original_call_sig, req, call) do
             # send the actual request to gRPC
-            if streamed_request
+            if req.nil?
               send("#{original_call_sig}_without_intercept", call, &block)
             else
               send("#{original_call_sig}_without_intercept", req, call, &block)
@@ -256,6 +271,15 @@ module Gruf
       fail!(req, call, :internal, :unknown, error_message)
     end
 
+    ##
+    # Return the appropriate RPC descriptor for a given call signature on this service
+    #
+    # @return [GRPC::RpcDesc]
+    #
+    def rpc_desc(call_signature)
+      self.class.rpc_descs[call_signature.to_s.camelcase.to_sym]
+    end
+
     ##
     # Add a field error to this endpoint
     #

data/lib/gruf/version.rb

@@ -15,5 +15,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '1.2.5'.freeze
+  VERSION = '1.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: gRPC Ruby Framework