protobuf 2.7.5-java → 2.7.6-java

data/ext/ruby_generator/RubyGenerator.cpp

@@ -18,6 +18,7 @@ bool RubyGenerator::Generate(const FileDescriptor* file,
 
   filename = CreateRubyFileName(file_->name());
   ns_vector.clear();
+  extended_messages.clear();
   SplitStringUsing(file_->package(), ".", &ns_vector);
 
   // Get a ZeroCopyOutputStream object of the data.
@@ -41,9 +42,10 @@ bool RubyGenerator::Generate(const FileDescriptor* file,
   PrintMessagesForFileDescriptor(file_, false);
   PrintNewLine();
 
-  PrintEnumsForFileDescriptor(file_, true);
   PrintMessagesForFileDescriptor(file_, true);
 
+  PrintDanglingExtendedMessages();
+
   PrintServices();
 
   PrintEnclosingNamespaceModuleEnds();
@@ -88,6 +90,9 @@ void RubyGenerator::PrintEnclosingNamespaceModuleEnds() const {
 ///////////////////////////////////////////////// [ messages ] ////////////////
 //
 
+// Print a comment and then iteratively PrintMessage for each message
+// type defined by in this FileDescriptor scope.
+//
 void RubyGenerator::PrintMessagesForFileDescriptor(const FileDescriptor* descriptor, bool print_fields) const {
   if (descriptor->message_type_count() > 0) {
     if (print_fields) {
@@ -95,6 +100,7 @@ void RubyGenerator::PrintMessagesForFileDescriptor(const FileDescriptor* descrip
     }
     else {
       PrintComment("Message Classes", true);
+      StoreExtensionFields(descriptor);
     }
 
     for (int i = 0; i < descriptor->message_type_count(); i++) {
@@ -103,76 +109,102 @@ void RubyGenerator::PrintMessagesForFileDescriptor(const FileDescriptor* descrip
   }
 }
 
+// Iterates the nested types of a message descriptor and calls PrintMessage for each.
+//
 void RubyGenerator::PrintMessagesForDescriptor(const Descriptor* descriptor, bool print_fields) const {
   for (int i = 0; i < descriptor->nested_type_count(); i++) {
     PrintMessage(descriptor->nested_type(i), print_fields);
   }
 }
-//
+
 // Print out the given descriptor message as a Ruby class.
+//
 void RubyGenerator::PrintMessage(const Descriptor* descriptor, bool print_fields) const {
   map<string,string> data;
   data["class_name"] = descriptor->name();
 
-  if (print_fields && (descriptor->field_count() > 0 || descriptor->extension_count() > 0)) {
-    printer_->Print(data, "class $class_name$");
-    PrintNewLine();
-    printer_->Indent();
+  switch (print_fields) {
+    case false:
 
-    if (descriptor->enum_type_count() > 0) {
-      PrintEnumsForDescriptor(descriptor, true);
-    }
+      if (DescriptorHasNestedTypes(descriptor)) {
+        printer_->Print(data, "class $class_name$ < ::Protobuf::Message");
+        PrintNewLine();
+        printer_->Indent();
 
-    if (descriptor->nested_type_count() > 0) {
-      PrintMessagesForDescriptor(descriptor, true);
-    }
+        if (descriptor->enum_type_count() > 0) {
+          PrintEnumsForDescriptor(descriptor, true);
+        }
 
-    PrintExtensionRangesForDescriptor(descriptor);
+        if (descriptor->nested_type_count() > 0) {
+          PrintMessagesForDescriptor(descriptor, false);
+        }
 
-    // Print Fields
-    if (descriptor->field_count() > 0) {
-      for (int i = 0; i < descriptor->field_count(); i++) {
-        PrintMessageField(descriptor->field(i));
+        printer_->Outdent();
+        printer_->Print(data, "end");
       }
-    }
-
-    // Print Extension Fields
-    if (descriptor->extension_count() > 0) {
-      for (int i = 0; i < descriptor->extension_count(); i++) {
-        PrintMessageField(descriptor->extension(i));
+      else {
+        printer_->Print(data, "class $class_name$ < ::Protobuf::Message; end");
       }
-    }
 
-    printer_->Outdent();
-    printer_->Print(data, "end");
-    PrintNewLine();
-  }
-  else if (DescriptorHasNestedTypes(descriptor)) {
-    printer_->Print(data, "class $class_name$ < ::Protobuf::Message");
-    PrintNewLine();
-    printer_->Indent();
+      PrintNewLine();
+      StoreExtensionFields(descriptor);
 
-    if (descriptor->enum_type_count() > 0) {
-      PrintEnumsForDescriptor(descriptor, false);
-    }
+      break;
 
-    if (descriptor->nested_type_count() > 0) {
-      PrintMessagesForDescriptor(descriptor, false);
-    }
+    case true:
 
-    printer_->Outdent();
-    printer_->Print(data, "end");
-    PrintNewLine();
-  }
-  else {
-    printer_->Print(data, "class $class_name$ < ::Protobuf::Message; end");
-  }
+      if (descriptor->field_count() > 0 || DescriptorHasExtensions(descriptor)) {
+        printer_->Print(data, "class $class_name$");
+        PrintNewLine();
+        printer_->Indent();
 
-  PrintNewLine();
+        if (descriptor->nested_type_count() > 0) {
+          PrintMessagesForDescriptor(descriptor, true);
+        }
+
+        // Print Fields
+        if (descriptor->field_count() > 0) {
+          for (int i = 0; i < descriptor->field_count(); i++) {
+            PrintMessageField(descriptor->field(i));
+          }
+        }
+
+        PrintExtensionRangesForDescriptor(descriptor);
+
+        // Print Extension Fields
+        if (DescriptorHasExtensions(descriptor)) {
+          PrintMessageExtensionFields(descriptor->full_name());
+        }
+
+        printer_->Outdent();
+        printer_->Print(data, "end");
+        PrintNewLine();
+        PrintNewLine();
+      }
+      else if (descriptor->nested_type_count() > 0) {
+        printer_->Print(data, "class $class_name$");
+        PrintNewLine();
+        printer_->Indent();
+
+        if (descriptor->nested_type_count() > 0) {
+          PrintMessagesForDescriptor(descriptor, true);
+        }
+
+        printer_->Outdent();
+        printer_->Print(data, "end");
+        PrintNewLine();
+        PrintNewLine();
+      }
+
+      break;
+  }
 }
 
 void RubyGenerator::PrintExtensionRangesForDescriptor(const Descriptor* descriptor) const {
   if (descriptor->extension_range_count() > 0) {
+    PrintNewLine();
+    PrintComment("Extension Fields", false);
+
     for (int i = 0; i < descriptor->extension_range_count(); i++) {
       const Descriptor::ExtensionRange* range = descriptor->extension_range(i);
       map<string,string> data;
@@ -281,6 +313,20 @@ void RubyGenerator::PrintMessageField(const FieldDescriptor* descriptor) const {
   PrintNewLine();
 }
 
+// Print out each extension field previously mapped to the full name of
+// the descriptor message.
+//
+// After printign the fields, erase the fields from the map so that we know
+// which fields are dangling and to print wrapped in a re-opened class block.
+//
+void RubyGenerator::PrintMessageExtensionFields(const string full_name) const {
+  vector<const FieldDescriptor*> message_extensions = extended_messages[full_name];
+  vector<const FieldDescriptor*>::iterator it;
+  for (it = message_extensions.begin(); it != message_extensions.end(); ++it) {
+    PrintMessageField(*it);
+  }
+  extended_messages.erase(full_name);
+}
 
 //
 ///////////////////////////////////////////////// [ enums ] ///////////////////
@@ -288,7 +334,7 @@ void RubyGenerator::PrintMessageField(const FieldDescriptor* descriptor) const {
 
 void RubyGenerator::PrintEnumsForDescriptor(const Descriptor* descriptor, bool print_values) const {
   for (int i = 0; i < descriptor->enum_type_count(); i++) {
-    PrintEnum(descriptor->enum_type(i), print_values);
+    PrintEnum(descriptor->enum_type(i));
   }
 }
 
@@ -302,33 +348,28 @@ void RubyGenerator::PrintEnumsForFileDescriptor(const FileDescriptor* descriptor
     }
 
     for (int i = 0; i < descriptor->enum_type_count(); i++) {
-      PrintEnum(descriptor->enum_type(i), print_values);
+      PrintEnum(descriptor->enum_type(i));
     }
   }
 }
 
 // Print the given enum descriptor as a Ruby class.
-void RubyGenerator::PrintEnum(const EnumDescriptor* descriptor, bool print_values) const {
+void RubyGenerator::PrintEnum(const EnumDescriptor* descriptor) const {
   map<string,string> data;
   data["class_name"] = descriptor->name();
 
-  if (print_values) {
-    printer_->Print(data, "class $class_name$");
-    printer_->Indent();
-    PrintNewLine();
-
-    for (int i = 0; i < descriptor->value_count(); i++) {
-      PrintEnumValue(descriptor->value(i));
-    }
+  printer_->Print(data, "class $class_name$ < ::Protobuf::Enum");
+  printer_->Indent();
+  PrintNewLine();
 
-    printer_->Outdent();
-    printer_->Print(data, "end");
-    PrintNewLine();
-  }
-  else {
-    printer_->Print(data, "class $class_name$ < ::Protobuf::Enum; end");
+  for (int i = 0; i < descriptor->value_count(); i++) {
+    PrintEnumValue(descriptor->value(i));
   }
 
+  printer_->Outdent();
+  printer_->Print(data, "end");
+  PrintNewLine();
+
   PrintNewLine();
 }
 
@@ -387,6 +428,42 @@ void RubyGenerator::PrintServiceMethod(const MethodDescriptor* descriptor) const
 ///////////////////////////////////////////////// [ general ] ////////////////
 //
 
+void RubyGenerator::PrintDanglingExtendedMessages() const {
+  if (extended_messages.size() > 0) {
+    PrintComment("Extended Messages", true);
+
+    tr1::unordered_map<string, vector<const FieldDescriptor*> >::iterator it;
+    for (it = extended_messages.begin(); it != extended_messages.end(); ++it ) {
+      map<string,string> data;
+      data["class_name"] = Constantize(it->first);
+
+      printer_->Print(data, "class $class_name$");
+      printer_->Indent();
+      PrintNewLine();
+
+      PrintMessageExtensionFields(it->first);
+
+      printer_->Outdent();
+      printer_->Print(data, "end");
+      PrintNewLine();
+      PrintNewLine();
+    }
+  }
+}
+
+// Explicitly check for the key with `count` so that we don't create
+// empty vectors for classes simply using bracket access.
+//
+bool RubyGenerator::DescriptorHasExtensions(const Descriptor* descriptor) const {
+  const string full_name = descriptor->full_name();
+  if (extended_messages.count(full_name) > 0) {
+    return (extended_messages[full_name].size());
+  }
+  else {
+    return 0;
+  }
+}
+
 // Print a header or one-line comment (as indicated by the as_header bool).
 void RubyGenerator::PrintComment(string comment, bool as_header) const {
   char format[] = "# $comment$\n";
@@ -444,6 +521,25 @@ void RubyGenerator::PrintNewLine() const {
   printer_->Print("\n");
 }
 
+// We need to store any extension fields defined in the scope of this
+// descriptor message by the field's containing type.
+void RubyGenerator::StoreExtensionFields(const FileDescriptor* descriptor) const {
+  for (int i = 0; i < descriptor->extension_count(); i++) {
+    const FieldDescriptor* extension_field = descriptor->extension(i);
+    const Descriptor* containing = extension_field->containing_type();
+    extended_messages[containing->full_name()].push_back(extension_field);
+  }
+}
+
+// Same as above, only accept the Descriptor type instead of FileDescriptor.
+void RubyGenerator::StoreExtensionFields(const Descriptor* descriptor) const {
+  for (int i = 0; i < descriptor->extension_count(); i++) {
+    const FieldDescriptor* extension_field = descriptor->extension(i);
+    const Descriptor* containing = extension_field->containing_type();
+    extended_messages[containing->full_name()].push_back(extension_field);
+  }
+}
+
 } // namespace ruby
 } // namespace compiler
 } // namespace protobuf

data/ext/ruby_generator/RubyGenerator.h

@@ -5,6 +5,7 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
+#include <tr1/unordered_map>
 
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/code_generator.h>
@@ -31,28 +32,32 @@ class LIBPROTOC_EXPORT RubyGenerator : public CodeGenerator {
 			GeneratorContext* context,
 			string* error) const;
 
-
 	private:
 		mutable GeneratorContext* context_;
 		mutable io::Printer* printer_;
 		mutable const FileDescriptor* file_;
 		mutable string filename;
 		mutable vector<string> ns_vector;
+    mutable tr1::unordered_map<string, vector<const FieldDescriptor*> > extended_messages;
 
 		GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RubyGenerator);
 
+    bool DescriptorHasExtensions(const Descriptor* descriptor) const;
+		void PrintDanglingExtendedMessages() const;
+		void PrintExtensionRangesForDescriptor(const Descriptor* descriptor) const;
+
 		void PrintEnclosingNamespaceModules() const;
 		void PrintEnclosingNamespaceModuleEnds() const;
 
 		void PrintMessagesForDescriptor(const Descriptor* descriptor, bool print_fields) const;
 		void PrintMessagesForFileDescriptor(const FileDescriptor* descriptor, bool print_fields) const;
 		void PrintMessage(const Descriptor* descriptor, bool print_fields) const;
-		void PrintExtensionRangesForDescriptor(const Descriptor* descriptor) const;
 		void PrintMessageField(const FieldDescriptor* descriptor) const;
+		void PrintMessageExtensionFields(const string full_name) const;
 
 		void PrintEnumsForDescriptor(const Descriptor* descriptor, bool print_values) const;
 		void PrintEnumsForFileDescriptor(const FileDescriptor* descriptor, bool print_values) const;
-		void PrintEnum(const EnumDescriptor* descriptor, bool print_values) const;
+		void PrintEnum(const EnumDescriptor* descriptor) const;
 		void PrintEnumValue(const EnumValueDescriptor* descriptor) const;
 
 		void PrintServices() const;
@@ -67,6 +72,9 @@ class LIBPROTOC_EXPORT RubyGenerator : public CodeGenerator {
 		void PrintRequire(string lib_name) const;
 		void PrintNewLine() const;
 
+    void StoreExtensionFields(const FileDescriptor* descriptor) const;
+    void StoreExtensionFields(const Descriptor* descriptor) const;
+
 		// Take the proto file name, strip ".proto"
 		// from the end and add ".pb.rb"
 		static string CreateRubyFileName(const string proto_filename) {

data/lib/protobuf/message.rb

@@ -68,11 +68,8 @@ module Protobuf
     end
 
     def self.get_ext_field_by_name(name)
-      # Check if the name has been used before, if not then set it to the sym value
-      extension_fields[extension_field_name_to_tag[name.to_sym]]
-    rescue TypeError, NoMethodError => e
-      name = 'nil' if name.nil?
-      raise FieldNotDefinedError.new("Field '#{name}' is not defined on message '#{self.name}'")
+      tag = extension_field_name_to_tag[name.to_sym]
+      extension_fields[tag] unless tag.nil?
     end
 
     def self.get_ext_field_by_tag(tag)
@@ -81,11 +78,8 @@ module Protobuf
 
     # Find a field object by +name+.
     def self.get_field_by_name(name)
-      # Check if the name has been used before, if not then set it to the sym value
-      fields[field_name_to_tag[name.to_sym]]
-    rescue TypeError, NoMethodError => e
-      name = 'nil' if name.nil?
-      raise FieldNotDefinedError.new("Field '#{name}' is not defined on message '#{self.name}'")
+      tag = field_name_to_tag[name.to_sym]
+      fields[tag] unless tag.nil?
     end
 
     # Find a field object by +tag+ number.
@@ -93,6 +87,7 @@ module Protobuf
       fields[tag]
     rescue TypeError => e
       tag = tag.nil? ? 'nil' : tag.to_s
+      raise
       raise FieldNotDefinedError.new("Tag '#{tag}' does not reference a message field for '#{self.name}'")
     end
 
@@ -284,16 +279,12 @@ module Protobuf
     def [](name)
       if field = get_field_by_name(name) || get_ext_field_by_name(name)
         __send__(field.name)
-      else
-        raise NoMethodError, "No such field: #{name.inspect}"
       end
     end
 
     def []=(name, value)
       if field = get_field_by_name(name) || get_ext_field_by_name(name)
         __send__(field.setter_method_name, value)
-      else
-        raise NoMethodError, "No such field: #{name.inspect}"
       end
     end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.7.5'
+  VERSION = '2.7.6'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ Bundler.setup :default, :development, :test
 require 'pry'
 
 $: << ::File.expand_path('..', File.dirname(__FILE__))
+$: << ::File.expand_path('../spec/support', File.dirname(__FILE__))
 #$: << ::File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'protobuf'

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

@@ -3,25 +3,26 @@
 #
 require 'protobuf/message'
 
+##
+# Imports
+#
+require 'test/resource.pb'
+
 module Test
   ##
   # Enum Classes
   #
-  class EnumTestType < ::Protobuf::Enum; end
+  class EnumTestType < ::Protobuf::Enum
+    define :ONE, 1
+    define :TWO, 2
+  end
+  
   
   ##
   # Message Classes
   #
   class EnumTestMessage < ::Protobuf::Message; end
   
-  ##
-  # Enum Values
-  #
-  class EnumTestType
-    define :ONE, 1
-    define :TWO, 2
-  end
-  
   ##
   # Message Fields
   #
@@ -31,4 +32,11 @@ module Test
     repeated ::Test::EnumTestType, :repeated_enums, 3
   end
   
+  ##
+  # Extended Messages
+  #
+  class ::Test::Resource
+    optional ::Protobuf::Field::Int32Field, :ext_other_file_defined_field, 200, :extension => true
+  end
+  
 end

data/spec/support/test/enum.proto

@@ -1,4 +1,5 @@
 package test;
+import 'test/resource.proto';
 
 enum EnumTestType {
   ONE = 1;
@@ -10,3 +11,7 @@ message EnumTestMessage {
   optional EnumTestType default_enum = 2 [default=ONE];
   repeated EnumTestType repeated_enums = 3;
 }
+
+extend test.Resource {
+  optional int32 ext_other_file_defined_field = 200;
+}

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

@@ -8,23 +8,31 @@ module Test
   ##
   # Enum Classes
   #
-  class StatusType < ::Protobuf::Enum; end
+  class StatusType < ::Protobuf::Enum
+    define :PENDING, 0
+    define :ENABLED, 1
+    define :DISABLED, 2
+    define :DELETED, 3
+  end
+  
   
   ##
   # Message Classes
   #
   class ResourceFindRequest < ::Protobuf::Message; end
   class Resource < ::Protobuf::Message; end
-  class Nested < ::Protobuf::Message; end
-  
-  ##
-  # Enum Values
-  #
-  class StatusType
-    define :PENDING, 0
-    define :ENABLED, 1
-    define :DISABLED, 2
-    define :DELETED, 3
+  class Searchable < ::Protobuf::Message
+    class SearchType < ::Protobuf::Enum
+      define :FLAT, 1
+      define :NESTED, 2
+    end
+    
+  end
+  class MessageParent < ::Protobuf::Message
+    class MessageChild < ::Protobuf::Message; end
+  end
+  class Nested < ::Protobuf::Message
+    class NestedLevelOne < ::Protobuf::Message; end
   end
   
   ##
@@ -40,13 +48,41 @@ module Test
     optional ::Protobuf::Field::Int64Field, :date_created, 2
     optional ::Test::StatusType, :status, 3
     repeated ::Test::StatusType, :repeated_enum, 4
+    
+    # Extension Fields
+    extensions 100...536870912
+    optional ::Protobuf::Field::BoolField, :ext_is_searchable, 100, :extension => true
+    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
+  end
+  
+  class MessageParent
+    class MessageChild
+      optional ::Protobuf::Field::StringField, :child1, 1
+    end
+    
   end
   
   class Nested
+    class NestedLevelOne
+      optional ::Protobuf::Field::BoolField, :level_one, 1, :default => true
+      
+      # Extension Fields
+      extensions 100...102
+      optional ::Protobuf::Field::BoolField, :ext_nested_level_one_outer, 101, :extension => true
+      optional ::Protobuf::Field::BoolField, :ext_nested_level_one, 100, :extension => true
+    end
+    
     optional ::Protobuf::Field::StringField, :name, 1
     optional ::Test::Resource, :resource, 2
     repeated ::Test::Resource, :multiple_resources, 3
     optional ::Test::StatusType, :status, 4
+    
+    # Extension Fields
+    extensions 100...111
+    optional ::Protobuf::Field::StringField, :foo, 100, :extension => true
+    optional ::Protobuf::Field::Int64Field, :bar, 101, :extension => true
   end
   
   ##

data/spec/support/test/resource.proto

@@ -13,17 +13,62 @@ message ResourceFindRequest {
 }
 
 message Resource {
+  extensions 100 to max;
+
   required string name = 1;
   optional int64 date_created = 2;
   optional StatusType status = 3;
   repeated StatusType repeated_enum = 4;
 }
 
+message Searchable {
+  enum SearchType {
+    FLAT = 1;
+    NESTED = 2;
+  }
+
+  extend test.Resource {
+    optional bool ext_is_searchable = 100;
+    optional bool ext_is_hidden = 101;
+    optional Searchable.SearchType ext_search_type = 102 [default=FLAT];
+  }
+}
+
+message MessageParent {
+  message MessageChild {
+    optional string child1 = 1;
+  }
+}
+
 message Nested {
+  extensions 100 to 110;
+
   optional string name = 1;
   optional Resource resource = 2;
   repeated Resource multiple_resources = 3;
   optional StatusType status = 4;
+
+  message NestedLevelOne {
+    extensions 100 to 101;
+    optional bool level_one = 1 [default=true];
+
+    extend Resource {
+      optional bool ext_nested_in_level_one = 105;
+    }
+  }
+
+  extend NestedLevelOne {
+    optional bool ext_nested_level_one = 100;
+  }
+}
+
+extend Nested {
+  optional string foo = 100;
+  optional int64 bar = 101;
+}
+
+extend Nested.NestedLevelOne {
+  optional bool ext_nested_level_one_outer = 101;
 }
 
 service ResourceService {

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.7.5
+  version: 2.7.6
 platform: java
 authors:
 - BJ Neilsen
@@ -10,240 +10,149 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5666 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5666
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: ffi
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5684 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5684
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5700 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5700
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5716 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5716
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5732 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5732
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5750 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5750
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5766 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5766
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5782 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5782
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5798 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5798
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5814 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5814
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5830 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5830
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &5846 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5846
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &5862 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
+  requirement: *5862
   prerelease: false
   type: :development
 description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
@@ -256,9 +165,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - Gemfile
 - README.md
 - Rakefile
@@ -517,29 +426,109 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
       hash: 2
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
       hash: 2
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+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/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:
+...