protobuf 1.1.3 → 1.3.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.swp
 pkg/*
 .bundle
 .rvmrc
@@ -6,3 +7,5 @@ pkg/*
 coverage
 doc
 .yardoc
+.DS_Store
+*.bin

data/Gemfile.lock

@@ -1,34 +1,52 @@
 PATH
   remote: .
   specs:
-    protobuf (1.1.3)
-      eventmachine (~> 0.12.10)
-      eventually (~> 0.1.0)
-      json_pure (~> 1.6.4)
+    protobuf (1.3.0)
+      eventmachine
+      eventually
+      ffi-rzmq
+      json_pure
 
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.0.5)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
-    eventually (0.1.0)
-    json_pure (1.6.5)
-    multi_json (1.0.4)
-    rake (0.8.7)
-    redcarpet (1.17.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    eventually (0.1.1)
+    ffi (1.0.11)
+    ffi-rzmq (0.9.3)
+      ffi
+    json_pure (1.7.3)
+    method_source (0.7.1)
+    multi_json (1.2.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    pry (0.9.8.4-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+      spoon (~> 0.0)
+    pry-nav (0.2.0)
+      pry (~> 0.9.8.1)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    yard (0.7.4)
+    slop (2.4.4)
+    spoon (0.0.1)
+    yard (0.7.5)
 
 PLATFORMS
   java
@@ -36,8 +54,9 @@ PLATFORMS
 
 DEPENDENCIES
   protobuf!
-  rake (~> 0.8.7)
-  redcarpet (~> 1.17.2)
-  rspec (~> 2.8.0)
-  simplecov (~> 0.5.4)
-  yard (~> 0.7.4)
+  pry
+  pry-nav
+  rake
+  rspec
+  simplecov
+  yard

data/README.md

@@ -39,8 +39,8 @@ And `defs.pb.rb` should look like this:
 ```ruby
 module Mycompany
   class User
-    optional :string, :first_name, 1
-    optional :string, :last_name, 2
+    required :string, :first_name, 1
+    required :string, :last_name, 2
   end
 end
 ```

data/Rakefile

@@ -3,3 +3,18 @@ $:.push File.expand_path("./spec", File.dirname(__FILE__))
 
 require "bundler/gem_tasks"
 require "benchmark/tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test:.'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec)

data/bin/rpc_server

@@ -6,6 +6,7 @@ require 'logger'
 require 'protobuf/version'
 require 'protobuf/rpc/servers/evented_runner'
 require 'protobuf/rpc/servers/socket_runner'
+require 'protobuf/rpc/servers/zmq_runner'
 
 # Default options
 server = OpenStruct.new({
@@ -17,10 +18,18 @@ server = OpenStruct.new({
   :threshold => 100,
   :log => File.expand_path('./protobuf.log'),
   :level => ::Logger::INFO,
-  :runner => Protobuf::Rpc::EventedRunner, 
+  :runner => ::Protobuf::Rpc::EventedRunner, 
   :debug => false
 })
 
+class ClientServerParse
+  def self.parse_client(value)
+  end
+
+  def self.parse_server(value)
+  end
+end
+
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: rpc_server [options] app_file.rb"
 
@@ -53,12 +62,19 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-c", "--client_socket", "Socket Mode for client connections (No EventMachine)") do |v|
-    Protobuf::ConnectorType = "Socket"
+    ENV['PB_CLIENT_TYPE'] = "Socket"
   end
 
   opts.on("-s", "--socket", "Socket Server Mode (No EventMachine)") do |v|
-    Protobuf::ServerType = "SocketServer"
-    server.runner = Protobuf::Rpc::SocketRunner
+    ENV['PB_SERVER_TYPE'] = "Socket"
+    server.runner = ::Protobuf::Rpc::SocketRunner
+  end
+
+  opts.on("-z", "--zmq", "ZeroMQ Socket Mode for client and server connections (they must be used together)") do |v|
+    ENV['PB_CLIENT_TYPE'] = 'Zmq'
+    ENV['PB_SERVER_TYPE'] = 'Zmq'
+
+    server.runner = ::Protobuf::Rpc::ZmqRunner
   end
   
   opts.on("-d", "--[no-]debug", "Debug Mode. Override log level to DEBUG.") do |v|
@@ -66,6 +82,14 @@ parser = OptionParser.new do |opts|
     server.level = ::Logger::DEBUG if v === true
   end
 
+  opts.on("--client-type=PB_CLIENT_TYPE", String, "Client Type to use (Socket or Zmq)") do |v|
+    ENV['PB_CLIENT_TYPE'] = v
+  end
+
+  opts.on("--server-type=PB_SERVER_TYPE", String, "Server Type to use (Socket or Zmq)") do |v|
+    ENV['PB_SERVER_TYPE'] = v
+  end
+
   opts.separator ""
   opts.separator "Common options:"
 
@@ -75,12 +99,29 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on_tail("--version", "Show version") do
-    puts Protobuf::VERSION
+    puts ::Protobuf::VERSION
     exit
   end
 end
 
 parser.parse!
+
+# Used to ensure we set the PB_CLIENT_TYPE and PB_SERVER_TYPE to the same thing
+# if one of them is set to Zmq
+if(ENV['PB_CLIENT_TYPE'] =~ /zmq/i)
+  # make server and client types the same if we're using Zmq
+  ENV['PB_SERVER_TYPE'] = ENV['PB_CLIENT_TYPE']
+  server.runner = ::Protobuf::Rpc::ZmqRunner
+elsif(ENV['PB_SERVER_TYPE'] =~ /zmq/i)
+  # make server and client types the same if we're using Zmq
+  ENV['PB_CLIENT_TYPE'] = ENV['PB_SERVER_TYPE']
+  server.runner = ::Protobuf::Rpc::ZmqRunner
+elsif(ENV['PB_SERVER_TYPE'] =~ /socket/i)
+  server.runner = ::Protobuf::Rpc::SocketRunner
+end
+
+# protobuf.rb picks up PB_CLIENT_TYPE and PB_SERVER_TYPE and does something
+# useful with them
 require 'protobuf'
 
 [:INT, :QUIT, :TERM].each do |sig|
@@ -99,12 +140,12 @@ begin
     raise 'Invalid app file specified (%s).' % server.app unless File.exists?(server.app)
   end
 
-  # Configure the Protobuf::Logger
-  Protobuf::Logger.configure :file => server.log, :level => server.debug ? ::Logger::DEBUG : server.level
+  # Configure the ::Protobuf::Logger
+  ::Protobuf::Logger.configure :file => server.log, :level => server.debug ? ::Logger::DEBUG : server.level
 
   # Output the server opts
-  Protobuf::Logger.debug 'Debugging options:'
-  Protobuf::Logger.debug server.inspect
+  ::Protobuf::Logger.debug 'Debugging options:'
+  ::Protobuf::Logger.debug server.inspect
   
   # Set the name of the process
   $0 = 'rpc_server %s:%d %s' % [server.host, server.port, server.app]
@@ -116,7 +157,7 @@ begin
 rescue
   msg = 'ERROR: RPC Server failed to start. %s' % $!.inspect
   $stderr.puts msg, *($!.backtrace)
-  Protobuf::Logger.error msg
-  Protobuf::Logger.error $!.backtrace.join("\n")
+  ::Protobuf::Logger.error msg
+  ::Protobuf::Logger.error $!.backtrace.join("\n")
   exit 1
 end

data/lib/protobuf.rb

@@ -6,12 +6,23 @@ 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']
 
+# Socket Client/Server loaded by default as it has no impact on cross-platform issues
+require 'protobuf/rpc/servers/socket/server'  
+require 'protobuf/rpc/connectors/socket'
+require 'protobuf/rpc/client'
+require 'protobuf/rpc/service'
+
 # When setting up a client
-unless defined?(Protobuf::ClientType) && Protobuf::ClientType == "Socket"
+case
+when defined?(Protobuf::ClientType) && Protobuf::ClientType =~ /\Asocket\Z/i then 
+  #no-op
+when defined?(Protobuf::ClientType) && Protobuf::ClientType =~ /\Azmq\Z/i then 
+  require 'ffi-rzmq'
+  require 'protobuf/rpc/connectors/zmq'
+else
   Protobuf::ClientType = "EventMachine"
   require 'eventmachine'
   require 'protobuf/ext/eventmachine'
@@ -19,14 +30,15 @@ unless defined?(Protobuf::ClientType) && Protobuf::ClientType == "Socket"
 end
 
 # For running the rpc_server
-unless defined?(Protobuf::ServerType) && Protobuf::ServerType == "SocketServer"
-  Protobuf::ServerType = "EventedServer"
+case
+when defined?(Protobuf::ServerType) && Protobuf::ServerType =~ /\Asocket\Z/i then
+  #no-op
+when defined?(Protobuf::ServerType) && Protobuf::ServerType =~ /\Azmq\Z/i then
+  require 'ffi-rzmq'
+  require 'protobuf/rpc/servers/zmq/server'
+else
+  Protobuf::ServerType = "Evented::Server"
   require 'eventmachine'
   require 'protobuf/ext/eventmachine'
-  require 'protobuf/rpc/servers/evented_server'
+  require 'protobuf/rpc/servers/evented/server'
 end
-
-require 'protobuf/rpc/client'
-require 'protobuf/rpc/connectors/socket'
-require 'protobuf/rpc/service'
-require 'protobuf/rpc/servers/socket_server'

data/lib/protobuf/common/logger.rb

@@ -5,30 +5,7 @@ module Protobuf
     
     class << self
       attr_accessor :file, :level
-      
-      # One-line file/level configuration
-      def configure(options)
-        self.file = options[:file] if options[:file]
-        self.level = options[:level] if options[:level]
-      end
-      
-      # Use to reset the instance
-      def reset_device!
-        self.file = self.level = @__instance = nil
-      end
-      
-      # Singleton instance
-      def instance
-        @__instance ||= begin
-          log = nil
-          if @file and @level
-            log = new(self.file)
-            log.level = self.level
-          end
-          log
-        end
-      end
-      
+
       # Stub out the log methods for Protobuf::Logger as singleton methods
       [:debug, :info, :warn, :error, :fatal, :any, :add, :log].each do |m|
         define_method(m) do |*params, &block|
@@ -36,6 +13,31 @@ module Protobuf
         end
       end
     end
+       
+    # One-line file/level configuration
+    def self.configure(options)
+      self.file = options.fetch(:file, false)
+      self.level = options.fetch(:level, false)
+    end
+    
+    # Use to reset the instance
+    def self.reset_device!
+      self.file = self.level = @__instance = nil
+    end
+    
+    # Singleton instance
+    def self.instance
+      @__instance ||= begin
+        log = nil
+        
+        if @file && @level
+          log = new(self.file)
+          log.level = self.level
+        end
+        
+        log
+      end
+    end
     
     # 
     # LogMethods module for log method including, e.g.:
@@ -59,6 +61,5 @@ module Protobuf
         base.extend(LogMethods)
       end
     end
-    
   end
 end

data/lib/protobuf/descriptor/file_descriptor.rb

@@ -1,7 +1,7 @@
 module Protobuf
   module Descriptor
     class FileDescriptor
-      class <<self
+      class << self
         def proto_type
           'Google::Protobuf::FileDescriptorProto'
         end

data/lib/protobuf/message/field.rb

@@ -685,10 +685,10 @@ module Protobuf
                 when Integer then
                   field.type.const_get(field.type.name_by_value(val)) rescue nil
                 when EnumValue then
-                  raise TypeError, "Invalid value: #{val.inspect}" if val.parent_class != field.type
+                  raise TypeError, "Invalid value: #{val.inspect} for #{field.name}" if val.parent_class != field.type
                   val
                 end
-              raise TypeError, "Invalid value: #{val.inspect}" unless val
+              raise TypeError, "Invalid value: #{val.inspect} for #{field.name}" unless val
 
               @values[field.name] = val
             end

data/lib/protobuf/rpc/buffer.rb

@@ -1,18 +1,21 @@
 module Protobuf
   module Rpc
     class Buffer
-      
-      attr_accessor :mode
-      attr_reader :data, :size
-      
+
+      attr_accessor :mode, :data, :size
+
       MODES = [:read, :write]
-      
-      def initialize(mode=:read, data='')
-        @data = data.is_a?(Protobuf::Message) ? data.serialize_to_string : data.to_s
+
+      # constantize this so we don't re-initialize the regex every time we need it
+      SIZE_REGEX = /^\d+-/
+
+      def initialize(mode=:read)
         @flush = false
+        @data = ""
+        @size = 0
         self.mode = mode
       end
-      
+
       def mode=(mode)
         if MODES.include?(mode)
           @mode = mode
@@ -20,18 +23,18 @@ module Protobuf
           @mode = :read
         end
       end
-      
+
       def write(force_mode=true)
         if force_mode and reading?
           mode = :write
         elsif not force_mode and reading?
           raise = 'You chose to write the buffer when in read mode'
         end
-        
+
         @size = @data.length
         '%d-%s' % [@size, @data]
       end
-      
+
       def <<(data)
         @data << data
         if reading?
@@ -39,36 +42,38 @@ module Protobuf
           check_for_flush
         end
       end
-      
+
+      def set_data(data)
+        @data = data.is_a?(Protobuf::Message) ? data.serialize_to_string : data.to_s
+        @size = @data.size
+      end
+
       def reading?
         mode == :read
       end
-      
+
       def writing?
         mode == :write
       end
-      
+
       def flushed?
         @flush
       end
-      
-    private
-    
+
       def get_data_size
-        if @size.nil?
-          sliced_size = @data.slice! /^\d+-/
-          unless sliced_size.nil?
-            @size = sliced_size.gsub(/-/, '').to_i 
-          end
+        if @size == 0 || @data.match(SIZE_REGEX)
+          sliced_size = @data.slice!(SIZE_REGEX)
+          @size = sliced_size.gsub('-', '').to_i unless(sliced_size.nil?)
         end
       end
-      
+
+    private
+
       def check_for_flush
-        if not @size.nil? and @data.length == @size
+        if !@size.nil? && @data.length == @size
           @flush = true
         end
       end
-      
     end
   end
 end