intercom 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc57c0a217de2bfd1a9b69cb399abf85f7e9c18
-  data.tar.gz: 4143a672d16443f5bef61202ee01a43c8799351e
+  metadata.gz: 0dbda33717023773fe561fcb9c84b46111ee60c7
+  data.tar.gz: 426f92eeef9226d327bf8731884e458acd0dfb82
 SHA512:
-  metadata.gz: 4120dafba36bfa9872e44813ed0bd40d59e927bb91c8b1a93e90d52d1e471f84e2c8a331dc4a949fc8a07f0778ed559ff8141aa215aae8322c9d3d7c0075d763
-  data.tar.gz: 1c21bfcfd62e111cf5aefb5aae29e77bc1cb191f87774a33ee9d1a8f6b295b939a43712df76f5c85be6b1bf6bdfdee282acd479ed0c9880ed43c0bc9162c1207
+  metadata.gz: 63bc5f1bf011fe12ca02eec3b127200f609dd6617f2e87e1ff30fa824aff91a46a794e62d44e371d6c7429931fe1416b11caa4543efa6a3d98a3e415f403a1b4
+  data.tar.gz: 515f90cf4bb6ff6e2bbaebaa0649279d94e71666815c3f38fc5979e022e170359330378c5addac30caf93001d445531e3f0c7bed20ca113dad3a3304e37a8263

data/.gitignore

@@ -9,3 +9,4 @@ pkg/*
 spike.rb
 html
 .idea
+*.swp

data/changes.txt

@@ -1,6 +1,12 @@
+2.0.3
+- Fix for bug caused by "type" in custom attributes
+
 2.0.2
 - Mark conversations as read
 
+2.0.1
+- Move ruby version to gemspec
+
 2.0.0
 - Bumped to 2.0.0.
 

data/lib/intercom/traits/api_resource.rb

@@ -67,7 +67,7 @@ module Intercom
       end
 
       def set_property(attribute, value)
-        if typed_value?(value)
+        if typed_value?(value) && !custom_attribute_field?(attribute)
           value_to_set = Intercom::Lib::TypedJsonDeserializer.new(value).deserialize
         elsif flat_store_attribute?(attribute)
           value_to_set = Intercom::Lib::FlatStore.new(value)
@@ -77,6 +77,10 @@ module Intercom
         call_setter_for_attribute(attribute, value_to_set)
       end
 
+      def custom_attribute_field?(attribute)
+        attribute == 'custom_attributes'
+      end
+
       def typed_value?(value)
         value.is_a? Hash and !!value['type']
       end

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,76 +15,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Intercom (https://www.intercom.io) is a customer relationship management
@@ -103,8 +103,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -169,12 +169,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []