protobuf 3.4.2 → 3.4.3

data/.rubocop.yml

@@ -6,6 +6,9 @@ Lint/EndAlignment:
 Lint/Loop:
   Enabled: false
 
+Metrics/ClassLength:
+  Enabled: false
+
 Style/CaseIndentation:
   IndentWhenRelativeTo: end
 

data/lib/protobuf/message/serialization.rb

@@ -11,6 +11,10 @@ module Protobuf
           new.decode(bytes)
         end
 
+        def decode_from(stream)
+          new.decode_from(stream)
+        end
+
         # Create a new object with the given values and return the encoded bytes.
         def encode(fields = {})
           new(fields).encode

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

@@ -59,11 +59,25 @@ module Protobuf
         # Private Instance methods
         #
         def check_available_rcv_timeout
-          @check_available_rcv_timeout ||= [ENV["PB_ZMQ_CLIENT_CHECK_AVAILABLE_RCV_TIMEOUT"].to_i, 200].max
+          @check_available_rcv_timeout ||= begin
+            case
+            when ENV.key?("PB_ZMQ_CLIENT_CHECK_AVAILABLE_RCV_TIMEOUT") then
+              ENV["PB_ZMQ_CLIENT_CHECK_AVAILABLE_RCV_TIMEOUT"].to_i
+            else
+              200 # ms
+            end
+          end
         end
 
         def check_available_snd_timeout
-          @check_available_snd_timeout ||= [ENV["PB_ZMQ_CLIENT_CHECK_AVAILABLE_SND_TIMEOUT"].to_i, 200].max
+          @check_available_snd_timeout ||= begin
+            case
+            when ENV.key?("PB_ZMQ_CLIENT_CHECK_AVAILABLE_SND_TIMEOUT") then
+              ENV["PB_ZMQ_CLIENT_CHECK_AVAILABLE_SND_TIMEOUT"].to_i
+            else
+              200 # ms
+            end
+          end
         end
 
         def close_connection

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

@@ -23,6 +23,7 @@ module Protobuf
 
         def run
           @idle_workers = []
+          @running = true
 
           loop do
             process_local_queue
@@ -39,10 +40,11 @@ module Protobuf
           end
         ensure
           teardown
+          @running = false
         end
 
         def running?
-          @server.running?
+          @running && @server.running?
         end
 
         private

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

@@ -76,6 +76,10 @@ module Protobuf
           !brokerless? && options[:broadcast_beacons]
         end
 
+        def broadcast_busy?
+          broadcast_beacons? && options[:broadcast_busy]
+        end
+
         def broadcast_flatline
           flatline = ::Protobuf::Rpc::DynamicDiscovery::Beacon.new(
             :beacon_type => ::Protobuf::Rpc::DynamicDiscovery::BeaconType::FLATLINE,
@@ -176,15 +180,11 @@ module Protobuf
 
         def run
           @running = true
-
-          start_broker unless brokerless?
-          start_missing_workers
-
           yield if block_given? # runs on startup
           wait_for_shutdown_signal
           broadcast_flatline if broadcast_beacons?
           Thread.pass until reap_dead_workers.empty?
-          @broker.join unless brokerless?
+          @broker_thread.join unless brokerless?
         ensure
           @running = false
           teardown
@@ -246,14 +246,13 @@ module Protobuf
           loop do
             break if IO.select([@shutdown_r], nil, nil, timeout)
 
-            if reap_dead_workers?
-              reap_dead_workers
-              start_missing_workers
-            end
+            start_broker unless brokerless?
+            reap_dead_workers if reap_dead_workers?
+            start_missing_workers
 
             next unless broadcast_heartbeat?
 
-            if options[:broadcast_busy] && all_workers_busy?
+            if broadcast_busy? && all_workers_busy?
               broadcast_flatline
             else
               broadcast_heartbeat
@@ -285,15 +284,29 @@ module Protobuf
         end
 
         def start_broker
-          @broker = Thread.new(self) do |server|
-            ::Protobuf::Rpc::Zmq::Broker.new(server).run
+          return if @broker && @broker.running? && !@broker_thread.stop?
+          if @broker && !@broker.running?
+            broadcast_flatline if broadcast_busy?
+            @broker_thread.join if @broker_thread
+            init_zmq_context # need a new context to restart the broker
+          end
+
+          @broker = ::Protobuf::Rpc::Zmq::Broker.new(self)
+          @broker_thread = Thread.new(@broker) do |broker|
+            begin
+              broker.run
+            rescue => e
+              message = "Broker failed: #{e.inspect}\n #{e.backtrace.join($INPUT_RECORD_SEPARATOR)}"
+              $stderr.puts(message)
+              logger.error { message }
+            end
           end
         end
 
         def start_worker
-          @workers << Thread.new(self) do |server|
+          @workers << Thread.new(self, @broker) do |server, broker|
             begin
-              ::Protobuf::Rpc::Zmq::Worker.new(server).run
+              ::Protobuf::Rpc::Zmq::Worker.new(server, broker).run
             rescue => e
               message = "Worker failed: #{e.inspect}\n #{e.backtrace.join($INPUT_RECORD_SEPARATOR)}"
               $stderr.puts(message)

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

@@ -12,8 +12,9 @@ module Protobuf
         ##
         # Constructor
         #
-        def initialize(server)
+        def initialize(server, broker)
           @server = server
+          @broker = broker
 
           init_zmq_context
           init_backend_socket
@@ -61,7 +62,7 @@ module Protobuf
         end
 
         def running?
-          @server.running?
+          @broker.running? && @server.running?
         end
 
         private

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.4.2'
+  VERSION = '3.4.3'
 end

data/spec/lib/protobuf/message_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'stringio'
 require 'spec_helper'
 
 RSpec.describe Protobuf::Message do
@@ -71,6 +72,15 @@ RSpec.describe Protobuf::Message do
     end
   end
 
+  describe '.decode_from' do
+    let(:message) { ::Test::Resource.new(:name => "Jim") }
+
+    it 'creates a new message object decoded from the given byte stream' do
+      stream = ::StringIO.new(message.encode)
+      expect(::Test::Resource.decode_from(stream)).to eq message
+    end
+  end
+
   describe 'defining a new field' do
     context 'when defining a field with a tag that has already been used' do
       it 'raises a TagCollisionError' do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
+  prerelease: 
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,202 +12,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -221,11 +250,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
+- .yardopts
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -401,96 +430,33 @@ files:
 homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2458400158971729281
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2458400158971729281
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
-test_files:
-- spec/benchmark/tasks.rb
-- spec/bin/protoc-gen-ruby_spec.rb
-- spec/data/data.bin
-- spec/data/types.bin
-- spec/encoding/all_types_spec.rb
-- spec/encoding/extreme_values_spec.rb
-- spec/functional/socket_server_spec.rb
-- spec/functional/zmq_server_spec.rb
-- spec/lib/protobuf/cli_spec.rb
-- spec/lib/protobuf/code_generator_spec.rb
-- spec/lib/protobuf/enum_spec.rb
-- spec/lib/protobuf/field/float_field_spec.rb
-- spec/lib/protobuf/field/int32_field_spec.rb
-- spec/lib/protobuf/field/string_field_spec.rb
-- spec/lib/protobuf/field_spec.rb
-- spec/lib/protobuf/generators/base_spec.rb
-- spec/lib/protobuf/generators/enum_generator_spec.rb
-- spec/lib/protobuf/generators/extension_generator_spec.rb
-- spec/lib/protobuf/generators/field_generator_spec.rb
-- spec/lib/protobuf/generators/file_generator_spec.rb
-- spec/lib/protobuf/generators/message_generator_spec.rb
-- spec/lib/protobuf/generators/service_generator_spec.rb
-- spec/lib/protobuf/lifecycle_spec.rb
-- spec/lib/protobuf/message_spec.rb
-- spec/lib/protobuf/optionable_spec.rb
-- spec/lib/protobuf/rpc/client_spec.rb
-- spec/lib/protobuf/rpc/connector_spec.rb
-- spec/lib/protobuf/rpc/connectors/base_spec.rb
-- spec/lib/protobuf/rpc/connectors/common_spec.rb
-- spec/lib/protobuf/rpc/connectors/socket_spec.rb
-- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
-- spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb
-- spec/lib/protobuf/rpc/middleware/logger_spec.rb
-- spec/lib/protobuf/rpc/middleware/request_decoder_spec.rb
-- spec/lib/protobuf/rpc/middleware/response_encoder_spec.rb
-- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
-- spec/lib/protobuf/rpc/service_directory_spec.rb
-- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
-- spec/lib/protobuf/rpc/service_filters_spec.rb
-- spec/lib/protobuf/rpc/service_spec.rb
-- spec/lib/protobuf/rpc/stat_spec.rb
-- spec/lib/protobuf_spec.rb
-- spec/spec_helper.rb
-- spec/support/all.rb
-- spec/support/packed_field.rb
-- spec/support/server.rb
-- spec/support/test/all_types.data.bin
-- spec/support/test/all_types.data.txt
-- spec/support/test/defaults.pb.rb
-- spec/support/test/defaults.proto
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/extended.pb.rb
-- spec/support/test/extended.proto
-- spec/support/test/extreme_values.data.bin
-- spec/support/test/google_unittest.pb.rb
-- spec/support/test/google_unittest.proto
-- spec/support/test/google_unittest_import.pb.rb
-- spec/support/test/google_unittest_import.proto
-- spec/support/test/google_unittest_import_public.pb.rb
-- spec/support/test/google_unittest_import_public.proto
-- spec/support/test/multi_field_extensions.pb.rb
-- spec/support/test/multi_field_extensions.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
-- spec/support/test_app_file.rb
+test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7ab4fb52f93dfd58648db2463454e2b73215ec42
-  data.tar.gz: 32a62725dc2677e231d3ec63cd335fa3b3026316
-SHA512:
-  metadata.gz: 9f32ea8b0ef6e9339d43187648c438343e3643e5577a39b9c19f72fbf5749bbb6c614fdb1f4f53d3979ea3e75b67213d6afb81e1ce9bb6fabcf77e4db2dd6d1f
-  data.tar.gz: 2fc11caaa7c981e93f2515f8ebf4affc6e8fe9ba41a99314b7f4e005144b055a2c29018856b3652e17c91e187c2f1c44d267053374b8c1c1910079dfc5524878