intercom 3.5.15 → 3.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8736fc189f694a87cf8fa4d9a5196d8dccb7244d
-  data.tar.gz: 35c553782dc058139212ce9f5fcad13cf722e000
+  metadata.gz: 7941aa95bd27e3f1807f11593a33ea7d4717107d
+  data.tar.gz: 3bafd3ab40b8eba3f62faecbcd6262cf335da705
 SHA512:
-  metadata.gz: ba36260e11e2dda2c3b6f4a44e683e3d442e85923b35ffcca0a9adbb8870b23bd5cf2640cf1c4704bb36c633946b3ff9252054fe6973ba203fb665b30518a4c3
-  data.tar.gz: 8027f84fd08f6c0aaa992e111172892e3700bada6e2adaf0e314bf422f07ac4d5e3defe8fe8ce49230460c95d1b97be96f2113677b2a64644b2f0b573881a8ce
+  metadata.gz: a84a61e028ae77913bf19bd336134e31aad994d33258bd2c0e8d46f9b2b1ea09c652e312471366a7cb6b266a5570c6adcf271dcbf00ee8a9ebaa7cf613765c8f
+  data.tar.gz: 12d83ef9c8632511ac319760252525f6803b2865d5bdd450029af47f4df61e9f329f5bb46dd1caec7175435988d85ef4ab195ec6840c22a9b1d6bc06d481adcb

data/changes.txt

@@ -1,3 +1,6 @@
+3.5.16
+ - Standardize comparison of attribute as string when input is Hash or JSON
+
 3.5.15
 - UnauthorizedError on invalid token
 - BlockerUserError on restoring blocked user

data/lib/intercom/traits/api_resource.rb

@@ -78,13 +78,13 @@ module Intercom
       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 @@ module Intercom
           !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 @@ module Intercom
       end
 
       def type_field?(attribute)
-        attribute == 'type'
+        attribute.to_s == 'type'
       end
 
       def initialize_missing_flat_store_attributes

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "3.5.15"
+  VERSION = "3.5.16"
 end

data/spec/unit/intercom/traits/api_resource_spec.rb

@@ -17,6 +17,26 @@ describe Intercom::Traits::ApiResource do
        "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 @@ describe Intercom::Traits::ApiResource do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 3.5.15
+  version: 3.5.16
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest