grpc_kit 0.1.14 → 0.2.0

data/lib/grpc_kit/interceptors/server_request_response.rb

@@ -1,36 +1,33 @@
 # frozen_string_literal: true
 
 require 'grpc_kit/interceptors'
+require 'grpc_kit/interceptor_registory'
 
 module GrpcKit
   module Interceptors::Server
     class RequestResponse
       # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>]
       def initialize(interceptors)
-        @interceptors = interceptors
+        @registry = GrpcKit::InterceptorRegistry.new(interceptors)
       end
 
+      # @param request [Object] Recevied request objects
       # @param call [GrpcKit::Calls::Client::RequestResponse]
+      # @yieldreturn [Object] Response object server sent
       def intercept(request, call, &block)
-        if @interceptors && !@interceptors.empty?
-          do_intercept(@interceptors.dup, request, call, &block)
-        else
-          yield(request, call)
-        end
+        do_intercept(@registry.build, request, call, &block)
       end
 
       private
 
       def do_intercept(interceptors, request, call)
         if interceptors.empty?
-          return yield(request, call)
+          return yield
         end
 
         interceptor = interceptors.pop
         interceptor.request_response(request: request, call: call, method: call.method) do
-          do_intercept(interceptors, request, call) do |req, c|
-            yield(req, c)
-          end
+          do_intercept(interceptors, request, call) { yield }
         end
       end
     end

data/lib/grpc_kit/rpcs/client_bidi_streamer.rb

@@ -20,7 +20,7 @@ module GrpcKit
         )
 
         if @config.interceptor
-          @config.interceptor.intercept(call, metadata) { |s| s }
+          @config.interceptor.intercept(call, metadata) { |c| c }
         else
           call
         end

data/lib/grpc_kit/rpcs/client_client_streamer.rb

@@ -20,7 +20,7 @@ module GrpcKit
         )
 
         if @config.interceptor
-          @config.interceptor.intercept(call, metadata) { |s| s }
+          @config.interceptor.intercept(call, metadata) { |c| c }
         else
           call
         end

data/lib/grpc_kit/rpcs/client_request_response.rb

@@ -11,7 +11,7 @@ module GrpcKit
       # @param metadata [Hash<String, String>]
       # @param timeout [GrpcKit::GrpcTime]
       # @return [Object] response message
-      def invoke(stream, request,  metadata: {}, timeout: nil)
+      def invoke(stream, request, metadata: {}, timeout: nil)
         call = GrpcKit::Calls::Client::RequestResponse.new(
           metadata: metadata,
           config: @config,
@@ -21,13 +21,13 @@ module GrpcKit
 
         Timeout.timeout(timeout&.to_f, GrpcKit::Errors::DeadlineExceeded) do
           if @config.interceptor
-            @config.interceptor.intercept(request, call, call.metadata) do |r, c, _|
-              call.send_msg(request, last: true)
-              call.recv(last: true)
+            @config.interceptor.intercept(request, call, call.metadata) do
+              call.send_msg(request)
+              call.recv
             end
           else
-            call.send_msg(request, last: true)
-            call.recv(last: true)
+            call.send_msg(request)
+            call.recv
           end
         end
       end

data/lib/grpc_kit/rpcs/client_server_streamer.rb

@@ -12,15 +12,20 @@ module GrpcKit
       # @param timeout [GrpcKit::GrpcTime]
       # @return [GrpcKit::Calls::Client::ServerStreamer]
       def invoke(stream, request, metadata: {}, timeout: nil)
-        call = GrpcKit::Calls::Client::ServerStreamer.new(metadata: metadata, config: @config, timeout: timeout, stream: stream)
+        call = GrpcKit::Calls::Client::ServerStreamer.new(
+          metadata: metadata,
+          config: @config,
+          timeout: timeout,
+          stream: stream,
+        )
 
         if @config.interceptor
-          @config.interceptor.intercept(call, metadata) do |c, m|
-            c.send_msg(request, last: true)
+          @config.interceptor.intercept(call, metadata) do |c|
+            c.send_msg(request)
             c
           end
         else
-          call.send_msg(request, last: true)
+          call.send_msg(request)
           call
         end
       end

data/lib/grpc_kit/rpcs/server_bidi_streamer.rb

@@ -10,7 +10,11 @@ module GrpcKit
       # @param metadata [Hash<String, String>]
       # @return [void]
       def invoke(stream, metadata: {})
-        call = GrpcKit::Calls::Server::BidiStreamer.new(metadata: metadata, config: @config, stream: stream)
+        call = GrpcKit::Calls::Server::BidiStreamer.new(
+          metadata: metadata,
+          config: @config,
+          stream: stream,
+        )
 
         if @config.interceptor
           @config.interceptor.intercept(call) do |c|

data/lib/grpc_kit/rpcs/server_client_streamer.rb

@@ -10,16 +10,20 @@ module GrpcKit
       # @param metadata [Hash<String, String>]
       # @return [void]
       def invoke(stream, metadata: {})
-        call = GrpcKit::Calls::Server::ClientStreamer.new(metadata: metadata, config: @config, stream: stream)
+        call = GrpcKit::Calls::Server::ClientStreamer.new(
+          metadata: metadata,
+          config: @config,
+          stream: stream,
+        )
 
         if @config.interceptor
           @config.interceptor.intercept(call) do |c|
             resp = @handler.send(@config.ruby_style_method_name, c)
-            c.send_msg(resp, last: true)
+            c.send_msg(resp)
           end
         else
           resp = @handler.send(@config.ruby_style_method_name, call)
-          call.send_msg(resp, last: true)
+          call.send_msg(resp)
         end
       end
     end

data/lib/grpc_kit/rpcs/server_request_response.rb

@@ -10,19 +10,23 @@ module GrpcKit
       # @param metadata [Hash<String, String>]
       # @return [void]
       def invoke(stream, metadata: {})
-        call = GrpcKit::Calls::Server::RequestResponse.new(metadata: metadata, config: @config, stream: stream)
-        request = call.recv(last: true)
+        call = GrpcKit::Calls::Server::RequestResponse.new(
+          metadata: metadata,
+          config: @config,
+          stream: stream,
+        )
 
-        resp =
-          if @config.interceptor
-            @config.interceptor.intercept(request, call) do |_, _|
-              @handler.send(@config.ruby_style_method_name, request, call)
-            end
-          else
-            @handler.send(@config.ruby_style_method_name, request, call)
+        request = call.recv
+        if @config.interceptor
+          @config.interceptor.intercept(request, call) do
+            resp = @handler.send(@config.ruby_style_method_name, request, call)
+            call.send_msg(resp)
+            resp
           end
-
-        call.send_msg(resp, last: true)
+        else
+          resp = @handler.send(@config.ruby_style_method_name, request, call)
+          call.send_msg(resp)
+        end
       end
     end
   end

data/lib/grpc_kit/rpcs/server_server_streamer.rb

@@ -10,15 +10,19 @@ module GrpcKit
       # @param metadata [Hash<String, String>]
       # @return [void]
       def invoke(stream, metadata: {})
-        call = GrpcKit::Calls::Server::ServerStreamer.new(metadata: metadata, config: @config, stream: stream)
+        call = GrpcKit::Calls::Server::ServerStreamer.new(
+          metadata: metadata,
+          config: @config,
+          stream: stream,
+        )
 
         if @config.interceptor
           @config.interceptor.intercept(call) do |c|
-            request = c.recv(last: true)
+            request = c.recv
             @handler.send(@config.ruby_style_method_name, request, c)
           end
         else
-          request = call.recv(last: true)
+          request = call.recv
           @handler.send(@config.ruby_style_method_name, request, call)
         end
 

data/lib/grpc_kit/session/server_session.rb

@@ -34,7 +34,7 @@ module GrpcKit
         loop do
           invoke
 
-          if @streams.size == 0
+          if @streams.empty?
             unless @io.wait_readable
               shutdown
               break

data/lib/grpc_kit/status_codes.rb

@@ -22,24 +22,24 @@ module GrpcKit
     DO_NOT_USE          = '-1'
 
     CODE_NAME = {
-      OK                  => 'OK',
-      CANCELLED           => 'CANCELLED',
-      UNKNOWN             => 'UNKNOWN',
-      INVALID_ARGUMENT    => 'INVALID_ARGUMENT',
-      DEADLINE_EXCEEDED   => 'DEADLINE_EXCEEDED',
-      NOT_FOUND           => 'NOT_FOUND',
-      ALREADY_EXISTS      => 'ALREADY_EXISTS',
-      PERMISSION_DENIED   => 'PERMISSION_DENIED',
-      RESOURCE_EXHAUSTED  => 'RESOURCE_EXHAUSTED',
+      OK => 'OK',
+      CANCELLED => 'CANCELLED',
+      UNKNOWN => 'UNKNOWN',
+      INVALID_ARGUMENT => 'INVALID_ARGUMENT',
+      DEADLINE_EXCEEDED => 'DEADLINE_EXCEEDED',
+      NOT_FOUND => 'NOT_FOUND',
+      ALREADY_EXISTS => 'ALREADY_EXISTS',
+      PERMISSION_DENIED => 'PERMISSION_DENIED',
+      RESOURCE_EXHAUSTED => 'RESOURCE_EXHAUSTED',
       FAILED_PRECONDITION => 'FAILED_PRECONDITION',
-      ABORTED             => 'ABORTED',
-      OUT_OF_RANGE        => 'OUT_OF_RANGE',
-      UNIMPLEMENTED       => 'UNIMPLEMENTED',
-      INTERNAL            => 'INTERNAL',
-      UNAVAILABLE         => 'UNAVAILABLE',
-      DATA_LOSS           => 'DATA_LOSS',
-      UNAUTHENTICATED     => 'UNAUTHENTICATED',
-      DO_NOT_USE          => 'DO_NOT_USE',
+      ABORTED => 'ABORTED',
+      OUT_OF_RANGE => 'OUT_OF_RANGE',
+      UNIMPLEMENTED => 'UNIMPLEMENTED',
+      INTERNAL => 'INTERNAL',
+      UNAVAILABLE => 'UNAVAILABLE',
+      DATA_LOSS => 'DATA_LOSS',
+      UNAUTHENTICATED => 'UNAUTHENTICATED',
+      DO_NOT_USE => 'DO_NOT_USE',
     }.freeze
   end
 end

data/lib/grpc_kit/stream/client_stream.rb

@@ -47,12 +47,6 @@ module GrpcKit
         end
       end
 
-      def each
-        validate_if_request_start!
-
-        loop { yield(do_recv) }
-      end
-
       # @raise [StopIteration] when recving message finished
       # @param last [Boolean]
       # @param blocking [Boolean]
@@ -80,20 +74,19 @@ module GrpcKit
         @transport.close_and_flush
       end
 
-      # @return [Array<Object>]
+      # @return [Object]
       def close_and_recv
         validate_if_request_start!
 
         @transport.close_and_flush
 
-        data = []
-        loop { data.push(do_recv) }
+        ret = do_recv(last: true)
 
         if @deadline && Time.now > @deadline
           raise GrpcKit::Errors::DeadlineExceeded, @deadline
         end
 
-        data
+        ret
       end
 
       private

data/lib/grpc_kit/stream/server_stream.rb

@@ -81,11 +81,6 @@ module GrpcKit
         end
       end
 
-      # @param protobuf [GrpcKit::ProtoBuffer]
-      def each(protobuf)
-        loop { yield(recv_msg(protobuf)) }
-      end
-
       # @param status [GrpcKit::StatusCodes::BadStatus, GrpcKit::StatusCodes::OK]
       # @param msg [String,nil]
       # @param metadata [Hash<String,String>]

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.1.14'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -159,6 +159,7 @@ files:
 - examples/helloworld/helloworld_services_pb.rb
 - examples/helloworld_client.rb
 - examples/helloworld_server.rb
+- examples/interceptors/call_stream.rb
 - examples/interceptors/client_logging_interceptor.rb
 - examples/interceptors/server_logging_interceptor.rb
 - examples/routeguide/routeguide.json
@@ -170,6 +171,7 @@ files:
 - grpc_kit.gemspec
 - lib/grpc.rb
 - lib/grpc_kit.rb
+- lib/grpc_kit/call.rb
 - lib/grpc_kit/calls.rb
 - lib/grpc_kit/calls/client_bidi_streamer.rb
 - lib/grpc_kit/calls/client_client_streamer.rb
@@ -189,6 +191,7 @@ files:
 - lib/grpc_kit/grpc/logger.rb
 - lib/grpc_kit/grpc/stream.rb
 - lib/grpc_kit/grpc_time.rb
+- lib/grpc_kit/interceptor_registory.rb
 - lib/grpc_kit/interceptors.rb
 - lib/grpc_kit/interceptors/client_bidi_streamer.rb
 - lib/grpc_kit/interceptors/client_client_streamer.rb