protobuf 1.0.1 → 1.1.0.beta0

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

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+shared_examples "a Protobuf Connector" do 
+  subject{ described_class.new({}) }
+
+  context "API" do
+    # Check the API
+    specify{ subject.respond_to?(:send_request, true).should be_true }
+    specify{ subject.respond_to?(:post_init, true).should be_true }
+    specify{ subject.respond_to?(:close_connection, true).should be_true }
+    specify{ subject.respond_to?(:error?, true).should be_true }
+  end
+end
+
+describe Protobuf::Rpc::Connectors::Socket do 
+  subject{ described_class.new({}) }
+
+  it_behaves_like "a Protobuf Connector"
+  
+  specify{ described_class.include?(Protobuf::Rpc::Connectors::Common).should be_true }
+
+  context "#read_response" do
+    let(:data){ "New data" }
+
+    it "fills the buffer with data from the socket" do 
+      socket = StringIO.new("#{data.bytesize}-#{data}")
+      subject.instance_variable_set(:@buffer, Protobuf::Rpc::Buffer.new(:read))
+      subject.instance_variable_set(:@socket, socket)
+      subject.should_receive(:parse_response).and_return(true)
+
+      subject.__send__(:read_response)
+      subject.instance_variable_get(:@buffer).flushed?.should be_true
+      subject.instance_variable_get(:@buffer).data.should eq(data)
+    end
+  end
+
+  context "#check_async" do 
+    it "raises an error when trying to execute asynchronously" do 
+      conn = described_class.new(:async => true) 
+      expect{ conn.__send__(:check_async) }.to raise_error
+    end
+
+    it "allows execution when synchronous" do 
+      conn = described_class.new(:async => false)
+      expect{ conn.__send__(:check_async) }.to_not raise_error
+    end
+  end
+
+end

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'spec/proto/test_service_impl'
+require 'protobuf/rpc/servers/evented_runner'
+
+describe Protobuf::Rpc::EventedServer do
+
+  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     
+  end
+
+  it "Runner provides a stop method" do
+    runner_class = described_class.to_s.gsub(/Server/, "Runner")
+    runner_class = Protobuf::Util.constantize(runner_class)
+    runner_class.respond_to?(:stop).should be_true
+  end
+
+end

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'spec/proto/test_service_impl'
+require 'protobuf/rpc/servers/socket_runner'
+
+describe Protobuf::Rpc::SocketServer do
+  before(:all) do 
+    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?
+  end
+
+  after(:all) do 
+    Protobuf::Rpc::SocketRunner.stop
+    Thread.kill(@server_thread)
+  end
+
+  it "Runner provides a stop method" do
+    runner_class = described_class.to_s.gsub(/Server/, "Runner")
+    runner_class = Protobuf::Util.constantize(runner_class)
+    runner_class.respond_to?(:stop).should be_true
+  end
+
+  it "provides a stop method" 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     
+  end
+
+  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 
+      with_constants "Protobuf::ConnectorType" => "Evented" do
+        client = Spec::Proto::TestService.client(:async => false, :port => 9399, :host => "127.0.0.1")
+
+        client.find(:name => "Test Name", :active => true) do |c|
+          c.on_success do |succ|
+            succ.name.should eq("Test Name")
+            succ.status.should eq(Spec::Proto::StatusType::ENABLED)
+          end
+
+          c.on_failure do |err|
+            raise err.inspect
+          end
+        end
+      end
+    end
+    
+  end
+
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0.beta0
+  prerelease: 6
 platform: ruby
 authors:
 - BJ Neilsen
@@ -14,7 +14,7 @@ date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156121020 !ruby/object:Gem::Requirement
+  requirement: &2152761640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,32 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156121020
+  version_requirements: *2152761640
+- !ruby/object:Gem::Dependency
+  name: eventually
+  requirement: &2152761120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152761120
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2152760580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152760580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156088060 !ruby/object:Gem::Requirement
+  requirement: &2152759880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,18 +55,51 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2156088060
+  version_requirements: *2152759880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156085040 !ruby/object:Gem::Requirement
+  requirement: &2152759400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156085040
+  version_requirements: *2152759400
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2152758820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :development
+  prerelease: false
+  version_requirements: *2152758820
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &2152758240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.2
+  type: :development
+  prerelease: false
+  version_requirements: *2152758240
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2152757720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: *2152757720
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -56,7 +111,7 @@ description: ! 'Ruby implementation for Protocol Buffers. Works with other proto
   went unsuccessful.'
 email:
 - bj.neilsen@gmail.com
-- brandonsdewitt@gmail.com
+- brandonsdewitt+protobuf@gmail.com
 executables:
 - rpc_server
 - rprotoc
@@ -64,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -105,6 +161,7 @@ files:
 - lib/protobuf/rpc/client.rb
 - lib/protobuf/rpc/connector.rb
 - lib/protobuf/rpc/connectors/base.rb
+- lib/protobuf/rpc/connectors/common.rb
 - lib/protobuf/rpc/connectors/em_client.rb
 - lib/protobuf/rpc/connectors/eventmachine.rb
 - lib/protobuf/rpc/connectors/socket.rb
@@ -113,6 +170,10 @@ files:
 - lib/protobuf/rpc/error/server_error.rb
 - lib/protobuf/rpc/rpc.pb.rb
 - lib/protobuf/rpc/server.rb
+- lib/protobuf/rpc/servers/evented_runner.rb
+- lib/protobuf/rpc/servers/evented_server.rb
+- lib/protobuf/rpc/servers/socket_runner.rb
+- lib/protobuf/rpc/servers/socket_server.rb
 - lib/protobuf/rpc/service.rb
 - lib/protobuf/rpc/stat.rb
 - lib/protobuf/version.rb
@@ -122,6 +183,7 @@ files:
 - spec/functional/embedded_service_spec.rb
 - spec/helper/all.rb
 - spec/helper/server.rb
+- spec/helper/silent_constants.rb
 - spec/helper/tolerance_matcher.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
@@ -134,9 +196,12 @@ files:
 - spec/unit/rpc/client_spec.rb
 - spec/unit/rpc/connector_spec.rb
 - spec/unit/rpc/connectors/base_spec.rb
-- spec/unit/rpc/connectors/eventmachine/client_spec.rb
+- spec/unit/rpc/connectors/common_spec.rb
+- spec/unit/rpc/connectors/eventmachine_client_spec.rb
 - spec/unit/rpc/connectors/eventmachine_spec.rb
-- spec/unit/rpc/server_spec.rb
+- spec/unit/rpc/connectors/socket_spec.rb
+- spec/unit/rpc/servers/evented_server_spec.rb
+- spec/unit/rpc/servers/socket_server_spec.rb
 - spec/unit/rpc/service_spec.rb
 - test/check_unbuild.rb
 - test/data/data.bin
@@ -199,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -213,6 +278,7 @@ test_files:
 - spec/functional/embedded_service_spec.rb
 - spec/helper/all.rb
 - spec/helper/server.rb
+- spec/helper/silent_constants.rb
 - spec/helper/tolerance_matcher.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
@@ -225,9 +291,12 @@ test_files:
 - spec/unit/rpc/client_spec.rb
 - spec/unit/rpc/connector_spec.rb
 - spec/unit/rpc/connectors/base_spec.rb
-- spec/unit/rpc/connectors/eventmachine/client_spec.rb
+- spec/unit/rpc/connectors/common_spec.rb
+- spec/unit/rpc/connectors/eventmachine_client_spec.rb
 - spec/unit/rpc/connectors/eventmachine_spec.rb
-- spec/unit/rpc/server_spec.rb
+- spec/unit/rpc/connectors/socket_spec.rb
+- spec/unit/rpc/servers/evented_server_spec.rb
+- spec/unit/rpc/servers/socket_server_spec.rb
 - spec/unit/rpc/service_spec.rb
 - test/check_unbuild.rb
 - test/data/data.bin
@@ -275,3 +344,4 @@ test_files:
 - test/test_serialize.rb
 - test/test_standard_message.rb
 - test/test_types.rb
+has_rdoc: 

data/spec/unit/rpc/server_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'protobuf/rpc/server'
-require 'spec/proto/test_service_impl'
-
-describe Protobuf::Rpc::Server do
-  context 'when sending response objects' do
-    it 'should be able to send a hash object as a response' do
-      server = Protobuf::Rpc::Server.new
-      
-      # Setup the right mocks
-      server.instance_variable_set(:@klass, Spec::Proto::TestService)
-      response_wrapper = mock('response')
-      response_wrapper.stub(:response_proto=)
-      server.instance_variable_set(:@response, response_wrapper)
-      Spec::Proto::TestService.stub_chain(:rpcs, :[], :[], :response_type).and_return(Spec::Proto::ResourceFindRequest)
-      
-      # Setup expectations
-      hash_response = {:name => 'Test Name', :active => false}
-      expected = Spec::Proto::ResourceFindRequest.new(hash_response)
-      Spec::Proto::ResourceFindRequest.should_receive(:new).with(hash_response).and_return(expected)
-      server.should_not_receive(:handle_error)
-      
-      # Call the method
-      server.send(:parse_response_from_service, hash_response)
-    end
-  end
-end