protobuf 1.1.1 → 1.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    protobuf (1.1.1)
+    protobuf (1.1.2)
       eventmachine (~> 0.12.10)
       eventually (~> 0.1.0)
       json_pure (~> 1.6.4)

data/lib/protobuf.rb

@@ -6,9 +6,13 @@ require 'stringio'
 module Protobuf
 end
 
+
+Protobuf::ClientType = ENV['PB_CLIENT_TYPE'] if ENV['PB_CLIENT_TYPE']
+Protobuf::ServerType = ENV['PB_SERVER_TYPE'] if ENV['PB_SERVER_TYPE']
+
 # When setting up a client
-unless defined?(Protobuf::ConnectorType) && Protobuf::ConnectorType == "Socket"
-  Protobuf::ConnectorType = "EventMachine"
+unless defined?(Protobuf::ClientType) && Protobuf::ClientType == "Socket"
+  Protobuf::ClientType = "EventMachine"
   require 'eventmachine'
   require 'protobuf/ext/eventmachine'
   require 'protobuf/rpc/connectors/eventmachine'

data/lib/protobuf/rpc/connector.rb

@@ -3,8 +3,8 @@ module Protobuf
     class Connector
       
       def self.connector_for_client
-        if defined?(Protobuf::ConnectorType)
-          case Protobuf::ConnectorType 
+        if defined?(Protobuf::ClientType)
+          case Protobuf::ClientType 
           when "Socket" then 
             ::Protobuf::Rpc::Connectors::Socket
           else

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/benchmark/tasks.rb

@@ -55,7 +55,7 @@ namespace :benchmark do
     EM.stop if EM.reactor_running?
 
     StubServer.new(:server => Protobuf::Rpc::SocketServer, :port => 9399) do |server| 
-      with_constants "Protobuf::ConnectorType" => "Socket" do
+      with_constants "Protobuf::ClientType" => "Socket" do
         client = Spec::Proto::TestService.client(:async => false, :port => 9399)
 
         benchmark_wrapper(global_bench) do |bench|
@@ -73,7 +73,7 @@ namespace :benchmark do
     Thread.pass until EM.reactor_running?
 
     StubServer.new(:port => 9399) do |server| 
-      with_constants "Protobuf::ConnectorType" => "Socket" do
+      with_constants "Protobuf::ClientType" => "Socket" do
         client = Spec::Proto::TestService.client(:async => false, :port => 9399)
 
         benchmark_wrapper(global_bench) do |bench|

data/spec/unit/rpc/connector_spec.rb

@@ -6,7 +6,7 @@ describe Protobuf::Rpc::Connector do
     
     context 'when set to Socket connector' do
       it 'returns a socket connector class reference' do
-        with_constants "Protobuf::ConnectorType" => "Socket" do
+        with_constants "Protobuf::ClientType" => "Socket" do
           Protobuf::Rpc::Connector.connector_for_client.should eq(Protobuf::Rpc::Connectors::Socket)
         end
       end
@@ -14,7 +14,7 @@ describe Protobuf::Rpc::Connector do
   
     context 'when set to non Socket Connector' do
       it 'returns an eventmachine connector class reference' do
-        with_constants "Protobuf::ConnectorType" => "EventMachine" do 
+        with_constants "Protobuf::ClientType" => "EventMachine" do 
           Protobuf::Rpc::Connector.connector_for_client.should eq Protobuf::Rpc::Connectors::EventMachine
         end
       end

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

@@ -35,7 +35,7 @@ describe Protobuf::Rpc::SocketServer do
 
   context "Eventmachine client" do 
     it "calls the service in the client request" do 
-      with_constants "Protobuf::ConnectorType" => "Evented" do
+      with_constants "Protobuf::ClientType" => "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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2164924860 !ruby/object:Gem::Requirement
+  requirement: &2165510400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2164924860
+  version_requirements: *2165510400
 - !ruby/object:Gem::Dependency
   name: eventually
-  requirement: &2164923940 !ruby/object:Gem::Requirement
+  requirement: &2165509320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164923940
+  version_requirements: *2165509320
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2164856720 !ruby/object:Gem::Requirement
+  requirement: &2165507640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164856720
+  version_requirements: *2165507640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164856040 !ruby/object:Gem::Requirement
+  requirement: &2165506400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2164856040
+  version_requirements: *2165506400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164855360 !ruby/object:Gem::Requirement
+  requirement: &2165505500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2164855360
+  version_requirements: *2165505500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164854300 !ruby/object:Gem::Requirement
+  requirement: &2165504360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *2164854300
+  version_requirements: *2165504360
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2164853020 !ruby/object:Gem::Requirement
+  requirement: &2165503160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *2164853020
+  version_requirements: *2165503160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164852060 !ruby/object:Gem::Requirement
+  requirement: &2165501280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2164852060
+  version_requirements: *2165501280
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).