protobuf 2.0.0.rc3 → 2.0.0.rc4

data/spec/spec_helper.rb

@@ -36,13 +36,14 @@ Dir[File.expand_path('../support/**/*.pb.rb', __FILE__)].each do |proto_file|
 end
 
 class ::Protobuf::Rpc::Client
-  def == other
+  def ==(other)
     connector.options == other.options && \
       success_cb == other.success_cb && \
       failure_cb == other.failure_cb
   end
 end
 
-def reset_service_location service
-  service.instance_variable_set :@locations, nil
+def reset_service_location(service)
+  service.host = nil
+  service.port = nil
 end

data/spec/support/server.rb

@@ -1,5 +1,5 @@
 require 'ostruct'
-require 'protobuf/common/logger'
+require 'protobuf/logger'
 require 'protobuf/rpc/server'
 require 'protobuf/rpc/servers/socket/server'
 require 'protobuf/rpc/servers/socket_runner'
@@ -57,7 +57,7 @@ class StubServer
     else
       start_socket_server
     end
-    log_debug { "[stub-server] Server started #{@options.host}:#{@options.port}" }
+    log_debug { sign_message("Server started #{@options.host}:#{@options.port}") }
   rescue => ex
     if ex =~ /no acceptor/ # Means EM didn't shutdown in the next_tick yet
       stop
@@ -86,12 +86,16 @@ class StubServer
       EventMachine.stop_server(@server_handle) if @server_handle
     when @options.server == Protobuf::Rpc::Zmq::Server then
       Protobuf::Rpc::ZmqRunner.stop
-      @zmq_server.join if(@zmq_server)
+      @zmq_server.join if @zmq_server
     else
       Protobuf::Rpc::SocketRunner.stop
-      @sock_server.join if(@sock_server)
+      @sock_server.join if @sock_server
     end
 
     @running = false
   end
+
+  def log_signature
+    @_log_signature ||= "[stub-server]"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000Z
+date: 2012-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153942300 !ruby/object:Gem::Requirement
+  requirement: &2152091060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153942300
+  version_requirements: *2152091060
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2153941880 !ruby/object:Gem::Requirement
+  requirement: &2152089400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153941880
+  version_requirements: *2152089400
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2153941460 !ruby/object:Gem::Requirement
+  requirement: &2152088440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153941460
+  version_requirements: *2152088440
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153941040 !ruby/object:Gem::Requirement
+  requirement: &2152086720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153941040
+  version_requirements: *2152086720
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2153940620 !ruby/object:Gem::Requirement
+  requirement: &2152069860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153940620
+  version_requirements: *2152069860
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &2153940200 !ruby/object:Gem::Requirement
+  requirement: &2152061440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153940200
+  version_requirements: *2152061440
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2153939780 !ruby/object:Gem::Requirement
+  requirement: &2152060500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153939780
+  version_requirements: *2152060500
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2153939360 !ruby/object:Gem::Requirement
+  requirement: &2152059780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153939360
+  version_requirements: *2152059780
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2153938940 !ruby/object:Gem::Requirement
+  requirement: &2152058860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153938940
+  version_requirements: *2152058860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153938520 !ruby/object:Gem::Requirement
+  requirement: &2152058080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153938520
+  version_requirements: *2152058080
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2153938100 !ruby/object:Gem::Requirement
+  requirement: &2152057180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153938100
+  version_requirements: *2152057180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153937680 !ruby/object:Gem::Requirement
+  requirement: &2152056580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153937680
+  version_requirements: *2152056580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153953620 !ruby/object:Gem::Requirement
+  requirement: &2152055760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153953620
+  version_requirements: *2152055760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153953200 !ruby/object:Gem::Requirement
+  requirement: &2152054480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153953200
+  version_requirements: *2152054480
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -289,12 +289,10 @@ files:
 - ext/ruby_generator/protoc-ruby
 - lib/protobuf.rb
 - lib/protobuf/cli.rb
-- lib/protobuf/common/exceptions.rb
-- lib/protobuf/common/logger.rb
-- lib/protobuf/common/wire_type.rb
 - lib/protobuf/enum.rb
 - lib/protobuf/enum_value.rb
 - lib/protobuf/evented.rb
+- lib/protobuf/exceptions.rb
 - lib/protobuf/ext/eventmachine.rb
 - lib/protobuf/field.rb
 - lib/protobuf/field/base_field.rb
@@ -320,6 +318,7 @@ files:
 - lib/protobuf/field/uint32_field.rb
 - lib/protobuf/field/uint64_field.rb
 - lib/protobuf/field/varint_field.rb
+- lib/protobuf/logger.rb
 - lib/protobuf/message.rb
 - lib/protobuf/message/decoder.rb
 - lib/protobuf/message/encoder.rb
@@ -350,9 +349,11 @@ files:
 - lib/protobuf/rpc/servers/zmq/worker.rb
 - lib/protobuf/rpc/servers/zmq_runner.rb
 - lib/protobuf/rpc/service.rb
+- lib/protobuf/rpc/service_dispatcher.rb
 - lib/protobuf/rpc/stat.rb
 - lib/protobuf/socket.rb
 - lib/protobuf/version.rb
+- lib/protobuf/wire_type.rb
 - lib/protobuf/zmq.rb
 - proto/rpc.pb.rb
 - proto/rpc.proto
@@ -364,9 +365,9 @@ files:
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
-- spec/lib/protobuf/common/logger_spec.rb
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/enum_value_spec.rb
+- spec/lib/protobuf/logger_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
 - spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
@@ -381,6 +382,7 @@ files:
 - 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_dispatcher_spec.rb
 - spec/lib/protobuf/rpc/service_spec.rb
 - spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb
@@ -448,6 +450,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1357637843910363817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -468,9 +473,9 @@ test_files:
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
-- spec/lib/protobuf/common/logger_spec.rb
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/enum_value_spec.rb
+- spec/lib/protobuf/logger_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
 - spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
@@ -485,6 +490,7 @@ test_files:
 - 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_dispatcher_spec.rb
 - spec/lib/protobuf/rpc/service_spec.rb
 - spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb