protobuf 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae0f4fcbb6ab57fe7866db45ea440c29899979d
-  data.tar.gz: 0fb43022f7937ae06df7185a611eead5a9f2b217
+  metadata.gz: fa760a7ec58543a5e0cc40c95f95240646291506
+  data.tar.gz: ecd9644df44958b8f3330b574c119ba3b15e9f8d
 SHA512:
-  metadata.gz: b063acb75ac9ce464056edc2d418cc588e6b0ac0b885441a57f9dfc8c5795ee87faba8d393c09f6a91a8d12417808a2dd5603643988bd8c821b76dc1fd1608dd
-  data.tar.gz: 310368ac66f9e72150575ef01ec7f6cd7a1fba31a5bf33b926ca0743b1e907b623fd566d4b95f8a19ee4c5fc3b02b5d564049e2dbaae41c3f86997a679dcf847
+  metadata.gz: d33d3de6834639e094746377c53f3cebd3116306ec235fb358ce7be64ed18e2d158fdb79eb216e294ce8417a1d2962622a66d5e430245620bbd07290190d84eb
+  data.tar.gz: f3e322395f7c27c30559869d8df4147a80da23a391f4020c5df19db58295fd5a3414c18bc7198cef0100af50ce15128c2f9df83a1ee109795878334307bae9f6

data/.gitignore

@@ -3,6 +3,7 @@
 pkg/*
 .bundle
 .rvmrc
+.rspec
 *.log
 coverage
 doc

data/CHANGES.md

@@ -1,3 +1,9 @@
+2.8.7
+---------
+
+- Fire ActiveSupport load hooks when RPC Server and Client classes are loaded. [#126, @liveh2o]
+- Prevent infinite loop when doing service lookup from directory. [#125, @brianstien]
+
 2.8.6
 ---------
 

data/README.md

@@ -3,8 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/protobuf.png)](http://badge.fury.io/rb/protobuf)
 [![Build Status](https://secure.travis-ci.org/localshred/protobuf.png?branch=master)](https://travis-ci.org/localshred/protobuf)
 
-___See [CHANGES.md](https://github.com/localshred/protobuf/blob/master/CHANGES.md) for up-to-date 
- API changes.___
+___See [CHANGES.md](https://github.com/localshred/protobuf/blob/master/CHANGES.md) or [Release Notes](https://github.com/localshred/protobuf/releases) for significant version changes.___
 
 Protobuf is an implementation of [Google's protocol buffers][google-pb] in ruby, version 2.5.0 is currently supported.
 

data/lib/protobuf/rpc/client.rb

@@ -162,5 +162,9 @@ module Protobuf
       end
 
     end
+
+    if ActiveSupport::VERSION::MAJOR > 2
+      ActiveSupport.run_load_hooks(:protobuf_rpc_client, Client)
+    end
   end
 end

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

@@ -87,13 +87,21 @@ module Protobuf
         # to the host and port in the options
         #
         def lookup_server_uri
-          begin
-            listing = service_directory.lookup(service)
-            host = listing.try(:address) || options[:host]
-            port = listing.try(:port) || options[:port]
-          end until host_alive?( host )
+          5.times do
+            service_directory.all_listings_for(service).each do |listing|
+              host = listing.try(:address)
+              port = listing.try(:port)
+              return "tcp://#{host}:#{port}" if host_alive?(host)
+            end
+
+            host = options[:host]
+            port = options[:port]
+            return "tcp://#{host}:#{port}" if host_alive?(host)
+
+            sleep 1
+          end
 
-          "tcp://#{host}:#{port}"
+          raise "Host not found for service #{service}"
         end
 
         def host_alive?(host)
@@ -145,7 +153,7 @@ module Protobuf
           end
         ensure
           log_debug { sign_message("Closing Socket")  }
-          zmq_error_check(socket.close, :socket_close)
+          zmq_error_check(socket.close, :socket_close) if socket
           log_debug { sign_message("Socket closed")  }
         end
 

data/lib/protobuf/rpc/service.rb

@@ -205,5 +205,9 @@ module Protobuf
       end
 
     end
+
+    if ActiveSupport::VERSION::MAJOR > 2
+      ActiveSupport.run_load_hooks(:protobuf_rpc_service, Service)
+    end
   end
 end

data/lib/protobuf/rpc/service_directory.rb

@@ -85,6 +85,14 @@ module Protobuf
         reset
       end
 
+      def all_listings_for(service)
+        if running? && @listings_by_service.key?(service.to_s)
+          @listings_by_service[service.to_s].entries.shuffle
+        else
+          []
+        end
+      end
+
       def each_listing(&block)
         @listings_by_uuid.each_value(&block)
       end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.6'
+  VERSION = '2.8.7'
   PROTOC_VERSION = '2.5.0'
 end

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

@@ -31,6 +31,7 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
   describe "#lookup_server_uri" do
     let(:service_directory) { double('ServiceDirectory', :running? => running? ) }
     let(:listing) { double('Listing', :address => '127.0.0.2', :port => 9399) }
+    let(:listings) { [listing] }
     let(:running?) { true }
 
     before do
@@ -39,12 +40,12 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
 
     context "when the service directory is running" do
       it "searches the service directory" do
-        service_directory.should_receive(:lookup).and_return(listing)
+        service_directory.stub(:all_listings_for).and_return(listings)
         subject.send(:lookup_server_uri).should eq "tcp://127.0.0.2:9399"
       end
 
       it "defaults to the options" do
-        service_directory.should_receive(:lookup) { nil }
+        service_directory.stub(:all_listings_for).and_return([])
         subject.send(:lookup_server_uri).should eq "tcp://127.0.0.1:9400"
       end
     end
@@ -53,17 +54,25 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
       let(:running?) { false }
 
       it "defaults to the options" do
-        service_directory.should_receive(:lookup) { nil }
+        service_directory.stub(:all_listings_for).and_return([])
         subject.send(:lookup_server_uri).should eq "tcp://127.0.0.1:9400"
       end
     end
 
     it "checks if the server is alive" do
-      service_directory.should_receive(:lookup) { nil }
+      service_directory.stub(:all_listings_for).and_return([])
       subject.should_receive(:host_alive?).with("127.0.0.1") { true }
       subject.send(:lookup_server_uri).should eq "tcp://127.0.0.1:9400"
     end
 
+    context "when no host is alive" do
+      it "raises an error" do
+        service_directory.stub(:all_listings_for).and_return(listings)
+        subject.stub(:host_alive?).and_return(false)
+        expect { subject.send(:lookup_server_uri) }.to raise_error
+      end
+    end
+
   end
 
   describe "#host_alive?" do

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

@@ -154,6 +154,23 @@ describe ::Protobuf::Rpc::ServiceDirectory do
       send_beacon(:flatline, echo_server)
     end
 
+    describe "#all_listings_for" do
+      context "when listings are present" do
+        it "returns all listings for a given service" do
+          send_beacon(:heartbeat, hello_server)
+          send_beacon(:heartbeat, combo_server)
+
+          subject.all_listings_for("HelloService").size.should eq(2)
+        end
+      end
+
+      context "when no listings are present" do
+        it "returns and empty array" do
+          subject.all_listings_for("HelloService").size.should eq(0)
+        end
+      end
+    end
+
     describe "#each_listing" do
       it "should yield to a block for each listing" do
         send_beacon(:heartbeat, hello_server)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport