protobuf 2.7.9 → 2.7.10

data/.gitignore

@@ -14,4 +14,8 @@ Gemfile.lock
 tmp/*
 ext/defs
 ext/out
-ext/ruby_generator/protoc-ruby
+ext/ruby_generator/protoc-ruby
+.ruby-gemset
+.ruby-version
+ext/ruby_generator/gdb.run
+ext/ruby_generator/protoc-ruby.dSYM

data/ext/ruby_generator/RubyGenerator.cpp

@@ -36,16 +36,12 @@ bool RubyGenerator::Generate(const FileDescriptor* file,
   PrintImportRequires();
 
   PrintEnclosingNamespaceModules();
+  StoreExtensionFields(file_);
 
   PrintEnumsForFileDescriptor(file_, false);
-  PrintNewLine();
   PrintMessagesForFileDescriptor(file_, false);
-  PrintNewLine();
-
   PrintMessagesForFileDescriptor(file_, true);
-
   PrintDanglingExtendedMessages();
-
   PrintServices();
 
   PrintEnclosingNamespaceModuleEnds();
@@ -72,6 +68,7 @@ void RubyGenerator::PrintEnclosingNamespaceModules() const {
 
     printer_->Print(data, "module $ns$");
     PrintNewLine();
+    PrintNewLine();
     printer_->Indent();
   }
 }
@@ -82,6 +79,7 @@ void RubyGenerator::PrintEnclosingNamespaceModuleEnds() const {
     printer_->Outdent();
     printer_->Print("end");
     PrintNewLine();
+    PrintNewLine();
   }
 }
 
@@ -100,12 +98,12 @@ void RubyGenerator::PrintMessagesForFileDescriptor(const FileDescriptor* descrip
     }
     else {
       PrintComment("Message Classes", true);
-      StoreExtensionFields(descriptor);
     }
 
     for (int i = 0; i < descriptor->message_type_count(); i++) {
       PrintMessage(descriptor->message_type(i), print_fields);
     }
+    PrintNewLine();
   }
 }
 
@@ -350,6 +348,7 @@ void RubyGenerator::PrintEnumsForFileDescriptor(const FileDescriptor* descriptor
     for (int i = 0; i < descriptor->enum_type_count(); i++) {
       PrintEnum(descriptor->enum_type(i));
     }
+    PrintNewLine();
   }
 }
 
@@ -369,7 +368,6 @@ void RubyGenerator::PrintEnum(const EnumDescriptor* descriptor) const {
   printer_->Outdent();
   printer_->Print(data, "end");
   PrintNewLine();
-
   PrintNewLine();
 }
 

data/lib/protobuf/exceptions.rb

@@ -5,4 +5,5 @@ module Protobuf
   class TagCollisionError < Error; end
   class SerializationError < StandardError; end
   class FieldNotDefinedError < StandardError; end
+  class DuplicateFieldNameError < StandardError; end
 end

data/lib/protobuf/message.rb

@@ -27,8 +27,14 @@ module Protobuf
       field_array = options[:extension] ? extension_fields : fields
       field_name_hash = options[:extension] ? extension_field_name_to_tag : field_name_to_tag
 
-      if field_array[tag]
-        raise TagCollisionError, %!{Field number #{tag} has already been used in "#{self.name}" by field "#{fname}".!
+      previous_tag_field = get_field_by_tag(tag) || get_ext_field_by_tag(tag)
+      if previous_tag_field
+        raise TagCollisionError, %!Field number #{tag} has already been used in "#{self.name}" by field "#{fname}".!
+      end
+
+      previous_name_field = get_field_by_name(fname) || get_ext_field_by_name(fname)
+      if previous_name_field
+        raise DuplicateFieldNameError, %!Field name #{fname} has already been used in "#{self.name}".!
       end
 
       field_definition = ::Protobuf::Field.build(self, rule, type, fname, tag, options)

data/lib/protobuf/rpc/servers/zmq/broker.rb

@@ -13,7 +13,7 @@ module Protobuf
         #
         def initialize(options = {})
           @available_workers = []
-          @options = options.deep_dup
+          @options = options.dup
           @expected_worker_count = @options[:threads]
           @context = ::ZMQ::Context.new
           @poller = ::ZMQ::Poller.new
@@ -25,10 +25,10 @@ module Protobuf
         #
         def poll
           if frontend.nil?
-            if local_workers_have_started?            
+            if local_workers_have_started?
               # only open the front end when the workers are done booting
               log_info { "Starting frontend socket in broker, all workers ready!" }
-              setup_frontend 
+              setup_frontend
             end
           else
             # Start checking the poller after startup

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.7.9'
+  VERSION = '2.7.10'
   PROTOC_VERSION = '2.4.1'
 end

data/lib/protobuf.rb

@@ -7,12 +7,6 @@ require 'active_support/core_ext/object/try'
 require 'active_support/inflector'
 require 'active_support/json'
 
-begin # master
-require 'active_support/core_ext/object/deep_dup'
-rescue LoadError # 3.2.x
-require 'active_support/core_ext/hash/deep_dup'
-end
-
 module Protobuf
 
   # See Protobuf#connector_type documentation.

data/spec/lib/protobuf/message_spec.rb

@@ -2,6 +2,54 @@ require 'spec_helper'
 
 describe Protobuf::Message do
 
+  describe '.define_field' do
+    context 'when defining a field with a tag that has already been used' do
+      it 'raises a TagCollisionError' do
+        expect {
+          Class.new(Protobuf::Message) do
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 1, {}
+            define_field :optional, ::Protobuf::Field::Int32Field, :bar, 1, {}
+          end
+        }.to raise_error(Protobuf::TagCollisionError, /Field number 1 has already been used/)
+      end
+    end
+
+    context 'when defining an extension field with a tag that has already been used' do
+      it 'raises a TagCollisionError' do
+        expect {
+          Class.new(Protobuf::Message) do
+            extensions 100...110
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 100, {}
+            define_field :optional, ::Protobuf::Field::Int32Field, :bar, 100, :extension => true
+          end
+        }.to raise_error(Protobuf::TagCollisionError, /Field number 100 has already been used/)
+      end
+    end
+
+    context 'when defining a field with a name that has already been used' do
+      it 'raises a DuplicateFieldNameError' do
+        expect {
+          Class.new(Protobuf::Message) do
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 1, {}
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 2, {}
+          end
+        }.to raise_error(Protobuf::DuplicateFieldNameError, /Field name foo has already been used/)
+      end
+    end
+
+    context 'when defining an extension field with a name that has already been used' do
+      it 'raises a DuplicateFieldNameError' do
+        expect {
+          Class.new(Protobuf::Message) do
+            extensions 100...110
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 1, {}
+            define_field :optional, ::Protobuf::Field::Int32Field, :foo, 100, :extension => true
+          end
+        }.to raise_error(Protobuf::DuplicateFieldNameError, /Field name foo has already been used/)
+      end
+    end
+  end
+
   describe '#initialize' do
     it "initializes the enum getter to 0" do
       test_enum = Test::EnumTestMessage.new

data/spec/support/test/enum.pb.rb

@@ -9,6 +9,7 @@ require 'protobuf/message'
 require 'test/resource.pb'
 
 module Test
+
   ##
   # Enum Classes
   #
@@ -32,6 +33,7 @@ module Test
     repeated ::Test::EnumTestType, :repeated_enums, 3
   end
   
+  
   ##
   # Extended Messages
   #
@@ -40,3 +42,4 @@ module Test
   end
   
 end
+

data/spec/support/test/enum.proto

@@ -1,6 +1,8 @@
 package test;
 import 'test/resource.proto';
 
+// Test extending another message from an imported file.
+
 enum EnumTestType {
   ONE = 1;
   TWO = 2;

data/spec/support/test/extended.pb.rb

@@ -0,0 +1,20 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+
+##
+# Imports
+#
+require 'test/resource.pb'
+
+module Test
+
+  ##
+  # Extended Messages
+  #
+  class ::Test::Resource
+    optional ::Protobuf::Field::Int64Field, :deleted_at, 300, :extension => true
+  end
+  
+end
+

data/spec/support/test/extended.proto

@@ -0,0 +1,10 @@
+package test;
+import 'test/resource.proto';
+
+// Test that we will re-open a class and add
+// extension fields to it even if there are no
+// message or enum definitions in this FileDescriptor.
+
+extend test.Resource {
+  optional int64 deleted_at = 300;
+}

data/spec/support/test/multi_field_extensions.pb.rb

@@ -0,0 +1,36 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+module Test
+
+  ##
+  # Message Classes
+  #
+  class Header < ::Protobuf::Message
+    class Type < ::Protobuf::Enum
+      define :PayloadTypeA, 1
+      define :PayloadTypeB, 2
+    end
+    
+  end
+  class PayloadA < ::Protobuf::Message; end
+  class PayloadB < ::Protobuf::Message; end
+  
+  ##
+  # Message Fields
+  #
+  class Header
+    required ::Test::Header::Type, :type, 1
+    
+    # Extension Fields
+    extensions 100...536870912
+    optional ::Test::PayloadA, :payload, 100, :extension => true
+    # UNCOMMENT TO TEST FAILING WITH MULTIPLE FIELDS
+    # optional ::Test::PayloadB, :payload, 101, :extension => true
+  end
+  
+  
+end
+

data/spec/support/test/multi_field_extensions.proto

@@ -0,0 +1,23 @@
+package test;
+
+message Header {
+  extensions 100 to max;
+  enum Type   {
+    PayloadTypeA = 1;
+    PayloadTypeB = 2;
+  }
+  required Type type = 1;
+}
+
+message PayloadA {
+  extend Header {
+    optional PayloadA payload = 100;
+  }
+}
+
+message PayloadB {
+  extend Header {
+  // UNCOMMENT TO TEST FAILING WITH MULTIPLE FIELDS
+  //  optional PayloadB payload = 101;
+  }
+}

data/spec/support/test/resource.pb.rb

@@ -5,6 +5,7 @@ require 'protobuf/message'
 require 'protobuf/rpc/service'
 
 module Test
+
   ##
   # Enum Classes
   #
@@ -55,6 +56,8 @@ module Test
     optional ::Protobuf::Field::BoolField, :ext_is_hidden, 101, :extension => true
     optional ::Test::Searchable::SearchType, :ext_search_type, 102, :default => ::Test::Searchable::SearchType::FLAT, :extension => true
     optional ::Protobuf::Field::BoolField, :ext_nested_in_level_one, 105, :extension => true
+    optional ::Protobuf::Field::BoolField, :ext_dup_field, 106, :extension => true
+    optional ::Protobuf::Field::BoolField, :ext_dup_field, 107, :extension => true
   end
   
   class MessageParent
@@ -85,6 +88,7 @@ module Test
     optional ::Protobuf::Field::Int64Field, :bar, 101, :extension => true
   end
   
+  
   ##
   # Services
   #
@@ -92,3 +96,4 @@ module Test
     rpc :find, ::Test::ResourceFindRequest, ::Test::Resource
   end
 end
+

data/spec/support/test/resource.proto

@@ -54,12 +54,17 @@ message Nested {
 
     extend Resource {
       optional bool ext_nested_in_level_one = 105;
+      optional bool ext_dup_field = 106;
     }
   }
 
   extend NestedLevelOne {
     optional bool ext_nested_level_one = 100;
   }
+
+  extend Resource {
+    optional bool ext_dup_field = 107;
+  }
 }
 
 extend Nested {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.7.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158357160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158357160
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158384120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158384120
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158383700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158383700
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158383280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158383280
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158382860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158382860
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158382440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,15 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158382440
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158382020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,15 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158382020
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158381600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,15 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158381600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158381180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,15 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158381180
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158380760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,15 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158380760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158380340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -182,15 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158380340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158379920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,15 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158379920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2158379500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -214,12 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2158379500
 description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
   Ruby.
 email:
@@ -438,6 +373,10 @@ files:
 - spec/support/server.rb
 - spec/support/test/enum.pb.rb
 - spec/support/test/enum.proto
+- spec/support/test/extended.pb.rb
+- spec/support/test/extended.proto
+- spec/support/test/multi_field_extensions.pb.rb
+- spec/support/test/multi_field_extensions.proto
 - spec/support/test/resource.pb.rb
 - spec/support/test/resource.proto
 - spec/support/test/resource_service.rb
@@ -500,7 +439,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3223012257379333789
+      hash: -3468436490117225969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -509,12 +448,97 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3223012257379333789
+      hash: -3468436490117225969
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
-test_files: []
+test_files:
+- spec/benchmark/tasks.rb
+- spec/functional/embedded_service_spec.rb
+- spec/functional/evented_server_spec.rb
+- spec/functional/socket_server_spec.rb
+- spec/functional/zmq_server_spec.rb
+- spec/lib/protobuf/cli_spec.rb
+- spec/lib/protobuf/enum_spec.rb
+- spec/lib/protobuf/enum_value_spec.rb
+- spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/logger_spec.rb
+- spec/lib/protobuf/message_spec.rb
+- spec/lib/protobuf/rpc/client_spec.rb
+- spec/lib/protobuf/rpc/connector_spec.rb
+- spec/lib/protobuf/rpc/connectors/base_spec.rb
+- spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/socket_spec.rb
+- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
+- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
+- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
+- 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_filters_spec.rb
+- spec/lib/protobuf/rpc/service_spec.rb
+- spec/lib/protobuf_spec.rb
+- spec/spec_helper.rb
+- spec/support/all.rb
+- spec/support/packed_field.rb
+- spec/support/server.rb
+- spec/support/test/enum.pb.rb
+- spec/support/test/enum.proto
+- spec/support/test/extended.pb.rb
+- spec/support/test/extended.proto
+- spec/support/test/multi_field_extensions.pb.rb
+- spec/support/test/multi_field_extensions.proto
+- spec/support/test/resource.pb.rb
+- spec/support/test/resource.proto
+- spec/support/test/resource_service.rb
+- spec/support/test_app_file.rb
+- spec/support/tolerance_matcher.rb
+- test/data/data.bin
+- test/data/data_source.py
+- test/data/types.bin
+- test/data/types_source.py
+- test/data/unk.png
+- test/proto/addressbook.pb.rb
+- test/proto/addressbook.proto
+- test/proto/addressbook_base.pb.rb
+- test/proto/addressbook_base.proto
+- test/proto/addressbook_ext.pb.rb
+- test/proto/addressbook_ext.proto
+- test/proto/collision.pb.rb
+- test/proto/collision.proto
+- test/proto/ext_collision.pb.rb
+- test/proto/ext_collision.proto
+- test/proto/ext_range.pb.rb
+- test/proto/ext_range.proto
+- test/proto/float_default.proto
+- test/proto/lowercase.pb.rb
+- test/proto/lowercase.proto
+- test/proto/merge.pb.rb
+- test/proto/merge.proto
+- test/proto/nested.pb.rb
+- test/proto/nested.proto
+- test/proto/optional_field.pb.rb
+- test/proto/optional_field.proto
+- test/proto/packed.pb.rb
+- test/proto/packed.proto
+- test/proto/rpc.proto
+- test/proto/types.pb.rb
+- test/proto/types.proto
+- test/test_addressbook.rb
+- test/test_enum_value.rb
+- test/test_extension.rb
+- test/test_lowercase.rb
+- test/test_message.rb
+- test/test_optional_field.rb
+- test/test_packed_field.rb
+- test/test_parse.rb
+- test/test_repeated_types.rb
+- test/test_serialize.rb
+- test/test_standard_message.rb
+- test/test_types.rb
 has_rdoc: