Merge pull request #365 from intercom/AP/type_field

Return object type

Author: apassant

README.md

@@ -22,7 +22,7 @@ This version of the gem is compatible with `Ruby 2.1` and above.
 
 Using bundler:
 
-    gem 'intercom', '~> 3.5.21'
+    gem 'intercom', '~> 3.5.22'
 
 ## Basic Usage
 

changes.txt

@@ -1,3 +1,6 @@
+3.5.22
+ - Return object type
+
 3.5.21
  - Fix for PR-353 which addressed "NoMethodError in intercom/request"
  - There were issues on older versions of Ruby (<2.3)

circle.yml

@@ -0,0 +1,6 @@
+machine:
+  ruby:
+    version: 2.1.0
+test:
+  post:
+  - bundle exec rake

lib/intercom/traits/api_resource.rb

@@ -24,7 +24,6 @@ def from_response(response)
 
       def from_hash(hash)
         hash.each do |attribute, value|
-          next if type_field?(attribute)
           initialize_property(attribute, value)
         end
         initialize_missing_flat_store_attributes if respond_to? :flat_store_attributes
@@ -106,10 +105,6 @@ def call_setter_for_attribute(attribute, value)
         self.send(setter_method, value)
       end
 
-      def type_field?(attribute)
-        attribute.to_s == 'type'
-      end
-
       def initialize_missing_flat_store_attributes
         flat_store_attributes.each do |attribute|
           unless instance_variables_excluding_dirty_tracking_field.map(&:to_s).include? "@#{attribute}"

spec/unit/intercom/traits/api_resource_spec.rb

@@ -41,10 +41,6 @@
 
   before(:each) { api_resource.from_response(object_json) }
 
-  it "does not set type on parsing json" do
-    api_resource.wont_respond_to :type
-  end
-
   it "coerces time on parsing json" do
     assert_equal Time.at(1374056196), api_resource.created_at
   end