protobuf 1.4.2 → 2.0.0.rc1

data/lib/protobuf/rpc/servers/socket/server.rb

@@ -52,6 +52,7 @@ module Protobuf
           @threads = []
           @thread_threshold = thread_threshold
           @server = ::TCPServer.new(host, port)
+          raise "blah" if @server.closed?
           @server.listen(backlog)
           @working = []
           @listen_fds = [@server]
@@ -90,7 +91,7 @@ module Protobuf
           raise
         rescue
           # Closing the server causes the loop to raise an exception here
-          raise if running?
+          raise #if running?
         end
 
         def self.running?

data/lib/protobuf/rpc/servers/socket_runner.rb

@@ -1,16 +1,14 @@
 module Protobuf
   module Rpc
-    class SocketRunner 
+    class SocketRunner
 
       def self.stop
-        ::Protobuf::Rpc::Socket::Server.stop 
-        ::Protobuf::Logger.info { 'Shutdown complete' }
+        ::Protobuf::Rpc::Socket::Server.stop
       end
 
       def self.run(server)
-        ::Protobuf::Logger.info { "Socket::Server Running" }
-        server_config = case 
-                        when server.is_a?(OpenStruct) then 
+        server_config = case
+                        when server.is_a?(OpenStruct) then
                           server.marshal_dump
                         when server.is_a?(Hash) then
                           server
@@ -20,6 +18,7 @@ module Protobuf
                           raise "Cannot parser Socket Server - server options"
                         end
 
+				yield if block_given?
         ::Protobuf::Rpc::Socket::Server.run(server_config)
       end
 

data/lib/protobuf/rpc/servers/zmq_runner.rb

@@ -3,14 +3,12 @@ module Protobuf
     class ZmqRunner
 
       def self.stop
-        Protobuf::Rpc::Zmq::Server.stop 
-        Protobuf::Logger.info('Shutdown complete')
+        Protobuf::Rpc::Zmq::Server.stop
       end
 
       def self.run(server)
-        Protobuf::Logger.info "ZmqServer Running"
-        server_config = case 
-                        when server.is_a?(OpenStruct) then 
+        server_config = case
+                        when server.is_a?(OpenStruct) then
                           server.marshal_dump
                         when server.respond_to?(:to_hash) then
                           server.to_hash
@@ -18,6 +16,7 @@ module Protobuf
                           raise "Cannot parser Zmq Server - server options"
                         end
 
+				yield if block_given?
         Protobuf::Rpc::Zmq::Server.run(server_config)
       end
     end

data/lib/protobuf/socket.rb

@@ -0,0 +1,22 @@
+##
+## Socket Mode
+##
+#
+# Require this file if you wish to run your server and/or client RPC
+# with the raw socket handlers. This is the default run mode for bin/rpc_server.
+#
+# To run with rpc_server either omit any mode switches, or explicitly pass `socket`:
+#
+#   rpc_server myapp.rb
+#   rpc_server --socket myapp.rb
+#
+# To run for client-side only override the require in your Gemfile:
+#
+#   gem 'protobuf', :require => 'protobuf/socket'
+#
+require 'protobuf'
+::Protobuf.connector_type = :socket
+
+require 'protobuf/rpc/servers/socket/server'
+require 'protobuf/rpc/connectors/socket'
+

data/lib/protobuf/version.rb

@@ -1,3 +1,4 @@
 module Protobuf
-  VERSION = '1.4.2'
+  VERSION = '2.0.0.rc1'
+  PROTOC_VERSION = '2.4.1'
 end

data/lib/protobuf/zmq.rb

@@ -0,0 +1,21 @@
+##
+## ZMQ Mode
+##
+#
+# Require this file if you wish to run your server and/or client RPC
+# with the ZeroMQ handlers.
+#
+# To run with rpc_server specify the switch `zmq`:
+#
+#   rpc_server --zmq myapp.rb
+#
+# To run for client-side only override the require in your Gemfile:
+#
+#   gem 'protobuf', :require => 'protobuf/zmq'
+#
+require 'protobuf'
+Protobuf.connector_type = :zmq
+
+require 'ffi-rzmq'
+require 'protobuf/rpc/servers/zmq/server'
+require 'protobuf/rpc/connectors/zmq'

data/proto/rpc.pb.rb

@@ -0,0 +1,48 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+module Protobuf
+  module Socketrpc
+    ##
+    # Enum Classes
+    #
+    class ErrorReason < ::Protobuf::Enum; end
+    
+    ##
+    # Message Classes
+    #
+    class Request < ::Protobuf::Message; end
+    class Response < ::Protobuf::Message; end
+    
+    ##
+    # Enum Values
+    #
+    ::Protobuf::Socketrpc::ErrorReason.define :BAD_REQUEST_DATA, 0
+    ::Protobuf::Socketrpc::ErrorReason.define :BAD_REQUEST_PROTO, 1
+    ::Protobuf::Socketrpc::ErrorReason.define :SERVICE_NOT_FOUND, 2
+    ::Protobuf::Socketrpc::ErrorReason.define :METHOD_NOT_FOUND, 3
+    ::Protobuf::Socketrpc::ErrorReason.define :RPC_ERROR, 4
+    ::Protobuf::Socketrpc::ErrorReason.define :RPC_FAILED, 5
+    ::Protobuf::Socketrpc::ErrorReason.define :INVALID_REQUEST_PROTO, 6
+    ::Protobuf::Socketrpc::ErrorReason.define :BAD_RESPONSE_PROTO, 7
+    ::Protobuf::Socketrpc::ErrorReason.define :UNKNOWN_HOST, 8
+    ::Protobuf::Socketrpc::ErrorReason.define :IO_ERROR, 9
+    
+    
+    ##
+    # Message Fields
+    #
+    ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::StringField, :service_name, 1)
+    ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::StringField, :method_name, 2)
+    ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::BytesField, :request_proto, 3)
+    
+    ::Protobuf::Socketrpc::Response.optional(::Protobuf::Field::BytesField, :response_proto, 1)
+    ::Protobuf::Socketrpc::Response.optional(::Protobuf::Field::StringField, :error, 2)
+    ::Protobuf::Socketrpc::Response.optional(::Protobuf::Field::BoolField, :callback, 3, :default => false)
+    ::Protobuf::Socketrpc::Response.optional(::Protobuf::Socketrpc::ErrorReason, :error_reason, 4)
+    
+    
+  end
+end

data/protobuf.gemspec

@@ -18,15 +18,23 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'eventmachine'
-  s.add_dependency 'eventually'
-  s.add_dependency 'json_pure'
-  s.add_dependency 'ffi-rzmq'
+  unless ENV['WITHOUT_PROTO_COMPILER']
+    s.extensions << File.join('ext', 'ruby_generator', 'extconf.rb')
+  end
 
-  s.add_development_dependency 'rake'
+  s.add_dependency 'activesupport'
+  s.add_dependency 'ffi'
+  s.add_dependency 'multi_json'
+  s.add_dependency 'thor'
+
+  s.add_development_dependency 'eventmachine'
+  s.add_development_dependency 'ffi-rzmq'
+  s.add_development_dependency 'perftools.rb'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-nav'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake-compiler'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'yard'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'yard'
 end

data/spec/benchmark/tasks.rb

@@ -1,9 +1,10 @@
 require 'benchmark'
-require 'helper/all'
+require 'support/all'
 require 'proto/test_service_impl'
+require 'perftools'
 
 # Including a way to turn on debug logger for spec runs
-if ENV["DEBUG"]
+if ENV["DEBUG"] 
   puts 'debugging'
   debug_log = File.expand_path('../debug_bench.log', File.dirname(__FILE__) )
   Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
@@ -59,34 +60,34 @@ namespace :benchmark do
   end
 
   def sock_client_sock_server(number_tests, test_length, global_bench = nil)
+    load "protobuf/socket.rb"
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     EM.stop if EM.reactor_running?
 
     StubServer.new(:server => Protobuf::Rpc::Socket::Server, :port => 9399) do |server| 
-      with_constants "Protobuf::ClientType" => "Socket" do
-        client = Spec::Proto::TestService.client(:async => false, :port => 9399)
+      client = Spec::Proto::TestService.client(:async => false, :port => 9399)
 
-        benchmark_wrapper(global_bench) do |bench|
-          bench.report("SS / SC") do 
-            (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
-          end
+      benchmark_wrapper(global_bench) do |bench|
+        bench.report("SS / SC") do 
+          (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
         end
       end
     end
   end
 
   def sock_client_em_server(number_tests, test_length, global_bench = nil)
+    load "protobuf/socket.rb"
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     EM.stop if EM.reactor_running?
     em_thread = Thread.new { EM.run }
     Thread.pass until EM.reactor_running?
 
     StubServer.new(:port => 9399) do |server| 
-      with_constants "Protobuf::ClientType" => "Socket" do
-        client = Spec::Proto::TestService.client(:async => false, :port => 9399)
+      client = Spec::Proto::TestService.client(:async => false, :port => 9399)
 
-        benchmark_wrapper(global_bench) do |bench|
-          bench.report("ES / SC") do 
-            (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
-          end
+      benchmark_wrapper(global_bench) do |bench|
+        bench.report("ES / SC") do 
+          (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
         end
       end
     end
@@ -96,17 +97,14 @@ namespace :benchmark do
   end
 
   def zmq_client_zmq_server(number_tests, test_length, global_bench = nil)
-    require 'ffi-rzmq'
-    require 'protobuf/rpc/connectors/zmq'
-    require 'protobuf/rpc/servers/zmq/server'
+    load "protobuf/zmq.rb"
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     StubServer.new(:port => 9399, :server => Protobuf::Rpc::Zmq::Server) do |server| 
-      with_constants "Protobuf::ClientType" => "Zmq" do
-        client = Spec::Proto::TestService.client(:async => false, :port => 9399)
+      client = Spec::Proto::TestService.client(:async => false, :port => 9399)
 
-        benchmark_wrapper(global_bench) do |bench|
-          bench.report("ZS / ZC") do 
-            (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
-          end
+      benchmark_wrapper(global_bench) do |bench|
+        bench.report("ZS / ZC") do 
+          (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
         end
       end
       server.stop
@@ -119,6 +117,27 @@ namespace :benchmark do
     zmq_client_zmq_server(args[:number], args[:length])
   end
 
+  desc "benchmark ZMQ client with ZMQ server and profile"
+  task :zmq_profile, [:number, :length, :profile_output] do |t, args|
+    args.with_defaults(:number => 1000, :length => 100, :profile_output => "/tmp/zmq_profiler_#{Time.now.to_i}")
+    ::PerfTools::CpuProfiler.start(args[:profile_output]) do 
+      zmq_client_zmq_server(args[:number], args[:length])
+    end
+
+    puts args[:profile_output]
+  end
+
+  desc "benchmark Protobuf Message #new"
+  task :profile_protobuf_new, [:number, :profile_output] do |t, args|
+    args.with_defaults(:number => 1000, :profile_output => "/tmp/profiler_new_#{Time.now.to_i}")
+    create_params = { :name => "The name that we set", :date_created => Time.now.to_i, :status => 2 }
+    ::PerfTools::CpuProfiler.start(args[:profile_output]) do 
+      args[:number].to_i.times { Spec::Proto::Resource.new(create_params) }
+    end
+
+    puts args[:profile_output]
+  end
+
   desc "benchmark EventMachine client with EventMachine server"
   task :em_client_em_server, [:number, :length] do |t, args|
     args.with_defaults(:number => 1000, :length => 100)

data/spec/functional/evented_server_spec.rb

@@ -3,6 +3,8 @@ require 'spec/proto/test_service_impl'
 
 describe 'Functional EventMachine Client' do
   before(:each) do
+    load 'protobuf/evented.rb'
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     ::Spec::Proto::TestService.configure(::Spec::Proto::TestService::DEFAULT_LOCATION)
   end
 

data/spec/functional/socket_server_spec.rb

@@ -3,6 +3,8 @@ require 'spec/proto/test_service_impl'
 
 describe 'Functional Socket Client' do
   before(:all) do
+    load "protobuf/socket.rb"
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     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) }
@@ -16,18 +18,16 @@ describe 'Functional Socket Client' do
 
   it 'runs fine when required fields are set' do
     expect {
-      with_constants "Protobuf::ClientType" => "Socket" do
-        client = ::Spec::Proto::TestService.client(:async => false)
-
-        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
+      client = ::Spec::Proto::TestService.client(:async => false)
+
+      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
     }.to_not raise_error
@@ -35,28 +35,24 @@ describe 'Functional Socket Client' do
 
   it 'calls the on_failure callback when a message is malformed' do
     error = nil
-    with_constants "Protobuf::ClientType" => "Socket" do
-      request = ::Spec::Proto::ResourceFindRequest.new(:active => true)
-      client = ::Spec::Proto::TestService.client(:async => false)
+    request = ::Spec::Proto::ResourceFindRequest.new(:active => true)
+    client = ::Spec::Proto::TestService.client(:async => false)
 
-      client.find(request) do |c|
-        c.on_success { raise "shouldn't pass"}
-        c.on_failure {|e| error = e}
-      end
+    client.find(request) do |c|
+      c.on_success { raise "shouldn't pass"}
+      c.on_failure {|e| error = e}
     end
     error.message.should =~ /ResourceFindRequest.*fields.*improperly set.*"name"/
   end
 
   it 'calls the on_failure callback when the request type is wrong' do
     error = nil
-    with_constants "Protobuf::ClientType" => "Socket" do
-      request = ::Spec::Proto::Resource.new(:name => 'Test Name')
-      client = ::Spec::Proto::TestService.client(:async => false)
+    request = ::Spec::Proto::Resource.new(:name => 'Test Name')
+    client = ::Spec::Proto::TestService.client(:async => false)
 
-      client.find(request) do |c|
-        c.on_success { raise "shouldn't pass"}
-        c.on_failure {|e| error = e}
-      end
+    client.find(request) do |c|
+      c.on_success { raise "shouldn't pass"}
+      c.on_failure {|e| error = e}
     end
     error.message.should =~ /expected request.*ResourceFindRequest.*Resource instead/i
   end

data/spec/functional/zmq_server_spec.rb

@@ -3,6 +3,8 @@ require 'spec/proto/test_service_impl'
 
 describe 'Functional ZMQ Client' do
   before(:all) do
+    load "protobuf/zmq.rb"
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     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::ZmqRunner.run(s) }
@@ -16,18 +18,16 @@ describe 'Functional ZMQ Client' do
 
   it 'runs fine when required fields are set' do
     expect {
-      with_constants "Protobuf::ClientType" => "Zmq" do
-        client = ::Spec::Proto::TestService.client(:async => false)
-
-        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
+      client = ::Spec::Proto::TestService.client(:async => false)
+
+      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
     }.to_not raise_error
@@ -35,28 +35,24 @@ describe 'Functional ZMQ Client' do
 
   it 'calls the on_failure callback when a message is malformed' do
     error = nil
-    with_constants "Protobuf::ClientType" => "Zmq" do
-      request = ::Spec::Proto::ResourceFindRequest.new(:active => true)
-      client = ::Spec::Proto::TestService.client(:async => false)
+    request = ::Spec::Proto::ResourceFindRequest.new(:active => true)
+    client = ::Spec::Proto::TestService.client(:async => false)
 
-      client.find(request) do |c|
-        c.on_success { raise "shouldn't pass"}
-        c.on_failure {|e| error = e}
-      end
+    client.find(request) do |c|
+      c.on_success { raise "shouldn't pass"}
+      c.on_failure {|e| error = e}
     end
     error.message.should =~ /ResourceFindRequest.*fields.*improperly set.*"name"/
   end
 
   it 'calls the on_failure callback when the request type is wrong' do
     error = nil
-    with_constants "Protobuf::ClientType" => "Zmq" do
-      request = ::Spec::Proto::Resource.new(:name => 'Test Name')
-      client = ::Spec::Proto::TestService.client(:async => false)
+    request = ::Spec::Proto::Resource.new(:name => 'Test Name')
+    client = ::Spec::Proto::TestService.client(:async => false)
 
-      client.find(request) do |c|
-        c.on_success { raise "shouldn't pass"}
-        c.on_failure {|e| error = e}
-      end
+    client.find(request) do |c|
+      c.on_success { raise "shouldn't pass"}
+      c.on_failure {|e| error = e}
     end
     error.message.should =~ /expected request.*ResourceFindRequest.*Resource instead/i
   end