Merge pull request #341 from intercom/shayon/custom-attr-type-field-class

Standardize comparison of attribute as string when input is Hash or JSON

Author: Kevin Antoine

lib/intercom/traits/api_resource.rb

@@ -78,13 +78,13 @@ def set_property(attribute, value)
       end
 
       def custom_attribute_field?(attribute)
-        attribute == 'custom_attributes'
+        attribute.to_s == 'custom_attributes'
       end
-      
+
       def message_from_field?(attribute, value)
         attribute.to_s == 'from' && value.is_a?(Hash) && value['type']
       end
-      
+
       def message_to_field?(attribute, value)
         attribute.to_s == 'to' && value.is_a?(Hash) && value['type']
       end
@@ -94,7 +94,7 @@ def typed_property?(attribute, value)
           !custom_attribute_field?(attribute) &&
           !message_from_field?(attribute, value) &&
           !message_to_field?(attribute, value) &&
-          attribute != 'metadata'
+          attribute.to_s != 'metadata'
       end
 
       def typed_value?(value)
@@ -107,7 +107,7 @@ def call_setter_for_attribute(attribute, value)
       end
 
       def type_field?(attribute)
-        attribute == 'type'
+        attribute.to_s == 'type'
       end
 
       def initialize_missing_flat_store_attributes

spec/unit/intercom/traits/api_resource_spec.rb

@@ -17,6 +17,26 @@
        "color"=>"cyan"
      }}
   end
+
+  let(:object_hash) do
+    {
+      type: "company",
+      id: "aaaaaaaaaaaaaaaaaaaaaaaa",
+      app_id: "some-app-id",
+      name: "SuperSuite",
+      plan_id: 1,
+      remote_company_id: "8",
+      remote_created_at: 103201,
+      created_at: 1374056196,
+      user_count: 1,
+      custom_attributes: { type: "ping" },
+      metadata: {
+        type: "user",
+        color: "cyan"
+      }
+    }
+  end
+
   let(:api_resource) { DummyClass.new.extend(Intercom::Traits::ApiResource)}
 
   before(:each) { api_resource.from_response(object_json) }
@@ -76,18 +96,29 @@
     proc { api_resource.send(:flubber=, 'a', 'b') }.must_raise NoMethodError
   end
 
-  it "an initialized ApiResource is equal to on generated from a response" do
+  it "an initialized ApiResource is equal to one generated from a response" do
     class ConcreteApiResource; include Intercom::Traits::ApiResource; end
     initialized_api_resource = ConcreteApiResource.new(object_json)
     except(object_json, 'type').keys.each do |attribute|
       assert_equal initialized_api_resource.send(attribute), api_resource.send(attribute)
     end
   end
-  
+
+  it "initialized ApiResource using hash is equal to one generated from response" do
+    class ConcreteApiResource; include Intercom::Traits::ApiResource; end
+
+    api_resource.from_hash(object_hash)
+    initialized_api_resource = ConcreteApiResource.new(object_hash)
+
+    except(object_json, 'type').keys.each do |attribute|
+      assert_equal initialized_api_resource.send(attribute), api_resource.send(attribute)
+    end
+  end
+
   def except(h, *keys)
     keys.each { |key| h.delete(key) }
     h
   end
-  
+
   class DummyClass; end
 end