griffin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307fd7dcba526d6bb562bf97d4d7c31c0f82d1fdfb488de21a5fb1040cc6506e
-  data.tar.gz: 01a0b9ddfcd3486a9c1b378c11b22dc35856fd264f283c68e19f74973fe6f588
+  metadata.gz: bde96b38724aa97b682bfc64f06b7aafd3839191c879e3c4cd99f818b411f98a
+  data.tar.gz: 7e6906a7bffae9171156ec71a68bef87f38cc8b5b668d7ea886953d83cfdbeff
 SHA512:
-  metadata.gz: 8780b448b45fb336c4bd7196e23e3901a64822fd0ed9661d8b2e59fb4d437feb2527cc1388b7162a2f927f37f229e36d6c5476bf2c5af17c407a38b298ab38b9
-  data.tar.gz: 6026c11481574d680a0b79295109da1405656aecd63424c3f228bbc765144d1019da666d3684d2efd8e1319c578df043607efff8d44e8a933f6a3b910a33f62f
+  metadata.gz: def92a8064a0141d4b4b2ad73429d81abcab11c6ba5597789b6a8a955f426e2a8c3699edb49042175ac7c904364afec7e6f9e6784f20a107e7f10ac2787af4ed
+  data.tar.gz: 855a0900def7e9630017cd695e5f120a0e080a89e36199a426ef9060bd3692a28121f4b9b6155a0df2398a87e3d430e2768d373553fe8b5edcdaab6160bc065e

data/.rubocop.yml

@@ -29,12 +29,18 @@ Style/IfUnlessModifier:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
 Style/SafeNavigation:
   Enabled: false
 
+Style/WhileUntilModifier:
+  Enabled: false
+
 Naming/PredicateName:
   NamePrefixBlacklist:
     - "is_"

data/README.md

@@ -59,10 +59,6 @@ Griffin::Server.run
 bundle install
 ```
 
-## Requirements
-
-* [nghttp2](https://nghttp2.org/)
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ganmacs/griffin.

data/examples/interceptors/call_stream.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'grpc_kit'
+require 'forwardable'
+
+class CallStream < GrpcKit::Call
+  include Enumerable
+  extend Forwardable
+  delegate %i[send_msg recv] => :@inner
+
+  # @params call [GrpcKit::Call]
+  def initialize(inner)
+    @inner = inner
+  end
+
+  def each
+    loop { yield(recv) }
+  end
+
+  def method_missing(name, *args, &block)
+    @inner.public_send(name, *args, &block)
+  end
+end

data/examples/interceptors/client_logging_interceptor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'grpc_kit'
+require_relative 'call_stream'
 
 class LoggingInterceptor < GRPC::ClientInterceptor
   def request_response(request: nil, method: nil, **)
@@ -21,28 +22,21 @@ class LoggingInterceptor < GRPC::ClientInterceptor
     yield(LoggingStream.new(call))
   end
 
-  def bidi_streamer(**)
-    yield
+  def bidi_streamer(call: nil, method: nil, **)
+    GrpcKit.logger.info("Started request method=#{method.name}, service_name=#{method.receiver.class.service_name}")
+    yield(LoggingStream.new(call))
   end
 
-  class LoggingStream
-    def initialize(stream)
-      @stream = stream
-    end
-
-    def send_msg(msg, **opts)
-      GrpcKit.logger.info("logging interceptor send #{msg}")
-      @stream.send_msg(msg, opts)
+  class LoggingStream < CallStream
+    def send_msg(msg)
+      GrpcKit.logger.info("logging interceptor send #{msg.inspect}")
+      super
     end
 
-    def recv(**opt)
-      @stream.recv(opt).tap do |v|
-        GrpcKit.logger.info("logging interceptor recv #{v}")
+    def recv
+      super.tap do |v|
+        GrpcKit.logger.info("logging interceptor recv #{v.inspect}")
       end
     end
-
-    def close_and_recv
-      @stream.close_and_recv
-    end
   end
 end

data/examples/interceptors/server_logging_interceptor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'grpc_kit'
+require_relative 'call_stream'
 
 class LoggingInterceptor < GRPC::ServerInterceptor
   def request_response(request: nil, call: nil, method: nil)
@@ -26,18 +27,14 @@ class LoggingInterceptor < GRPC::ServerInterceptor
     yield(LoggingStream.new(call))
   end
 
-  class LoggingStream
-    def initialize(stream)
-      @stream = stream
-    end
-
-    def send_msg(msg, **opt)
+  class LoggingStream < CallStream
+    def send_msg(msg)
       GrpcKit.logger.info("logging interceptor send #{msg.inspect}")
-      @stream.send_msg(msg, opt)
+      super
     end
 
-    def recv(**opt)
-      @stream.recv(**opt).tap do |v|
+    def recv
+      super.tap do |v|
         GrpcKit.logger.info("logging interceptor recv #{v.inspect}")
       end
     end

data/examples/routeguide_client.rb

@@ -14,8 +14,8 @@ PORT = 50051
 def get_feature(stub)
   GRPC.logger.info('===== get_feature =====')
   points = [
-    Routeguide::Point.new(latitude:  409_146_138, longitude: -746_188_906),
-    Routeguide::Point.new(latitude:  0, longitude: 0)
+    Routeguide::Point.new(latitude: 409_146_138, longitude: -746_188_906),
+    Routeguide::Point.new(latitude: 0, longitude: 0),
   ]
 
   points.each do |pt|
@@ -36,9 +36,7 @@ def list_features(stub)
   )
 
   stream = stub.list_features(rect)
-
-  loop do
-    r = stream.recv
+  stream.each do |r|
     GRPC.logger.info("Found #{r.name} at #{r.location.inspect}")
   end
 end
@@ -55,13 +53,13 @@ def record_route(stub, size)
   size.times do
     location = features.sample['location']
     point = Routeguide::Point.new(latitude: location['latitude'], longitude: location['longitude'])
-    puts "Next point is #{point.inspect}"
+    GRPC.logger.info("Next point is #{point.inspect}")
     stream.send_msg(point)
     sleep(rand(0..1))
   end
 
-  resp = stream.close_and_recv
-  puts "summary: #{resp[0].inspect}"
+  resp = stream.recv
+  GRPC.logger.info("summary: #{resp.inspect}")
 end
 
 ROUTE_CHAT_NOTES = [
@@ -79,9 +77,8 @@ def route_chat(stub)
   call = stub.route_chat({})
 
   t = Thread.new do
-    loop do
-      rn = call.recv
-      GRPC.logger.info("Got message #{rn.message} at point point(#{rn.location.latitude}, #{rn.location.longitude})")
+    call.each do |rn|
+      GRPC.logger.info("Got message #{rn.message} at point (#{rn.location.latitude}, #{rn.location.longitude})")
     end
   end
 

data/examples/routeguide_server.rb

@@ -20,6 +20,7 @@ class Server < Routeguide::RouteGuide::Service
   end
 
   def get_feature(point, ctx)
+    GRPC.logger.info('===== get_feature =====')
     name = @features.fetch({ 'longitude' => point.longitude, 'latitude' => point.latitude }, '')
     GRPC.logger.info("Point longitude=#{point.longitude}, latitude=#{point.latitude}, metadata=#{ctx.metadata}")
     Routeguide::Feature.new(location: point, name: name)
@@ -48,8 +49,7 @@ class Server < Routeguide::RouteGuide::Service
     start_at = Time.now.to_i
     last = nil
 
-    loop do
-      point = stream.recv # XXX: raise StopIteration
+    stream.each do |point|
       GRPC.logger.info(point)
 
       count += 1
@@ -71,8 +71,8 @@ class Server < Routeguide::RouteGuide::Service
   end
 
   def route_chat(call)
-    loop do
-      rn = call.recv
+    GRPC.logger.info('===== record_chat =====')
+    call.each do |rn|
       GRPC.logger.info("route_note location=#{rn.location.inspect}, message=#{rn.message}")
       key = "#{rn.location.latitude} #{rn.location.longitude}"
       saved_msgs = @route_notes[key]
@@ -121,6 +121,11 @@ Griffin::Server.configure do |c|
 
   c.services Server.new
 
+  if ENV['GRPC_INTERCEPTOR']
+    require_relative 'interceptors/server_logging_interceptor'
+    c.interceptors [LoggingInterceptor.new]
+  end
+
   c.workers 2
 end
 

data/griffin.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
 
   spec.add_dependency 'connection_pool', '~> 2.2.2'
-  spec.add_dependency 'grpc_kit', '~> 0.1.12'
+  spec.add_dependency 'grpc_kit', '>= 0.2.0'
   spec.add_dependency 'serverengine', '~> 2.0.7'
 end

data/lib/griffin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Griffin
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/pb/grpc/health/checker.rb

@@ -14,7 +14,6 @@
 
 require 'grpc'
 require 'grpc/health/v1/health_services_pb'
-require 'thread'
 
 module Grpc
   # Health contains classes and modules that support providing a health check

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ dependencies:
   name: grpc_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,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