protip 0.30.7 → 0.30.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d239a033b1eb1195452fe0e5c213f6e895ea58d
-  data.tar.gz: e9fbd5cb9aea18eadb29511fe538558c1e0221d5
+  metadata.gz: 7b700562f8cedc2912054670d12c0c41a5ad3f84
+  data.tar.gz: 0d7570c79be4b391c252482d161aa10acf739fc1
 SHA512:
-  metadata.gz: f59804b61df3ad5234f43ced5a88ee600d2d03dfafe4360967bc4d38d08acbdeefd7a5220d863c76ffd11a2f29d31bc2d25fb04c26981426f2013c523df650a6
-  data.tar.gz: 16a50621105d9940f5d7e136e61b1072a782ff595332f8335bbbe220abf4f474aa9e106cab1a0d610b323d2aad1c6e8c459f4a75cd2a5bb01c680298d3881a44
+  metadata.gz: 42fdc7f6b8a8b18128edae66d2af7d62f7e83ac7556bfd3dd4ebaabe26161daecde74932762f39da43fee776225cc66257240668bbbb16611c6c733f65ac3cfa
+  data.tar.gz: f58984dd3bbc99af11bee730cc577fca94e1623c1b282c17b32ea0f292b7095086835a53f544d641625af5313538d22edd331c993214dc69acc62283b3e62afa

data/lib/protip/resource.rb

@@ -302,7 +302,21 @@ module Protip
       keys.each do |key|
         old_value = old_attributes[key]
         new_value = message[key]
-        unless old_value.class == new_value.class && old_value == new_value
+        begin
+          changed = !(old_value.class == new_value.class && old_value == new_value)
+        rescue TypeError => e
+
+          # Workaround for a protip bug when comparing messages with
+          # nested messages where the left side is non-nil and the
+          # right side is nil.
+          if e.message == 'wrong argument type nil (expected Message)'
+            changed = true
+          else
+            raise e
+          end
+        end
+
+        if changed
           send "#{key}_will_change!"
         end
       end

data/test/unit/protip/resource_test.rb

@@ -36,6 +36,12 @@ module Protip::ResourceTest # Namespace for internal constants
             optional :oneof_string1, :string, 12
             optional :oneof_string2, :string, 13
           end
+
+          optional :double_nested_message, :message, 14, 'double_nested_message'
+        end
+
+        add_message 'double_nested_message' do
+          optional :nested_message, :message, 1, 'nested_message'
         end
 
         add_message 'resource_query' do
@@ -57,7 +63,7 @@ module Protip::ResourceTest # Namespace for internal constants
       end
       pool
     end
-    %w(nested_message resource_message resource_query action_query action_response).each do |name|
+    %w(nested_message resource_message resource_query action_query action_response double_nested_message).each do |name|
       let(:"#{name}_class") do
         pool.lookup(name).msgclass
       end
@@ -563,6 +569,10 @@ module Protip::ResourceTest # Namespace for internal constants
             transformer.stubs(:to_object).
               with(nested_message_class.new(number: 62), nested_message_field).
               returns(72)
+
+            transformer.stubs(:to_object).
+              with(double_nested_message_class.any_instance, anything).
+              returns(100)
           end
           it 'marks messages as changed if they are changed as Ruby values' do
             setter.set nested_message: 42
@@ -591,6 +601,20 @@ module Protip::ResourceTest # Namespace for internal constants
             refute resource.changed?, 'resource was marked as changed'
             refute resource.string_changed?, 'field was marked as changed'
           end
+
+          # Test our workaround for a protobuf bug when comparing
+          # messages with sub-messages that are non-nil on the left,
+          # nil on the right.
+          it 'recognizes when double-nested messages are changed to nil values' do
+            # Initially the field should have its nested message set.
+            resource.message.double_nested_message = double_nested_message_class.new(
+              nested_message: nested_message_class.new(number: 10)
+            )
+
+            # Then give it a field with a nil nested message to
+            # trigger the protobuf bug.
+            setter.set double_nested_message: double_nested_message_class.new
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protip
 version: !ruby/object:Gem::Version
-  version: 0.30.7
+  version: 0.30.8
 platform: ruby
 authors:
 - AngelList
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Resources backed by protobuf messages