gruf 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89536c6ad70dba812d8cb87b9220fc91ddc9e89
-  data.tar.gz: 629b82c3c4db84871a5799542466097ab794c0ce
+  metadata.gz: 7765e1ba50ecdc417020e4083e304f900845fa1b
+  data.tar.gz: e615c4331dac126796b304c0056070de88faeb15
 SHA512:
-  metadata.gz: cf8224f3487652a66ed038376cfa80d19241792c39d8ee0f409d24c9e635f964ca2750ea0194bd4f1252add9a541abb336709626a7eb36d0ba47fcb417348db1
-  data.tar.gz: 2966de34dae6ef0d9a9b2e27853dd4b7171a27791f08a224ad3111e0a01c9a1e80c48f4d96e72cc95fa9f166588a9f002706c9547f5203a204f53744017093eb
+  metadata.gz: 2372e9d8ebd9d18edad57ba5985af76e28b9062503cd4c53658d5eb0b765c96a0a28a29ef50da0dd832607f7c9046a75560cd357ed0aee3cb229c33250bdf2d9
+  data.tar.gz: 3d8e0d3d1632f31c2e0838b2e1469059bebc5ce7fc8b153becffe51d29bd96d2b4997cfd115b98c6f8ae6aa5626d0b179cc4b31f3c0865f42cd0f2e9ea748e61

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.5
+
+- Fix reference issue for client and bidirectional streaming calls
+
 ### 1.2.4
 
 - Loosen explicit Protobuf dependency now that 3.4.0.2 is released

data/lib/gruf/client.rb

@@ -91,7 +91,7 @@ module Gruf
     # error type that was returned
     def call(request_method, params = {}, metadata = {}, opts = {})
       request_method = request_method.to_sym
-      req = request_object(request_method, params)
+      req = streaming_request?(request_method) ? params : request_object(request_method, params)
       md = build_metadata(metadata)
       call_sig = call_signature(request_method)
 
@@ -106,6 +106,15 @@ module Gruf
 
     private
 
+    ##
+    # @param [Symbol] request_method
+    # @return [Boolean]
+    #
+    def streaming_request?(request_method)
+      desc = rpc_desc(request_method)
+      desc && (desc.client_streamer? || desc.bidi_streamer?)
+    end
+
     ##
     # Execute the given request to the service
     #

data/lib/gruf/instrumentation/output_metadata_timer.rb

@@ -27,6 +27,8 @@ module Gruf
       # @return [Hash] The resulting output metadata with the timer attached
       #
       def call(rc)
+        return unless rc.active_call && rc.active_call.respond_to?(:output_metadata)
+
         rc.active_call.output_metadata.update(metadata_key => rc.execution_time.to_s)
       end
 

data/lib/gruf/service.rb

@@ -216,12 +216,27 @@ 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("#{original_call_sig}_without_intercept", req, call, &block) # send the actual request to gRPC
+            # send the actual request to gRPC
+            if streamed_request
+              send("#{original_call_sig}_without_intercept", call, &block)
+            else
+              send("#{original_call_sig}_without_intercept", req, call, &block)
+            end
           end
         rescue GRPC::BadStatus => e
           result = e

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.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler