Merge pull request #566 from mevo-limited/instance-level-dynamic-accessors

Instance level dynamic accessors

Author: SeanHealy33

README.md

@@ -736,13 +736,13 @@ intercom = Intercom::Client.new(token: ENV['AT'], handle_rate_limit: true)
 
 ```bash
 # all tests
-bundle exec spec
+bundle exec rake spec
 
 # unit tests
-bundle exec spec:unit
+bundle exec rake spec:unit
 
 # integration tests
-bundle exec spec:integration
+bundle exec rake spec:integration
 
 # single test file
 bundle exec m spec/unit/intercom/job_spec.rb

lib/intercom/lib/dynamic_accessors.rb

@@ -5,20 +5,19 @@ module DynamicAccessors
       class << self
 
         def define_accessors(attribute, value, object)
-          klass = object.class
           if attribute.to_s.end_with?('_at') && attribute.to_s != 'update_last_request_at'
-            define_date_based_accessors(attribute, value, klass)
+            define_date_based_accessors(attribute, value, object)
           elsif object.flat_store_attribute?(attribute)
-            define_flat_store_based_accessors(attribute, value, klass)
+            define_flat_store_based_accessors(attribute, value, object)
           else
-            define_standard_accessors(attribute, value, klass)
+            define_standard_accessors(attribute, value, object)
           end
         end
 
         private
 
-        def define_flat_store_based_accessors(attribute, value, klass)
-          klass.class_eval %Q"
+        def define_flat_store_based_accessors(attribute, value, object)
+          object.instance_eval %Q"
             def #{attribute}=(value)
               mark_field_as_changed!(:#{attribute})
               @#{attribute} = Intercom::Lib::FlatStore.new(value)
@@ -29,8 +28,8 @@ def #{attribute}
           "
         end
 
-        def define_date_based_accessors(attribute, value, klass)
-          klass.class_eval %Q"
+        def define_date_based_accessors(attribute, value, object)
+          object.instance_eval %Q"
             def #{attribute}=(value)
               mark_field_as_changed!(:#{attribute})
               @#{attribute} = value.nil? ? nil : value.to_i
@@ -41,8 +40,8 @@ def #{attribute}
           "
         end
 
-        def define_standard_accessors(attribute, value, klass)
-            klass.class_eval %Q"
+        def define_standard_accessors(attribute, value, object)
+            object.instance_eval %Q"
               def #{attribute}=(value)
                 mark_field_as_changed!(:#{attribute})
                 @#{attribute} = value

spec/unit/intercom/contact_spec.rb

@@ -274,6 +274,7 @@
 
   describe 'nested resources' do
     let(:contact) { Intercom::Contact.new(id: '1', client: client) }
+    let(:contact_no_tags) { Intercom::Contact.new(id: '2', client: client, tags: []) }
     let(:company) { Intercom::Company.new(id: '1') }
     let(:tag) { Intercom::Tag.new(id: '1') }
     let(:note) { Intercom::Note.new(body: "<p>Text for the note</p>") }
@@ -299,6 +300,27 @@
       _(proxy.resource_class).must_equal Intercom::Tag
     end
 
+    it 'returns correct tags from differring contacts' do
+      client.expects(:get).with('/contacts/1/tags', {}).returns({
+        'type' => 'tag.list',
+        'tags' => [
+          {
+            'type' => 'tag',
+            'id' => '1',
+            'name' => 'VIP Customer'
+          },
+          {
+            'type' => 'tag',
+            'id' => '2',
+            'name' => 'Test tag'
+          }
+        ]
+      })
+
+      _(contact_no_tags.tags.map{ |t| t.id }).must_equal []
+      _(contact.tags.map{ |t| t.id }).must_equal ['1', '2']
+    end
+
     it 'returns a collection proxy for listing companies' do
       proxy = contact.companies
       _(proxy.resource_name).must_equal 'companies'