protobuf 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd448f24362b0e9378d3281d77291538d862d4d1
-  data.tar.gz: 592b16f0af1c48b7c8336ea32f35a646f3947a9c
+  metadata.gz: 0081c6fc0146c8bd5d61a987d0f5b374a950d13b
+  data.tar.gz: cccc8f0d7acb314e3725816fe3e7081d06e1e346
 SHA512:
-  metadata.gz: a73428f4308d156ea94d9737e792b16db2455013a976ef6c5e22f2ca7f59ab156e43323816d1c30099934131fdde704d3741becf909decf76cf590b36d0fd75c
-  data.tar.gz: 9e66f6d8762f9c62c2d1ce01c34fc1ef841ebd32c05bc8630d0008f05572e7c9644e197e9e66d74bee08cc77b81a20c3f8c4300c64524ef8839dc8bea44ab2cc
+  metadata.gz: 19e94efb5c58ed704afac0ff0a2023589dbd9ec2aef35bd376cbba7dc4ec3c6feb7fb01363b123ee01913d3ecdfead89d4e3a79526536d4a78859450a67595b5
+  data.tar.gz: f9fc9d6001dae54bb777a4112db945abb04a34ceb80e63a500d1f13bb1583a62481d366c293c7a7d0bde334e71b7d5b683001b88501141db878de38b83a466c3

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
+  - "2.1.1"
 script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec/lib
 notifications:
   webhooks:

data/lib/protobuf/field/base_field.rb

@@ -63,6 +63,10 @@ module Protobuf
         true
       end
 
+      def coerce!(value)
+        value
+      end
+
       def enum?
         false
       end
@@ -226,7 +230,7 @@ module Protobuf
             if val.nil? || (val.respond_to?(:empty?) && val.empty?)
               @values.delete(field.name)
             elsif field.acceptable?(val)
-              @values[field.name] = val
+              @values[field.name] = field.coerce!(val)
             else
               raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
             end

data/lib/protobuf/field/float_field.rb

@@ -20,6 +20,10 @@ module Protobuf
         val.respond_to?(:to_f)
       end
 
+      def coerce!(val)
+        Float(val)
+      end
+
       def decode(bytes)
         bytes.unpack('e').first
       end

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

@@ -5,20 +5,18 @@ module Protobuf
   module Rpc
     module Connectors
       class Zmq < Base
-
         RequestTimeout = Class.new(RuntimeError)
+        ZmqRecoverableError = Class.new(RuntimeError)
 
         ##
         # Included Modules
         #
-
         include Protobuf::Rpc::Connectors::Common
         include Protobuf::Logger::LogMethods
 
         ##
         # Class Constants
         #
-
         CLIENT_RETRIES = (ENV['PB_CLIENT_RETRIES'] || 3)
 
         ##
@@ -68,21 +66,27 @@ module Protobuf
 
           begin
             server_uri = lookup_server_uri
-
             socket = zmq_context.socket(::ZMQ::REQ)
-            socket.setsockopt(::ZMQ::LINGER, 0)
 
-            log_debug { sign_message("Establishing connection: #{server_uri}") }
-            zmq_error_check(socket.connect(server_uri), :socket_connect)
-            log_debug { sign_message("Connection established to #{server_uri}") }
-
-            if first_alive_load_balance?
-              check_available_response = ""
-              zmq_error_check(socket.send_string(::Protobuf::Rpc::Zmq::CHECK_AVAILABLE_MESSAGE), :socket_send_string)
-              zmq_error_check(socket.recv_string(check_available_response), :socket_recv_string)
-
-              if check_available_response == ::Protobuf::Rpc::Zmq::NO_WORKERS_AVAILABLE
-                zmq_error_check(socket.close, :socket_close)
+            if socket # Make sure the context builds the socket
+              socket.setsockopt(::ZMQ::LINGER, 0)
+
+              log_debug { sign_message("Establishing connection: #{server_uri}") }
+              zmq_error_check(socket.connect(server_uri), :socket_connect)
+              log_debug { sign_message("Connection established to #{server_uri}") }
+
+              if first_alive_load_balance?
+                begin
+                  check_available_response = ""
+                  zmq_recoverable_error_check(socket.send_string(::Protobuf::Rpc::Zmq::CHECK_AVAILABLE_MESSAGE), :socket_send_string)
+                  zmq_recoverable_error_check(socket.recv_string(check_available_response), :socket_recv_string)
+
+                  if check_available_response == ::Protobuf::Rpc::Zmq::NO_WORKERS_AVAILABLE
+                    zmq_recoverable_error_check(socket.close, :socket_close)
+                  end
+                rescue ZmqRecoverableError
+                  socket = nil # couldn't make a connection and need to try again
+                end
               end
             end
           end while socket.try(:socket).nil?
@@ -101,7 +105,7 @@ module Protobuf
         # to the host and port in the options
         #
         def lookup_server_uri
-          50.times do
+          5.times do
             service_directory.all_listings_for(service).each do |listing|
               host = listing.try(:address)
               port = listing.try(:port)
@@ -111,8 +115,6 @@ module Protobuf
             host = options[:host]
             port = options[:port]
             return "tcp://#{host}:#{port}" if host_alive?(host)
-
-            sleep(1.0/10.0) # not sure why sleeping at all, but should be way less than 1 second
           end
 
           raise "Host not found for service #{service}"
@@ -120,7 +122,6 @@ module Protobuf
 
         def host_alive?(host)
           return true unless ping_port_enabled?
-
           socket = TCPSocket.new(host, ping_port.to_i)
 
           true
@@ -199,6 +200,16 @@ module Protobuf
             ERROR
           end
         end
+
+        def zmq_recoverable_error_check(return_code, source)
+          unless ::ZMQ::Util.resultcode_ok?(return_code || -1)
+            raise ZmqRecoverableError, <<-ERROR
+              Last ZMQ API call to #{source} failed with "#{::ZMQ::Util.error_string}".
+
+              #{caller(1).join($/)}
+              ERROR
+          end
+        end
       end
     end
   end

data/lib/protobuf/rpc/servers/zmq/broker.rb

@@ -102,7 +102,7 @@ module Protobuf
           address, _, message, *frames = read_from_frontend
 
           if message == ::Protobuf::Rpc::Zmq::CHECK_AVAILABLE_MESSAGE
-            if @idle_workers.any? || local_queue.empty?
+            if @idle_workers.any? || local_queue.size < 5 # Should make queue a SizedQueue and allow users to configure queue size
               write_to_frontend([address, "", ::Protobuf::Rpc::Zmq::WORKERS_AVAILABLE])
             else
               write_to_frontend([address, "", ::Protobuf::Rpc::Zmq::NO_WORKERS_AVAILABLE])

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/protobuf.gemspec

@@ -27,7 +27,7 @@ require "protobuf/version"
   s.add_development_dependency 'ffi-rzmq'
   s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '>= 3.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'timecop'

data/spec/encoding/all_types_spec.rb

@@ -86,6 +86,6 @@ describe ::Protobuf do
       file.read
     end
 
-    data.should eq message.serialize_to_string
+    expect(data).to eq(message.serialize_to_string)
   end
 end

data/spec/functional/socket_server_spec.rb

@@ -21,8 +21,8 @@ describe 'Functional Socket Client' do
 
       client.find(:name => 'Test Name', :active => true) do |c|
         c.on_success do |succ|
-          succ.name.should eq("Test Name")
-          succ.status.should eq(::Test::StatusType::ENABLED)
+          expect(succ.name).to eq("Test Name")
+          expect(succ.status).to eq(::Test::StatusType::ENABLED)
         end
 
         c.on_failure do |err|
@@ -41,7 +41,8 @@ describe 'Functional Socket Client' do
       c.on_success { raise "shouldn't pass"}
       c.on_failure {|e| error = e}
     end
-    error.message.should =~ /name.*required/
+
+    expect(error.message).to match(/name.*required/)
   end
 
   it 'calls the on_failure callback when the request type is wrong' do
@@ -53,7 +54,7 @@ describe 'Functional Socket Client' do
       c.on_success { raise "shouldn't pass"}
       c.on_failure {|e| error = e}
     end
-    error.message.should =~ /expected request.*ResourceFindRequest.*Resource instead/i
+    expect(error.message).to match(/expected request.*ResourceFindRequest.*Resource instead/i)
   end
 end
 

data/spec/functional/zmq_server_spec.rb

@@ -27,8 +27,8 @@ describe 'Functional ZMQ Client' do
 
       client.find(:name => 'Test Name', :active => true) do |c|
         c.on_success do |succ|
-          succ.name.should eq("Test Name")
-          succ.status.should eq(::Test::StatusType::ENABLED)
+          expect(succ.name).to eq("Test Name")
+          expect(succ.status).to eq(::Test::StatusType::ENABLED)
         end
 
         c.on_failure do |err|
@@ -46,8 +46,8 @@ describe 'Functional ZMQ Client' do
 
           client.find(:name => 'Test Name', :active => true) do |c|
             c.on_success do |succ|
-              succ.name.should eq("Test Name")
-              succ.status.should eq(::Test::StatusType::ENABLED)
+              expect(succ.name).to eq("Test Name")
+              expect(succ.status).to eq(::Test::StatusType::ENABLED)
             end
 
             c.on_failure do |err|
@@ -69,7 +69,7 @@ describe 'Functional ZMQ Client' do
         c.on_success { raise "shouldn't pass" }
         c.on_failure {|e| error = e }
       end
-      error.message.should match(/name.*required/)
+      expect(error.message).to match(/name.*required/)
     end
   end
 
@@ -83,7 +83,7 @@ describe 'Functional ZMQ Client' do
         c.on_success { raise "shouldn't pass" }
         c.on_failure {|e| error = e}
       end
-      error.message.should match(/expected request.*ResourceFindRequest.*Resource instead/i)
+      expect(error.message).to match(/expected request.*ResourceFindRequest.*Resource instead/i)
     end
   end
 
@@ -96,7 +96,7 @@ describe 'Functional ZMQ Client' do
         c.on_success { raise "shouldn't pass" }
         c.on_failure { |e| error = e }
       end
-      error.message.should match(/The server repeatedly failed to respond/)
+      expect(error.message).to match(/The server repeatedly failed to respond/)
     end
   end
 

data/spec/lib/protobuf/cli_spec.rb

@@ -9,19 +9,19 @@ describe ::Protobuf::CLI do
 
   let(:sock_runner) {
     runner = double("SocketRunner", :register_signals => nil)
-    runner.stub(:run) { ::ActiveSupport::Notifications.publish( "after_server_bind" ) }
+    allow(runner).to receive(:run).and_return(::ActiveSupport::Notifications.publish("after_server_bind"))
     runner
   }
 
   let(:zmq_runner) {
     runner = double "ZmqRunner", register_signals: nil
-    runner.stub(:run) { ::ActiveSupport::Notifications.publish( "after_server_bind" ) }
+    allow(runner).to receive(:run).and_return(::ActiveSupport::Notifications.publish("after_server_bind"))
     runner
   }
 
   before(:each) do
-    ::Protobuf::Rpc::SocketRunner.stub(:new) { sock_runner }
-    ::Protobuf::Rpc::ZmqRunner.stub(:new) { zmq_runner }
+    allow(::Protobuf::Rpc::SocketRunner).to receive(:new).and_return(sock_runner)
+    allow(::Protobuf::Rpc::ZmqRunner).to receive(:new).and_return(zmq_runner)
   end
 
   describe '#start' do
@@ -33,8 +33,8 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--host=123.123.123.123' ] }
 
       it 'sends the host option to the runner' do
-        ::Protobuf::Rpc::SocketRunner.should_receive(:new) do |options|
-          options[:host].should eq '123.123.123.123'
+        expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
+          expect(options[:host]).to eq '123.123.123.123'
         end.and_return(sock_runner)
         described_class.start(args)
       end
@@ -44,8 +44,8 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--port=12345' ] }
 
       it 'sends the port option to the runner' do
-        ::Protobuf::Rpc::SocketRunner.should_receive(:new) do |options|
-          options[:port].should eq 12345
+        expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
+          expect(options[:port]).to eq 12345
         end.and_return(sock_runner)
         described_class.start(args)
       end
@@ -55,8 +55,8 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--threads=500' ] }
 
       it 'sends the threads option to the runner' do
-        ::Protobuf::Rpc::SocketRunner.should_receive(:new) do |options|
-          options[:threads].should eq 500
+        expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
+          expect(options[:threads]).to eq 500
         end.and_return(sock_runner)
         described_class.start(args)
       end
@@ -66,8 +66,8 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--backlog=500' ] }
 
       it 'sends the backlog option to the runner' do
-        ::Protobuf::Rpc::SocketRunner.should_receive(:new) do |options|
-          options[:backlog].should eq 500
+        expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
+          expect(options[:backlog]).to eq 500
         end.and_return(sock_runner)
         described_class.start(args)
       end
@@ -77,8 +77,8 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--threshold=500' ] }
 
       it 'sends the backlog option to the runner' do
-        ::Protobuf::Rpc::SocketRunner.should_receive(:new) do |options|
-          options[:threshold].should eq 500
+        expect(::Protobuf::Rpc::SocketRunner).to receive(:new) do |options|
+          expect(options[:threshold]).to eq 500
         end.and_return(sock_runner)
         described_class.start(args)
       end
@@ -88,9 +88,9 @@ describe ::Protobuf::CLI do
       let(:test_args) { [ '--log=mylog.log', '--level=0' ] }
 
       it 'sends the log file and level options to the runner' do
-        ::Protobuf::Logger.should_receive(:configure) do |options|
-          options[:file].should eq 'mylog.log'
-          options[:level].should eq 0
+        expect(::Protobuf::Logger).to receive(:configure) do |options|
+          expect(options[:file]).to eq 'mylog.log'
+          expect(options[:level]).to eq 0
         end
         described_class.start(args)
       end
@@ -103,7 +103,7 @@ describe ::Protobuf::CLI do
 
         it 'sets both request and serialization pausing to false' do
           described_class.start(args)
-          ::Protobuf.should_not be_gc_pause_server_request
+          expect(::Protobuf).to_not be_gc_pause_server_request
         end
       end
 
@@ -113,7 +113,7 @@ describe ::Protobuf::CLI do
 
           it 'sets the configuration option to GC pause server request' do
             described_class.start(args)
-            ::Protobuf.should be_gc_pause_server_request
+            expect(::Protobuf).to be_gc_pause_server_request
           end
         end
       end
@@ -128,7 +128,7 @@ describe ::Protobuf::CLI do
 
           it 'sets the deprecation warning flag to true' do
             described_class.start(args)
-            ::Protobuf.print_deprecation_warnings?.should be_true
+            expect(::Protobuf.print_deprecation_warnings?).to be_truthy
           end
         end
 
@@ -138,7 +138,7 @@ describe ::Protobuf::CLI do
 
           it 'sets the deprecation warning flag to false ' do
             described_class.start(args)
-            ::Protobuf.print_deprecation_warnings?.should be_false
+            expect(::Protobuf.print_deprecation_warnings?).to be_falsey
           end
         end
       end
@@ -148,7 +148,7 @@ describe ::Protobuf::CLI do
 
         it 'sets the deprecation warning flag to true' do
           described_class.start(args)
-          ::Protobuf.print_deprecation_warnings?.should be_true
+          expect(::Protobuf.print_deprecation_warnings?).to be_truthy
         end
       end
 
@@ -157,7 +157,7 @@ describe ::Protobuf::CLI do
 
         it 'sets the deprecation warning flag to false' do
           described_class.start(args)
-          ::Protobuf.print_deprecation_warnings?.should be_false
+          expect(::Protobuf.print_deprecation_warnings?).to be_falsey
         end
       end
     end
@@ -169,24 +169,24 @@ describe ::Protobuf::CLI do
         let(:runner) { ::Protobuf::Rpc::SocketRunner }
 
         before do
-          ::Protobuf::Rpc::ZmqRunner.should_not_receive(:new)
+          expect(::Protobuf::Rpc::ZmqRunner).not_to receive(:new)
         end
 
         it 'is activated by the --socket switch' do
-          runner.should_receive(:new)
+          expect(runner).to receive(:new)
           described_class.start(args)
         end
 
         it 'is activated by PB_SERVER_TYPE=Socket ENV variable' do
           ENV['PB_SERVER_TYPE'] = "Socket"
-          runner.should_receive(:new).and_return(sock_runner)
+          expect(runner).to receive(:new).and_return(sock_runner)
           described_class.start(args)
           ENV.delete('PB_SERVER_TYPE')
         end
 
         it 'configures the connector type to be socket' do
           load "protobuf/socket.rb"
-          ::Protobuf.connector_type.should == :socket
+          expect(::Protobuf.connector_type).to eq(:socket)
         end
       end
 
@@ -195,12 +195,12 @@ describe ::Protobuf::CLI do
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do
-          ::Protobuf::Rpc::SocketRunner.should_not_receive(:new)
+          expect(::Protobuf::Rpc::SocketRunner).not_to receive(:new)
         end
 
         it 'is activated by the --workers_only switch' do
-          runner.should_receive(:new) do |options|
-            options[:workers_only].should be_true
+          expect(runner).to receive(:new) do |options|
+            expect(options[:workers_only]).to be_truthy
           end.and_return(zmq_runner)
 
           described_class.start(args)
@@ -208,8 +208,8 @@ describe ::Protobuf::CLI do
 
         it 'is activated by PB_WORKERS_ONLY=1 ENV variable' do
           ENV['PB_WORKERS_ONLY'] = "1"
-          runner.should_receive(:new) do |options|
-            options[:workers_only].should be_true
+          expect(runner).to receive(:new) do |options|
+            expect(options[:workers_only]).to be_truthy
           end.and_return(zmq_runner)
 
           described_class.start(args)
@@ -222,12 +222,12 @@ describe ::Protobuf::CLI do
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do
-          ::Protobuf::Rpc::SocketRunner.should_not_receive(:new)
+          expect(::Protobuf::Rpc::SocketRunner).not_to receive(:new)
         end
 
         it 'is activated by the --worker_port switch' do
-          runner.should_receive(:new) do |options|
-            options[:worker_port].should eq(1234)
+          expect(runner).to receive(:new) do |options|
+            expect(options[:worker_port]).to eq(1234)
           end.and_return(zmq_runner)
 
           described_class.start(args)
@@ -239,24 +239,24 @@ describe ::Protobuf::CLI do
         let(:runner) { ::Protobuf::Rpc::ZmqRunner }
 
         before do
-          ::Protobuf::Rpc::SocketRunner.should_not_receive(:new)
+          expect(::Protobuf::Rpc::SocketRunner).not_to receive(:new)
         end
 
         it 'is activated by the --zmq switch' do
-          runner.should_receive(:new)
+          expect(runner).to receive(:new)
           described_class.start(args)
         end
 
         it 'is activated by PB_SERVER_TYPE=Zmq ENV variable' do
           ENV['PB_SERVER_TYPE'] = "Zmq"
-          runner.should_receive(:new)
+          expect(runner).to receive(:new)
           described_class.start(args)
           ENV.delete('PB_SERVER_TYPE')
         end
 
         it 'configures the connector type to be zmq' do
           load "protobuf/zmq.rb"
-          ::Protobuf.connector_type.should == :zmq
+          expect(::Protobuf.connector_type).to eq(:zmq)
         end
       end