protobuf 3.7.2.pre1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4f0794925c7662d3fce4dc28345e914f33115b
-  data.tar.gz: 626caedcbe40e19f74a4d5a8a2a5f22814e03e9d
+  metadata.gz: 79198f130aec8d18aae9ef3a3170e16bd67f4ff3
+  data.tar.gz: 3c13e8622eea8728f59a9279b37140438ae65d71
 SHA512:
-  metadata.gz: 96f02a0023e1229c1201523c5cc857ca4a4e6ab88008addc5283e633d497009b3c48e1374b868740e89cdc9b6a544e0a6130405704f37a02560463614d5cbd74
-  data.tar.gz: da8b4e50a0420a0182c5f7ae2f09baebd1c4e800beb69e7b915b06201fd447b7893641c4b0bbdd6e0cdbd751853b79e017a415c5390c81b3d52d89829f7d55c3
+  metadata.gz: 7931e2b2a6943bd7f0c1e9f2ad5de360e8f127b37a413074a74ae571e70a0ac0331c6a9292918b6ee5836bee3c686a5cc751813a2c851b2824dc244012577d2f
+  data.tar.gz: 23a58d4a0b01ea80ad10c4c6857834606341f0f4d8d6df3b3ca3f34a920ba393fe55b5b33feb1e3d05ac53bfb1ef742d254ee79e00613bbee3df2daab4afe824

data/lib/protobuf.rb

@@ -37,13 +37,6 @@ module Protobuf
     #
     # The name or address of the host to use during client RPC calls.
     attr_writer :client_host
-
-    # Server Host
-    #
-    # Default: first ipv4 address of the system
-    #
-    # The name or address of the host to use during client RPC calls.
-    attr_writer :server_host
   end
 
   def self.client_host
@@ -88,10 +81,6 @@ module Protobuf
   def self.ignore_unknown_fields=(value)
     @ignore_unknown_fields = !!value
   end
-
-  def self.server_host
-    @server_host ||= Socket.gethostname
-  end
 end
 
 unless ENV.key?('PB_NO_NETWORKING')

data/lib/protobuf/rpc/connectors/base.rb

@@ -104,6 +104,7 @@ module Protobuf
           # Parse out the raw response
           @stats.response_size = @response_data.size unless @response_data.nil?
           response_wrapper = ::Protobuf::Socketrpc::Response.decode(@response_data)
+          @stats.server = response_wrapper.server if response_wrapper.field?(:server)
 
           # Determine success or failure based on parsed data
           if response_wrapper.field?(:error_reason)

data/lib/protobuf/rpc/env.rb

@@ -45,6 +45,7 @@ module Protobuf
                     :response_type,
                     :rpc_method,
                     :rpc_service,
+                    :server,
                     :service_name,
                     :worker_id
 

data/lib/protobuf/rpc/error.rb

@@ -18,7 +18,7 @@ module Protobuf
       end
 
       def to_response
-        ::Protobuf::Socketrpc::Response.new(:error => message, :error_reason => error_type, :server => ::Protobuf.server_host)
+        ::Protobuf::Socketrpc::Response.new(:error => message, :error_reason => error_type)
       end
     end
   end

data/lib/protobuf/rpc/middleware/response_encoder.rb

@@ -72,9 +72,9 @@ module Protobuf
         #
         def wrapped_response
           if response.is_a?(::Protobuf::Rpc::PbError)
-            ::Protobuf::Socketrpc::Response.new(:error => response.message, :error_reason => response.error_type, :server => ::Protobuf.server_host)
+            ::Protobuf::Socketrpc::Response.new(:error => response.message, :error_reason => response.error_type, :server => env.server)
           else
-            ::Protobuf::Socketrpc::Response.new(:response_proto => response.encode, :server => ::Protobuf.server_host)
+            ::Protobuf::Socketrpc::Response.new(:response_proto => response.encode, :server => env.server)
           end
         end
       end

data/lib/protobuf/rpc/server.rb

@@ -20,10 +20,10 @@ module Protobuf
 
       # Invoke the service method dictated by the proto wrapper request object
       #
-      def handle_request(request_data)
+      def handle_request(request_data, env_data = {})
         # Create an env object that holds different parts of the environment and
         # is available to all of the middlewares
-        env = Env.new('encoded_request' => request_data, 'log_signature' => log_signature)
+        env = Env.new(env_data.merge('encoded_request' => request_data, 'log_signature' => log_signature))
 
         # Invoke the middleware stack, the last of which is the service dispatcher
         env = Rpc.middleware.call(env)

data/lib/protobuf/rpc/stat.rb

@@ -6,7 +6,8 @@ module Protobuf
   module Rpc
     class Stat
       attr_accessor :mode, :start_time, :end_time, :request_size, :dispatcher
-      attr_accessor :response_size, :client, :server, :service, :method_name
+      attr_accessor :response_size, :client, :service, :method_name
+      attr_reader   :server
 
       MODES = [:SERVER, :CLIENT].freeze
 
@@ -32,11 +33,12 @@ module Protobuf
       end
 
       def server=(peer)
-        @server = { :port => peer[0], :ip => peer[1] }
-      end
-
-      def server
-        @server ? "#{@server[:ip]}:#{@server[:port]}" : nil
+        case peer
+        when Array
+          @server = "#{peer[1]}:#{peer[0]}"
+        when String
+          @server = peer
+        end
       end
 
       def service

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.7.2.pre1' # rubocop:disable Style/MutableConstant
+  VERSION = '3.7.2' # rubocop:disable Style/MutableConstant
 end

data/spec/lib/protobuf/rpc/connectors/base_spec.rb

@@ -20,6 +20,31 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
     specify { expect(subject.respond_to?(:verify_callbacks)).to be true }
   end
 
+  describe "#parse_response" do
+    let(:options) { { :response_type => Test::Resource, :port => 55589, :host => '127.3.4.5' } }
+    it "updates stats#server from the response" do
+      allow(subject).to receive(:close_connection)
+      subject.instance_variable_set(:@response_data, ::Protobuf::Socketrpc::Response.new(:server => "serverless").encode)
+      subject.initialize_stats
+      subject.parse_response
+      expect(subject.stats.server).to eq("serverless")
+    end
+    it "does not override stats#server when response.server is missing" do
+      allow(subject).to receive(:close_connection)
+      subject.instance_variable_set(:@response_data, ::Protobuf::Socketrpc::Response.new.encode)
+      subject.initialize_stats
+      subject.parse_response
+      expect(subject.stats.server).to eq("127.3.4.5:55589")
+    end
+    it "does not override stats#server when response.server is nil" do
+      allow(subject).to receive(:close_connection)
+      subject.instance_variable_set(:@response_data, ::Protobuf::Socketrpc::Response.new(:server => nil).encode)
+      subject.initialize_stats
+      subject.parse_response
+      expect(subject.stats.server).to eq("127.3.4.5:55589")
+    end
+  end
+
   describe "#any_callbacks?" do
     [:@complete_cb, :@success_cb, :@failure_cb].each do |cb|
       it "returns true if #{cb} is provided" do

data/spec/lib/protobuf/rpc/middleware/response_encoder_spec.rb

@@ -10,13 +10,10 @@ RSpec.describe Protobuf::Rpc::Middleware::ResponseEncoder do
   end
   let(:encoded_response) { response_wrapper.encode }
   let(:response) { Test::Resource.new(:name => 'required') }
-  let(:response_wrapper) { ::Protobuf::Socketrpc::Response.new(:response_proto => response, :server => server_host) }
-  let(:server_host) { 'beepboopbop' }
+  let(:response_wrapper) { ::Protobuf::Socketrpc::Response.new(:response_proto => response) }
 
   subject { described_class.new(app) }
 
-  before { ::Protobuf.server_host = server_host }
-
   describe "#call" do
     it "encodes the response" do
       stack_env = subject.call(env)
@@ -74,5 +71,21 @@ RSpec.describe Protobuf::Rpc::Middleware::ResponseEncoder do
         expect { subject.call(env) }.to raise_exception(Protobuf::Rpc::PbError)
       end
     end
+
+    context "when server exists in the env" do
+      let(:env) do
+        Protobuf::Rpc::Env.new(
+          'response_type' => Test::Resource,
+          'log_signature' => 'log_signature',
+          'server'        => 'itsaserver',
+        )
+      end
+
+      it "adds the servers to the response" do
+        expected_response = ::Protobuf::Socketrpc::Response.new(:response_proto => response, :server => 'itsaserver').encode
+        subject.call(env)
+        expect(env.encoded_response).to eq(expected_response)
+      end
+    end
   end
 end

data/spec/lib/protobuf/rpc/stat_spec.rb

@@ -8,6 +8,20 @@ RSpec.describe ::Protobuf::Rpc::Stat do
     BarService = ::Struct.new(:method_name) unless defined?(BarService)
   end
 
+  describe '#server=' do
+    it 'understands Array' do
+      stat = ::Protobuf::Rpc::Stat.new
+      stat.server = [3333, "127.0.0.1"]
+      expect(stat.server).to eq("127.0.0.1:3333")
+    end
+
+    it 'understands String' do
+      stat = ::Protobuf::Rpc::Stat.new
+      stat.server = "thatserverthough"
+      expect(stat.server).to eq("thatserverthough")
+    end
+  end
+
   describe 'server mode' do
     it 'describes a server response to a client' do
       ::Timecop.freeze(10.minutes.ago) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.7.2.pre1
+  version: 3.7.2
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -458,12 +458,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.