ruby-protocol-buffers 1.5.0 → 1.5.1

data/lib/protocol_buffers/runtime/field.rb

@@ -159,6 +159,10 @@ module ProtocolBuffers
                 #{name}.clear
                 __value.each { |i| @#{name}.push i }
               end
+              if @parent_for_notify
+                @parent_for_notify.default_changed(@tag_for_notify)
+                @parent_for_notify = @tag_for_notify = nil
+              end
             end
           end
         EOF

data/lib/protocol_buffers/runtime/message.rb

@@ -329,11 +329,38 @@ module ProtocolBuffers
     # Comparison by class and field values.
     def ==(obj)
       return false unless obj.is_a?(self.class)
-      fields.each do |tag, field|
-        return false unless self.__send__(field.name) == obj.__send__(field.name)
+      fields.each do |tag, _|
+        if value_for_tag?(tag)
+          return false unless (obj.value_for_tag?(tag) && value_for_tag(tag) == obj.value_for_tag(tag))
+        else
+          return false if obj.value_for_tag?(tag)
+        end
       end
       return true
     end
+    
+    # Comparison by class and field values.
+    def eql?(obj)
+      return false unless obj.is_a?(self.class)
+      fields.each do |tag, _|
+        if value_for_tag?(tag)
+          return false unless (obj.value_for_tag?(tag) && value_for_tag(tag).eql?(obj.value_for_tag(tag)))
+        else
+          return false if obj.value_for_tag?(tag)
+        end
+      end
+      return true
+    end
+
+    def hash
+      hash_code = 0
+      fields.each do |tag, _|
+        if value_for_tag?(tag)
+          hash_code = hash_code ^ value_for_tag(tag).hash
+        end
+      end
+      hash_code
+    end
 
     # Reset all fields to the default value.
     def clear!

data/lib/protocol_buffers/version.rb

@@ -1,3 +1,3 @@
 module ProtocolBuffers
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/message_spec.rb

@@ -0,0 +1,119 @@
+# encoding: binary
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'protocol_buffers'
+
+describe ProtocolBuffers, "message" do
+  before(:each) do
+    # clear our namespaces
+    %w( Simple Featureful Foo Packed TehUnknown TehUnknown2 TehUnknown3 Enums A C Services).each do |klass|
+      Object.send(:remove_const, klass.to_sym) if Object.const_defined?(klass.to_sym)
+    end
+
+    # load test protos
+    %w( simple featureful packed enums no_package services).each do |proto|
+      load File.join(File.dirname(__FILE__), "proto_files", "#{proto}.pb.rb")
+    end
+  end
+
+  it "correctly handles value_for_tag? when fields are set in the constructor" do
+    a = Featureful::A.new(
+      :i2 => 1,
+      :sub2 => Featureful::A::Sub.new(
+        :payload => "test_payload"
+      )
+    )
+
+    a.value_for_tag?(1).should == true
+    a.value_for_tag?(5).should == true
+  end
+
+  it "correctly handles value_for_tag? when a MessageField is set to the same object in two locations within the same proto and set in the constructor" do
+    d = Featureful::D.new(
+      :f => [1, 2, 3].map do |num|
+        Featureful::F.new(
+          :s => "#{num}"
+        )
+      end
+    )
+    c = Featureful::C.new(
+      :d => d,
+      :e => [1].map do |num|
+        Featureful::E.new(
+          :d => d
+        )
+      end
+    )
+
+    c.value_for_tag?(1).should == true
+  end
+
+  it "correctly handles value_for_tag? when a Messagefield is set to the same object in two locations within the same proto and set outside of the constructor" do
+    d = Featureful::D.new
+    d.f = [1, 2, 3].map do |num|
+      Featureful::F.new(
+        :s => "#{num}"
+      )
+    end
+    c = Featureful::C.new
+    c.d = d
+    c.e = [1].map do |num|
+      Featureful::E.new(
+        :d => d
+      )
+    end
+
+    c.value_for_tag?(1).should == true
+  end
+
+  it "correctly handles value_for_tag? when a field is accessed and then modified and this field is a MessageField with only a repeated field accessed" do
+    c = Featureful::C.new
+    c_d = c.d
+    c_d.f = [1, 2, 3].map do |num|
+      Featureful::F.new(
+        :s => "#{num}"
+      )
+    end
+    d = Featureful::D.new
+    d.f = [1, 2, 3].map do |num|
+      Featureful::F.new(
+        :s => "#{num}"
+      )
+    end
+    c.e = [1].map do |num|
+      Featureful::E.new(
+        :d => d
+      )
+    end
+
+    c.value_for_tag?(1).should == true
+  end
+
+  it "correctly handles value_for_tag? when a field is accessed and then modified and this field is a MessageField with a repeated and optional field accessed" do
+    c = Featureful::C.new
+    c_d = c.d
+    c_d.f = [1, 2, 3].map do |num|
+      Featureful::F.new(
+        :s => "#{num}"
+      )
+    end
+    d = Featureful::D.new
+    d.f = [1, 2, 3].map do |num|
+      Featureful::F.new(
+        :s => "#{num}"
+      )
+    end
+    d.f2 = Featureful::F.new(
+      :s => "4"
+    )
+    c.e = [1].map do |num|
+      Featureful::E.new(
+        :d => d
+      )
+    end
+
+    c.value_for_tag?(1).should == true
+  end
+end

data/spec/proto_files/featureful.pb.rb

@@ -8,10 +8,17 @@ module Featureful
   class A < ::ProtocolBuffers::Message; end
   class B < ::ProtocolBuffers::Message; end
   class ABitOfEverything < ::ProtocolBuffers::Message; end
+  class C < ::ProtocolBuffers::Message; end
+  class D < ::ProtocolBuffers::Message; end
+  class E < ::ProtocolBuffers::Message; end
+  class F < ::ProtocolBuffers::Message; end
 
   # enums
   module MainPayloads
     include ::ProtocolBuffers::Enum
+
+    set_fully_qualified_name "featureful.MainPayloads"
+
     P1 = 2
     P2 = 3
     P3 = 4
@@ -24,6 +31,8 @@ module Featureful
     class Group2 < ::ProtocolBuffers::Message; end
     class Group3 < ::ProtocolBuffers::Message; end
 
+    set_fully_qualified_name "featureful.A"
+
     # nested messages
     class Sub < ::ProtocolBuffers::Message
       # forward declarations
@@ -32,12 +41,19 @@ module Featureful
       # enums
       module Payloads
         include ::ProtocolBuffers::Enum
+
+        set_fully_qualified_name "featureful.A.Sub.Payloads"
+
         P1 = 0
         P2 = 1
       end
 
+      set_fully_qualified_name "featureful.A.Sub"
+
       # nested messages
       class SubSub < ::ProtocolBuffers::Message
+        set_fully_qualified_name "featureful.A.Sub.SubSub"
+
         optional :string, :subsub_payload, 1
       end
 
@@ -50,8 +66,12 @@ module Featureful
       # forward declarations
       class Subgroup < ::ProtocolBuffers::Message; end
 
+      set_fully_qualified_name "featureful.A.Group1"
+
       # nested messages
       class Subgroup < ::ProtocolBuffers::Message
+        set_fully_qualified_name "featureful.A.Group1.Subgroup"
+
         required :int32, :i1, 1
       end
 
@@ -63,8 +83,12 @@ module Featureful
       # forward declarations
       class Subgroup < ::ProtocolBuffers::Message; end
 
+      set_fully_qualified_name "featureful.A.Group2"
+
       # nested messages
       class Subgroup < ::ProtocolBuffers::Message
+        set_fully_qualified_name "featureful.A.Group2.Subgroup"
+
         required :int32, :i1, 1
       end
 
@@ -76,8 +100,12 @@ module Featureful
       # forward declarations
       class Subgroup < ::ProtocolBuffers::Message; end
 
+      set_fully_qualified_name "featureful.A.Group3"
+
       # nested messages
       class Subgroup < ::ProtocolBuffers::Message
+        set_fully_qualified_name "featureful.A.Group3.Subgroup"
+
         required :int32, :i1, 1
       end
 
@@ -97,10 +125,14 @@ module Featureful
   end
 
   class B < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.B"
+
     repeated ::Featureful::A, :a, 1
   end
 
   class ABitOfEverything < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.ABitOfEverything"
+
     optional :double, :double_field, 1
     optional :float, :float_field, 2
     optional :int32, :int32_field, 3
@@ -118,4 +150,30 @@ module Featureful
     optional :bytes, :bytes_field, 15
   end
 
+  class C < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.C"
+
+    optional ::Featureful::D, :d, 1
+    repeated ::Featureful::E, :e, 2
+  end
+
+  class D < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.D"
+
+    repeated ::Featureful::F, :f, 1
+    optional ::Featureful::F, :f2, 2
+  end
+
+  class E < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.E"
+
+    optional ::Featureful::D, :d, 1
+  end
+
+  class F < ::ProtocolBuffers::Message
+    set_fully_qualified_name "featureful.F"
+
+    optional :string, :s, 1
+  end
+
 end

data/spec/proto_files/featureful.proto

@@ -73,3 +73,21 @@ message ABitOfEverything {
   optional string string_field = 14 [default = "zomgkittenz"];
   optional bytes bytes_field = 15;
 };
+
+message C {
+  optional D d = 1;
+  repeated E e = 2;
+}
+
+message D {
+  repeated F f = 1;
+  optional F f2 = 2;
+}
+
+message E {
+  optional D d = 1;
+}
+
+message F {
+  optional string s = 1;
+}

data/spec/runtime_spec.rb

@@ -742,6 +742,107 @@ describe ProtocolBuffers, "runtime" do
 
   end
 
+  it "correctly handles ==, eql? and hash" do
+    f1 = Featureful::A.new
+    f1.i1 = [1, 2, 3]
+    f1.i3 = 4
+    sub111 = Featureful::A::Sub.new
+    sub111.payload = "sub11payload"
+    sub111.payload_type = Featureful::A::Sub::Payloads::P1
+    sub111.subsub1.subsub_payload = "sub11subsubpayload"
+    sub112 = Featureful::A::Sub.new
+    sub112.payload = "sub12payload"
+    sub112.payload_type = Featureful::A::Sub::Payloads::P2
+    sub112.subsub1.subsub_payload = "sub12subsubpayload"
+    f1.sub1 = [sub111, sub112]
+    f1.sub3.payload = ""
+    f1.sub3.payload_type = Featureful::A::Sub::Payloads::P1
+    f1.sub3.subsub1.subsub_payload = "sub3subsubpayload"
+    f1.group3.i1 = 1
+
+    f2 = Featureful::A.new
+    f2.i1 = [1, 2, 3]
+    f2.i3 = 4
+    sub211 = Featureful::A::Sub.new
+    sub211.payload = "sub11payload"
+    sub211.payload_type = Featureful::A::Sub::Payloads::P1
+    sub211.subsub1.subsub_payload = "sub11subsubpayload"
+    sub212 = Featureful::A::Sub.new
+    sub212.payload = "sub12payload"
+    sub212.payload_type = Featureful::A::Sub::Payloads::P2
+    sub212.subsub1.subsub_payload = "sub12subsubpayload"
+    f2.sub1 = [sub211, sub212]
+    f2.sub3.payload = ""
+    f2.sub3.payload_type = Featureful::A::Sub::Payloads::P1
+    f2.sub3.subsub1.subsub_payload = "sub3subsubpayload"
+    f2.group3.i1 = 1
+
+    # different because subsub1.sub_payload different
+    f3 = Featureful::A.new
+    f3.i1 = [1, 2, 3]
+    f3.i3 = 4
+    sub311 = Featureful::A::Sub.new
+    sub311.payload = "sub11payload"
+    sub311.payload_type = Featureful::A::Sub::Payloads::P1
+    sub311.subsub1.subsub_payload = "sub11subsubpayload"
+    sub312 = Featureful::A::Sub.new
+    sub312.payload = "sub12payload"
+    sub312.payload_type = Featureful::A::Sub::Payloads::P2
+    sub312.subsub1.subsub_payload = "sub12subsubpayload_DIFFERENT"
+    f3.sub1 = [sub311, sub312]
+    f3.sub3.payload = ""
+    f3.sub3.payload_type = Featureful::A::Sub::Payloads::P1
+    f3.sub3.subsub1.subsub_payload = "sub3subsubpayload"
+    f3.group3.i1 = 1
+
+    # different because sub3.payload not set
+    f4 = Featureful::A.new
+    f4.i1 = [1, 2, 3]
+    f4.i3 = 4
+    sub411 = Featureful::A::Sub.new
+    sub411.payload = "sub11payload"
+    sub411.payload_type = Featureful::A::Sub::Payloads::P1
+    sub411.subsub1.subsub_payload = "sub11subsubpayload"
+    sub412 = Featureful::A::Sub.new
+    sub412.payload = "sub12payload"
+    sub412.payload_type = Featureful::A::Sub::Payloads::P2
+    sub412.subsub1.subsub_payload = "sub12subsubpayload"
+    f4.sub1 = [sub411, sub412]
+    f4.sub3.payload_type = Featureful::A::Sub::Payloads::P1
+    f4.sub3.subsub1.subsub_payload = "sub3subsubpayload"
+    f4.group3.i1 = 1
+
+    f1.should == f2
+    f1.should_not == f3
+    f1.should_not == f4
+    f2.should == f1
+    f2.should_not == f3
+    f2.should_not == f4
+    f3.should_not == f1
+    f3.should_not == f2
+    f3.should_not == f4
+
+    f1.eql?(f2).should == true
+    f1.eql?(f3).should_not == true
+    f1.eql?(f4).should_not == true
+    f2.eql?(f1).should == true
+    f2.eql?(f3).should_not == true
+    f2.eql?(f4).should_not == true
+    f3.eql?(f1).should_not == true
+    f3.eql?(f2).should_not == true
+    f3.eql?(f4).should_not == true
+
+    f1.hash.should == f2.hash
+    f1.hash.should_not == f3.hash
+    f1.hash.should_not == f4.hash
+    f2.hash.should == f1.hash
+    f2.hash.should_not == f3.hash
+    f2.hash.should_not == f4.hash
+    f3.hash.should_not == f1.hash
+    f3.hash.should_not == f2.hash
+    f3.hash.should_not == f4.hash
+  end
+
   it "correctly handles fully qualified names on Messages" do
     Simple::Test1.fully_qualified_name.should == "simple.Test1"
     Simple::Foo.fully_qualified_name.should == "simple.Foo"

data/spec/spec_helper.rb

@@ -103,6 +103,7 @@ def has_compiler?
 end
 
 RSpec.configure do |config|
+  config.backtrace_exclusion_patterns = []
   config.after(:each) do
     # clear our namespaces
     Object.send(:remove_const, :Simple) if defined?(Simple)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-protocol-buffers
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
@@ -177,6 +177,7 @@ files:
 - ruby-protocol-buffers.gemspec
 - spec/compiler_spec.rb
 - spec/fields_spec.rb
+- spec/message_spec.rb
 - spec/negative_int32_spec.rb
 - spec/nil_bugs_spec.rb
 - spec/proto_files/depends.proto
@@ -217,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -120727640880373349
+      hash: 4464428252949135553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -120727640880373349
+      hash: 4464428252949135553
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -236,6 +237,7 @@ summary: Ruby compiler and runtime for the google protocol buffers library.
 test_files:
 - spec/compiler_spec.rb
 - spec/fields_spec.rb
+- spec/message_spec.rb
 - spec/negative_int32_spec.rb
 - spec/nil_bugs_spec.rb
 - spec/proto_files/depends.proto