grpc_kit 0.1.14 → 0.2.0

data/lib/grpc_kit/calls/client_server_streamer.rb

@@ -1,36 +1,29 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/call'
 require 'grpc_kit/calls'
 
 module GrpcKit
   module Calls::Client
-    class ServerStreamer < GrpcKit::Calls::Call
+    class ServerStreamer < GrpcKit::Call
       include Enumerable
 
       alias outgoing_metadata metadata
 
       # @param data [Object] request message
-      # @param last [Boolean]
       # @return [void]
-      def send_msg(data, last: false)
-        raise 'No method error' if @restrict
-
-        @stream.send_msg(data, last: last, metadata: outgoing_metadata)
+      def send_msg(data)
+        @stream.send_msg(data, last: true, metadata: outgoing_metadata)
       end
 
-      # @param last [Boolean]
       # @return [Object] response object
-      def recv(last: false)
-        raise 'No method error' if @restrict
-
-        @stream.recv_msg(last: last)
+      def recv
+        @stream.recv_msg
       end
 
       # @yieldparam response [Object] each response object of server streaming RPC
       def each
-        loop do
-          yield(recv)
-        end
+        loop { yield(recv) }
       end
     end
   end

data/lib/grpc_kit/calls/server_bidi_streamer.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/call'
 require 'grpc_kit/calls'
 
 module GrpcKit
   module Calls::Server
-    class BidiStreamer < GrpcKit::Calls::Call
+    class BidiStreamer < GrpcKit::Call
+      include Enumerable
+
       attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
       alias incoming_metadata metadata
 
@@ -16,27 +19,25 @@ module GrpcKit
       end
 
       # @param data [Object] request message
-      # @param last [Boolean]
       # @return [void]
-      def send_msg(data, last: false)
-        raise 'No method error' if @restrict
-
+      def send_msg(data)
         @stream.send_msg(
           data,
           @protobuf,
-          last: last,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
         )
       end
 
-      # @param last [Boolean]
       # @return [Object] response object
-      def recv(last: false)
-        raise 'No method error' if @restrict
+      def recv
+        @stream.recv_msg(@protobuf, limit_size: @config.max_receive_message_size)
+      end
 
-        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      # @yieldparam response [Object] each response object of bidi streaming RPC
+      def each
+        loop { yield(recv) }
       end
     end
   end

data/lib/grpc_kit/calls/server_client_streamer.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/call'
 require 'grpc_kit/calls'
 
 module GrpcKit
   module Calls::Server
-    class ClientStreamer < GrpcKit::Calls::Call
+    class ClientStreamer < GrpcKit::Call
+      include Enumerable
+
       attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
       alias incoming_metadata metadata
 
@@ -16,27 +19,26 @@ module GrpcKit
       end
 
       # @param data [Object] request message
-      # @param last [Boolean]
       # @return [void]
-      def send_msg(data, last: false)
-        raise 'No method error' if @restrict
-
+      def send_msg(data)
         @stream.send_msg(
           data,
           @protobuf,
-          last: last,
+          last: true,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
         )
       end
 
-      # @param last [Boolean]
       # @return [Object] response object
-      def recv(last: false)
-        raise 'No method error' if @restrict
+      def recv
+        @stream.recv_msg(@protobuf, limit_size: @config.max_receive_message_size)
+      end
 
-        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      # @yieldparam response [Object] each response object of client streaming RPC
+      def each
+        loop { yield(recv) }
       end
     end
   end

data/lib/grpc_kit/calls/server_request_response.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/call'
 require 'grpc_kit/calls'
 
 module GrpcKit
   module Calls::Server
-    class RequestResponse < GrpcKit::Calls::Call
+    class RequestResponse < GrpcKit::Call
       attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
       alias incoming_metadata metadata
 
@@ -18,25 +19,20 @@ module GrpcKit
       # @param data [Object] request message
       # @param last [Boolean]
       # @return [void]
-      def send_msg(data, last: false)
-        raise 'No method error' if @restrict
-
+      def send_msg(data)
         @stream.send_msg(
           data,
           @protobuf,
-          last: last,
+          last: true,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
         )
       end
 
-      # @param last [Boolean]
       # @return [Object] response object
-      def recv(last: false)
-        raise 'No method error' if @restrict
-
-        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      def recv
+        @stream.recv_msg(@protobuf, last: true, limit_size: @config.max_receive_message_size)
       end
     end
   end

data/lib/grpc_kit/calls/server_server_streamer.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/call'
 require 'grpc_kit/calls'
 
 module GrpcKit
   module Calls::Server
-    class ServerStreamer < GrpcKit::Calls::Call
+    class ServerStreamer < GrpcKit::Call
       attr_reader :outgoing_initial_metadata, :outgoing_trailing_metadata
       alias incoming_metadata metadata
 
@@ -16,27 +17,20 @@ module GrpcKit
       end
 
       # @param data [Object] request message
-      # @param last [Boolean]
       # @return [void]
-      def send_msg(data, last: false)
-        raise 'No method error' if @restrict
-
+      def send_msg(data)
         @stream.send_msg(
           data,
           @protobuf,
-          last: last,
           initial_metadata: @outgoing_initial_metadata,
           trailing_metadata: @outgoing_trailing_metadata,
           limit_size: @config.max_send_message_size,
         )
       end
 
-      # @param last [Boolean]
       # @return [Object] response object
-      def recv(last: false)
-        raise 'No method error' if @restrict
-
-        @stream.recv_msg(@protobuf, last: last, limit_size: @config.max_receive_message_size)
+      def recv
+        @stream.recv_msg(@protobuf, last: true, limit_size: @config.max_receive_message_size)
       end
     end
   end

data/lib/grpc_kit/errors.rb

@@ -156,24 +156,24 @@ module GrpcKit
     end
 
     CODES = {
-      GrpcKit::StatusCodes::OK                  => Ok,
-      GrpcKit::StatusCodes::CANCELLED           => Cancelled,
-      GrpcKit::StatusCodes::UNKNOWN             => Unknown,
-      GrpcKit::StatusCodes::INVALID_ARGUMENT    => InvalidArgument,
-      GrpcKit::StatusCodes::DEADLINE_EXCEEDED   => DeadlineExceeded,
-      GrpcKit::StatusCodes::NOT_FOUND           => NotFound,
-      GrpcKit::StatusCodes::ALREADY_EXISTS      => AlreadyExists,
-      GrpcKit::StatusCodes::PERMISSION_DENIED   => PermissionDenied,
-      GrpcKit::StatusCodes::RESOURCE_EXHAUSTED  => ResourceExhausted,
+      GrpcKit::StatusCodes::OK => Ok,
+      GrpcKit::StatusCodes::CANCELLED => Cancelled,
+      GrpcKit::StatusCodes::UNKNOWN => Unknown,
+      GrpcKit::StatusCodes::INVALID_ARGUMENT => InvalidArgument,
+      GrpcKit::StatusCodes::DEADLINE_EXCEEDED => DeadlineExceeded,
+      GrpcKit::StatusCodes::NOT_FOUND => NotFound,
+      GrpcKit::StatusCodes::ALREADY_EXISTS => AlreadyExists,
+      GrpcKit::StatusCodes::PERMISSION_DENIED => PermissionDenied,
+      GrpcKit::StatusCodes::RESOURCE_EXHAUSTED => ResourceExhausted,
       GrpcKit::StatusCodes::FAILED_PRECONDITION => FailedPrecondition,
-      GrpcKit::StatusCodes::ABORTED             => Aborted,
-      GrpcKit::StatusCodes::OUT_OF_RANGE        => OutOfRange,
-      GrpcKit::StatusCodes::UNIMPLEMENTED       => Unimplemented,
-      GrpcKit::StatusCodes::INTERNAL            => Internal,
-      GrpcKit::StatusCodes::UNAVAILABLE         => Unavailable,
-      GrpcKit::StatusCodes::DATA_LOSS           => DataLoss,
-      GrpcKit::StatusCodes::UNAUTHENTICATED     => Unauthenticated,
-      GrpcKit::StatusCodes::DO_NOT_USE          => DoNotUse,
+      GrpcKit::StatusCodes::ABORTED => Aborted,
+      GrpcKit::StatusCodes::OUT_OF_RANGE => OutOfRange,
+      GrpcKit::StatusCodes::UNIMPLEMENTED => Unimplemented,
+      GrpcKit::StatusCodes::INTERNAL => Internal,
+      GrpcKit::StatusCodes::UNAVAILABLE => Unavailable,
+      GrpcKit::StatusCodes::DATA_LOSS => DataLoss,
+      GrpcKit::StatusCodes::UNAUTHENTICATED => Unauthenticated,
+      GrpcKit::StatusCodes::DO_NOT_USE => DoNotUse,
     }.freeze
   end
 end

data/lib/grpc_kit/grpc/dsl.rb

@@ -9,7 +9,7 @@ module GrpcKit
   module GRPC
     module Dsl
       # @param value [String]
-      attr_writer :service_name
+      attr_accessor :service_name
 
       # @param value [Symbol]
       attr_writer :marshal_class_method

data/lib/grpc_kit/grpc/interceptor.rb

@@ -16,7 +16,7 @@ module GrpcKit
       # @param request [Object,nil] An object which cliet will send
       # @param call [GrpcKit::Calls::Client::RequestResponse,nil]
       # @param metadata [Hash<String,String>,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def request_response(request: nil, call: nil, method: nil, metadata: nil)
         yield
       end
@@ -24,7 +24,7 @@ module GrpcKit
       # @param requests [Object,nil] comptibility with grpc gem, no use
       # @param call [GrpcKit::Calls::Client::ClientStreamer,nil]
       # @param metadata [Hash<String,String>,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def client_streamer(requests: nil, call: nil, method: nil, metadata: nil)
         yield
       end
@@ -32,7 +32,7 @@ module GrpcKit
       # @param request [Object,nil] An object which cliet will send
       # @param call [GrpcKit::Calls::Client::ServerStreamer,nil]
       # @param metadata [Hash<String,String>,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def server_streamer(request: nil, call: nil, method: nil, metadata: nil)
         yield
       end
@@ -40,7 +40,7 @@ module GrpcKit
       # @param requests [Object,nil] comptibility with grpc gem, no use
       # @param call [GrpcKit::Calls::Client::BidiStreamer,nil]
       # @param metadata [Hash<String,String>,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def bidi_streamer(requests: nil, call: nil, method: nil, metadata: nil)
         yield
       end
@@ -53,27 +53,27 @@ module GrpcKit
 
       # @param request [Object] An object which server received
       # @param call [GrpcKit::Calls::Server::RequestResponse,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def request_response(request: nil, call: nil, method: nil)
         yield
       end
 
       # @param call [GrpcKit::Calls::Server::ClientStreamer,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def client_streamer(call: nil, method: nil)
         yield
       end
 
       # @param request [Object] An object which server received
       # @param call [GrpcKit::Calls::Server::ServerStreamer,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def server_streamer(request: nil, call: nil, method: nil)
         yield
       end
 
       # @param requests [Object,nil] comptibility with grpc gem, no use
       # @param call [GrpcKit::Calls::Server::BidiStreamer,nil]
-      # @param method [GrpcKit::Calls::Call::Name,nil]
+      # @param method [GrpcKit::Call::Name,nil]
       def bidi_streamer(requests: nil, call: nil, method: nil)
         yield
       end

data/lib/grpc_kit/interceptor_registory.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  class InterceptorRegistry
+    def initialize(interceptors)
+      @interceptors = interceptors
+
+      validate_interceptors
+    end
+
+    def build
+      @interceptors.dup
+    end
+
+    private
+
+    def validate_interceptors
+      unless @interceptors
+        raise ArgumentError, 'interceptors must not be nil'
+      end
+
+      if @interceptors.empty?
+        raise ArgumentError, 'interceptors must not be empty'
+      end
+
+      invalid_interceptors = @interceptors.reject do |interceptor|
+        interceptor.class.ancestors.include?(GrpcKit::GRPC::Interceptor)
+      end
+
+      unless invalid_interceptors.empty?
+        raise ArgumentError, "interceptor #{invalid_interceptors} must descend from #{GrpcKit::GRPC::Interceptor}"
+      end
+    end
+  end
+end

data/lib/grpc_kit/interceptors.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
+require 'grpc_kit/interceptor_registory'
+
 module GrpcKit
   module Interceptors
     module Client
       class Streaming
         # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>]
         def initialize(interceptors)
-          @interceptors = interceptors
+          @registry = GrpcKit::InterceptorRegistry.new(interceptors)
         end
 
         # @param metadata [Hash<String,String>]
         def intercept(call, metadata, &block)
-          if @interceptors && !@interceptors.empty?
-            do_intercept(@interceptors.dup, call, metadata, &block)
-          else
-            yield(call, metadata)
-          end
+          do_intercept(@registry.build, call, metadata, &block)
         end
 
         private
@@ -39,15 +37,11 @@ module GrpcKit
       class Streaming
         # @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>]
         def initialize(interceptors)
-          @interceptors = interceptors
+          @registry = GrpcKit::InterceptorRegistry.new(interceptors)
         end
 
         def intercept(call, &block)
-          if @interceptors && !@interceptors.empty?
-            do_intercept(@interceptors.dup, call, &block)
-          else
-            yield(call)
-          end
+          do_intercept(@registry.build, call, &block)
         end
 
         private

data/lib/grpc_kit/interceptors/client_request_response.rb

@@ -7,30 +7,27 @@ module GrpcKit
     class RequestResponse
       # @param interceptors [Array<GrpcKit::GRPC::ClientInterceptor>]
       def initialize(interceptors)
-        @interceptors = interceptors
+        @registry = GrpcKit::InterceptorRegistry.new(interceptors)
       end
 
       # @param call [GrpcKit::Calls::Client::RequestResponse]
       # @param metadata [Hash<String,String>]
+      # @yieldreturn [Object] Response object server sent
       def intercept(request, call, metadata, &block)
-        if @interceptors && !@interceptors.empty?
-          do_intercept(@interceptors.dup, request, call, metadata, &block)
-        else
-          yield(request, call, metadata)
-        end
+        do_intercept(@registry.build, request, call, metadata, &block)
       end
 
       private
 
       def do_intercept(interceptors, request, call, metadata)
         if interceptors.empty?
-          return yield(request, call, metadata)
+          return yield
         end
 
         interceptor = interceptors.pop
         interceptor.request_response(request: request, call: call, method: call.method, metadata: metadata) do
-          do_intercept(interceptors, request, call, metadata) do |r, c, m|
-            yield(r, c, m)
+          do_intercept(interceptors, request, call, metadata) do
+            yield
           end
         end
       end