protobuf 1.1.3 → 1.3.0

data/spec/unit/rpc/connectors/zmq_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ::Protobuf::Rpc::Connectors::Zmq do
+  let(:socket_mock) do
+    sm = mock(::ZMQ::Socket)
+    sm.stub(:connect).and_return(0)
+    sm
+  end
+
+  let(:zmq_context_mock) do
+    zc = mock(::ZMQ::Context)
+    zc.stub(:socket).and_return(socket_mock)
+    zc
+  end
+
+  before(:each) do
+    ::ZMQ::Context.stub(:new).and_return(zmq_context_mock)
+  end
+
+  it 'raises if async is true' do
+    expect {
+      described_class.new(async: true).send_request
+    }.to raise_error
+  end
+
+
+end

data/spec/unit/rpc/servers/evented_server_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 require 'spec/proto/test_service_impl'
 require 'protobuf/rpc/servers/evented_runner'
 
-describe Protobuf::Rpc::EventedServer do
+describe Protobuf::Rpc::Evented::Server do
 
   it "provides a Runner class" do 
-    runner_class = described_class.to_s.gsub(/Server/, "Runner")
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
     expect { Protobuf::Util.constantize(runner_class) }.to_not raise_error     
   end
 
   it "Runner provides a stop method" do
-    runner_class = described_class.to_s.gsub(/Server/, "Runner")
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
     runner_class = Protobuf::Util.constantize(runner_class)
     runner_class.respond_to?(:stop).should be_true
   end

data/spec/unit/rpc/servers/socket_server_spec.rb

@@ -2,20 +2,21 @@ require 'spec_helper'
 require 'spec/proto/test_service_impl'
 require 'protobuf/rpc/servers/socket_runner'
 
-describe Protobuf::Rpc::SocketServer do
-  before(:all) do 
+describe Protobuf::Rpc::Socket::Server do
+  before(:all) do
+    Thread.abort_on_exception = true
     server = OpenStruct.new(:server => "127.0.0.1", :port => 9399, :backlog => 100, :threshold => 100)
     @server_thread = Thread.new(server) { |s| Protobuf::Rpc::SocketRunner.run(s) }
-    Thread.pass until Protobuf::Rpc::SocketServer.running?
+    Thread.pass until Protobuf::Rpc::Socket::Server.running?
   end
 
-  after(:all) do 
+  after(:all) do
     Protobuf::Rpc::SocketRunner.stop
-    Thread.kill(@server_thread)
+    @server_thread.join
   end
 
   it "Runner provides a stop method" do
-    runner_class = described_class.to_s.gsub(/Server/, "Runner")
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
     runner_class = Protobuf::Util.constantize(runner_class)
     runner_class.respond_to?(:stop).should be_true
   end
@@ -24,17 +25,17 @@ describe Protobuf::Rpc::SocketServer do
     described_class.respond_to?(:stop).should be_true
   end
 
-  it "provides a Runner class" do 
-    runner_class = described_class.to_s.gsub(/Server/, "Runner")
-    expect { Protobuf::Util.constantize(runner_class) }.to_not raise_error     
+  it "provides a Runner class" do
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
+    expect { Protobuf::Util.constantize(runner_class) }.to_not raise_error
   end
 
-  it "signals the Server is running" do 
+  it "signals the Server is running" do
     described_class.running?.should be_true
   end
 
-  context "Eventmachine client" do 
-    it "calls the service in the client request" do 
+  context "Eventmachine client" do
+    it "calls the service in the client request" do
       with_constants "Protobuf::ClientType" => "Evented" do
         client = Spec::Proto::TestService.client(:async => false, :port => 9399, :host => "127.0.0.1")
 
@@ -50,7 +51,7 @@ describe Protobuf::Rpc::SocketServer do
         end
       end
     end
-    
+
   end
 
 end

data/spec/unit/rpc/servers/zmq/broker_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ::Protobuf::Rpc::Zmq::Broker do
+  after(:each) do
+    subject.teardown
+  end
+
+  it 'sets up a context' do
+    subject.context.should be_a(::ZMQ::Context)
+  end
+
+  it 'sets up a frontend socket' do
+    subject.frontend.should be_a(::ZMQ::Socket)
+  end
+
+  it 'sets up a backend socket' do
+    subject.backend.should be_a(::ZMQ::Socket)
+  end
+
+  it 'sets up a polling object' do
+    subject.poller.should be_a(::ZMQ::Poller)
+  end
+
+  describe '#poll' do
+    # no unit tests for this method
+  end
+end

data/spec/unit/rpc/servers/zmq/server_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'protobuf/rpc/servers/zmq/server'
+
+describe Protobuf::Rpc::Zmq::Server do
+  describe '.running?' do
+    it 'returns true if running' do
+      described_class.instance_variable_set(:@running, true)
+      described_class.running?.should be_true
+    end
+
+    it 'returns false if not running' do
+      described_class.instance_variable_set(:@running, false)
+      described_class.running?.should be_false
+    end
+  end
+
+  describe '.stop' do
+    # keep threads instance variable from retaining any thread mocks we've
+    # created (breaks tests down the line, otherwise)
+    after(:each) do
+      described_class.instance_variable_set(:@threads, [])
+    end
+
+    it 'lets all threads stop' do
+      thread_mock = double(Thread)
+      thread_mock.should_receive(:join)
+      described_class.instance_variable_set(:@threads, [thread_mock])
+      described_class.stop
+    end
+
+    it 'sets running to false' do
+      described_class.instance_variable_set(:@threads, [])
+      described_class.stop
+      described_class.instance_variable_get(:@running).should be_false
+    end
+  end
+end

data/spec/unit/rpc/servers/zmq/util_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+class UtilTest
+  include ::Protobuf::Rpc::Zmq::Util
+end
+
+describe ::Protobuf::Rpc::Zmq::Util do
+  subject { UtilTest.new }
+  describe '#zmq_error_check' do
+    it 'raises when the error code is less than 0' do
+      expect {
+        subject.zmq_error_check(-1)
+      }.to raise_error
+    end
+
+    it 'retrieves the error string from ZeroMQ' do
+      ZMQ::Util.stub(:error_string).and_return('an error from zmq')
+      expect {
+        subject.zmq_error_check(-1)
+      }.to raise_error(RuntimeError, /an error from zmq/i)
+    end
+
+    it 'does nothing if the error code is > 0' do
+      expect {
+        subject.zmq_error_check(1)
+      }.to_not raise_error
+    end
+
+    it 'does nothing if the error code is == 0' do
+      expect {
+        subject.zmq_error_check(0)
+      }.to_not raise_error
+    end
+  end
+
+  describe '#log_signature' do
+    it 'returns the signature for the log' do
+      subject.log_signature.should include('server', 'UtilTest')
+    end
+  end
+end

data/spec/unit/rpc/servers/zmq/worker_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe ::Protobuf::Rpc::Zmq::Worker do
+  after(:each) do
+    subject.instance_variable_get(:@socket).close
+    subject.instance_variable_get(:@zmq_context).terminate
+  end
+
+  it 'sets the context' do
+    subject.instance_variable_get(:@zmq_context).should be_a(::ZMQ::Context)
+  end
+
+  it 'sets the poller' do
+    subject.instance_variable_get(:@socket).should be_a(::ZMQ::Socket)
+  end
+
+  it 'sets the socket' do
+    subject.instance_variable_get(:@poller).should be_a(::ZMQ::Poller)
+  end
+
+  describe '#run' do
+    # not tested via unit tests
+  end
+
+  describe '#handle_request' do
+    # not tested via unit tests
+  end
+
+  describe '#initialize_buffers' do
+    # not tested via unit tests
+  end
+
+  describe '#send_data' do
+    # not tested via unit tests
+  end
+end

data/spec/unit/rpc/service_spec.rb

@@ -2,34 +2,38 @@ require 'spec_helper'
 require 'spec/proto/test_service_impl'
 
 describe Protobuf::Rpc::Service do
-  
+
   context 'when configuring' do
     before :each do
       reset_service_location Spec::Proto::TestService
     end
-  
+
     it 'should have a default location configured' do
       Spec::Proto::TestService.host.should == Protobuf::Rpc::Service::DEFAULT_LOCATION[:host]
       Spec::Proto::TestService.port.should == Protobuf::Rpc::Service::DEFAULT_LOCATION[:port]
     end
-  
+
     it "should be able to pre-configure a service location for clients" do
       Spec::Proto::TestService.located_at 'google.com:12345'
       client = Spec::Proto::TestService.client
       client.options[:host].should == 'google.com'
       client.options[:port].should == 12345
     end
-  
-    it 'should be able to configure and read the host' do
-      Spec::Proto::TestService.configure :host => 'somehost.com'
-      Spec::Proto::TestService.host.should == 'somehost.com'
+
+    context 'configuring host' do
+      before(:each) { Spec::Proto::TestService.configure :host => 'somehost.com' }
+      after(:each) { Spec::Proto::TestService.configure :host => '127.0.0.1' }
+
+      it 'should be able to configure and read the host' do
+        Spec::Proto::TestService.host.should == 'somehost.com'
+      end
     end
-  
+
     it 'should be able to configure and read the port' do
       Spec::Proto::TestService.configure :port => 12345
       Spec::Proto::TestService.port.should == 12345
     end
-  
+
     it 'should skip configuring location if the location passed does not match host:port syntax' do
       invalid_locations = [nil, 'myhost:', ':9939', 'badhost123']
       invalid_locations.each do |location|
@@ -39,9 +43,9 @@ describe Protobuf::Rpc::Service do
       end
     end
   end
-  
+
   context 'when server calls the service method' do
-    
+
     before(:all) do
       class ::NewTestService < Protobuf::Rpc::Service
         rpc :bad_method, Spec::Proto::ResourceFindRequest, Spec::Proto::Resource
@@ -55,21 +59,21 @@ describe Protobuf::Rpc::Service do
         end
       end
     end
-    
+
     it 'raises an undefined method name error when calling a method on a non-existant object' do
       expect {
-        req = mock('RequestWrapper', :request_proto => Spec::Proto::ResourceFindRequest.new.to_s)
+        req = mock('RequestWrapper', :request_proto => Spec::Proto::ResourceFindRequest.new(:name => 'mmeh').to_s)
         ::NewTestService.new.bad_method(req)
       }.to raise_error(NoMethodError)
     end
-    
+
     it 'raises a name error when accessing a non-existant object' do
       expect {
-        req = mock('RequestWrapper', :request_proto => Spec::Proto::ResourceFindRequest.new.to_s)
+        req = mock('RequestWrapper', :request_proto => Spec::Proto::ResourceFindRequest.new(:name => 'mmeh').to_s)
         ::NewTestService.new.bad_var(req)
       }.to raise_error(NameError)
     end
-    
+
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,96 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2012-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152846700 !ruby/object:Gem::Requirement
+  requirement: &2160220480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152846700
+  version_requirements: *2160220480
 - !ruby/object:Gem::Dependency
   name: eventually
-  requirement: &2152845660 !ruby/object:Gem::Requirement
+  requirement: &2160220060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152845660
+  version_requirements: *2160220060
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2152844280 !ruby/object:Gem::Requirement
+  requirement: &2160219640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152844280
+  version_requirements: *2160219640
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq
+  requirement: &2160219220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160219220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152843280 !ruby/object:Gem::Requirement
+  requirement: &2160218800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152843280
+  version_requirements: *2160218800
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152817360 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &2160218380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152817360
+  version_requirements: *2160218380
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2152816600 !ruby/object:Gem::Requirement
+  name: pry-nav
+  requirement: &2160217960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152816600
+  version_requirements: *2160217960
 - !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &2152815800 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2160217540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2160217540
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2160217120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152815800
+  version_requirements: *2160217120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152814840 !ruby/object:Gem::Requirement
+  requirement: &2160216700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152814840
+  version_requirements: *2160216700
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -165,15 +187,22 @@ files:
 - lib/protobuf/rpc/connectors/em_client.rb
 - lib/protobuf/rpc/connectors/eventmachine.rb
 - lib/protobuf/rpc/connectors/socket.rb
+- lib/protobuf/rpc/connectors/zmq.rb
 - lib/protobuf/rpc/error.rb
 - lib/protobuf/rpc/error/client_error.rb
 - lib/protobuf/rpc/error/server_error.rb
 - lib/protobuf/rpc/rpc.pb.rb
 - lib/protobuf/rpc/server.rb
+- lib/protobuf/rpc/servers/evented/server.rb
 - lib/protobuf/rpc/servers/evented_runner.rb
-- lib/protobuf/rpc/servers/evented_server.rb
+- lib/protobuf/rpc/servers/socket/server.rb
+- lib/protobuf/rpc/servers/socket/worker.rb
 - lib/protobuf/rpc/servers/socket_runner.rb
-- lib/protobuf/rpc/servers/socket_server.rb
+- lib/protobuf/rpc/servers/zmq/broker.rb
+- lib/protobuf/rpc/servers/zmq/server.rb
+- lib/protobuf/rpc/servers/zmq/util.rb
+- lib/protobuf/rpc/servers/zmq/worker.rb
+- lib/protobuf/rpc/servers/zmq_runner.rb
 - lib/protobuf/rpc/service.rb
 - lib/protobuf/rpc/stat.rb
 - lib/protobuf/version.rb
@@ -182,10 +211,14 @@ files:
 - script/mk_parser
 - spec/benchmark/tasks.rb
 - spec/functional/embedded_service_spec.rb
+- spec/functional/evented_server_spec.rb
+- spec/functional/socket_server_spec.rb
+- spec/functional/zmq_server_spec.rb
 - spec/helper/all.rb
 - spec/helper/server.rb
 - spec/helper/silent_constants.rb
 - spec/helper/tolerance_matcher.rb
+- spec/lib/protobuf/message/encoder_spec.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
 - spec/proto/test_service.rb
@@ -202,8 +235,13 @@ files:
 - spec/unit/rpc/connectors/eventmachine_client_spec.rb
 - spec/unit/rpc/connectors/eventmachine_spec.rb
 - spec/unit/rpc/connectors/socket_spec.rb
+- spec/unit/rpc/connectors/zmq_spec.rb
 - spec/unit/rpc/servers/evented_server_spec.rb
 - spec/unit/rpc/servers/socket_server_spec.rb
+- spec/unit/rpc/servers/zmq/broker_spec.rb
+- spec/unit/rpc/servers/zmq/server_spec.rb
+- spec/unit/rpc/servers/zmq/util_spec.rb
+- spec/unit/rpc/servers/zmq/worker_spec.rb
 - spec/unit/rpc/service_spec.rb
 - test/check_unbuild.rb
 - test/data/data.bin
@@ -271,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby implementation for Protocol Buffers. Works with other protobuf rpc implementations
@@ -279,10 +317,14 @@ summary: Ruby implementation for Protocol Buffers. Works with other protobuf rpc
 test_files:
 - spec/benchmark/tasks.rb
 - spec/functional/embedded_service_spec.rb
+- spec/functional/evented_server_spec.rb
+- spec/functional/socket_server_spec.rb
+- spec/functional/zmq_server_spec.rb
 - spec/helper/all.rb
 - spec/helper/server.rb
 - spec/helper/silent_constants.rb
 - spec/helper/tolerance_matcher.rb
+- spec/lib/protobuf/message/encoder_spec.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
 - spec/proto/test_service.rb
@@ -299,8 +341,13 @@ test_files:
 - spec/unit/rpc/connectors/eventmachine_client_spec.rb
 - spec/unit/rpc/connectors/eventmachine_spec.rb
 - spec/unit/rpc/connectors/socket_spec.rb
+- spec/unit/rpc/connectors/zmq_spec.rb
 - spec/unit/rpc/servers/evented_server_spec.rb
 - spec/unit/rpc/servers/socket_server_spec.rb
+- spec/unit/rpc/servers/zmq/broker_spec.rb
+- spec/unit/rpc/servers/zmq/server_spec.rb
+- spec/unit/rpc/servers/zmq/util_spec.rb
+- spec/unit/rpc/servers/zmq/worker_spec.rb
 - spec/unit/rpc/service_spec.rb
 - test/check_unbuild.rb
 - test/data/data.bin