intercom 3.9.5 → 4.1.3

data/lib/intercom/traits/api_resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'intercom/lib/flat_store'
 require 'intercom/lib/dynamic_accessors'
 require 'intercom/lib/dynamic_accessors_on_method_missing'
@@ -6,16 +8,19 @@ require 'intercom/lib/typed_json_deserializer'
 
 module Intercom
   module Traits
-
     module ApiResource
       include DirtyTracking
 
-      attr_accessor :id
+      attr_accessor :id, :client
 
       def initialize(attributes = {})
         from_hash(attributes)
       end
 
+      def ==(other)
+        self.class == other.class && to_json == other.to_json
+      end
+
       def from_response(response)
         from_hash(response)
         reset_changed_fields!
@@ -31,49 +36,71 @@ module Intercom
       end
 
       def to_hash
-        instance_variables_excluding_dirty_tracking_field.inject({}) do |hash, variable|
-          hash[variable.to_s.delete("@")] = instance_variable_get(variable)
-          hash
+        instance_variables_excluding_dirty_tracking_field.each_with_object({}) do |variable, hash|
+          hash[variable.to_s.delete('@')] = instance_variable_get(variable)
+        end
+      end
+
+      def to_json(*args)
+        instance_variables_excluding_dirty_tracking_field.each_with_object({}) do |variable, hash|
+          next if variable == :@client
+
+          value = instance_variable_get(variable)
+          hash[variable.to_s.delete('@')] = value.respond_to?(:to_json) ? value.to_json(*args) : value
         end
       end
 
       def to_submittable_hash
         submittable_hash = {}
         to_hash.each do |attribute, value|
-          submittable_hash[attribute] = value if submittable_attribute?(attribute, value)
+          next unless submittable_attribute?(attribute, value)
+
+          submittable_hash[attribute] = value.respond_to?(:to_submittable_hash) ? value.to_submittable_hash : value
         end
         submittable_hash
       end
 
       def method_missing(method_sym, *arguments, &block)
-        Lib::DynamicAccessorsOnMethodMissing.new(method_sym, *arguments, self).
-          define_accessors_or_call { super }
+        Lib::DynamicAccessorsOnMethodMissing.new(method_sym, *arguments, self)
+                                            .define_accessors_or_call { super }
       end
 
       def flat_store_attribute?(attribute)
-        (respond_to?(:flat_store_attributes)) && (flat_store_attributes.map(&:to_s).include?(attribute.to_s))
+        respond_to?(:flat_store_attributes) && flat_store_attributes.map(&:to_s).include?(attribute.to_s)
       end
 
       private
 
       def initialize_property(attribute, value)
+        return if addressable_list?(attribute, value)
+
         Lib::DynamicAccessors.define_accessors(attribute, value, self) unless accessors_already_defined?(attribute)
         set_property(attribute, value)
       end
 
+      def addressable_list?(attribute, value)
+        return false unless typed_property?(attribute, value)
+
+        value['type'] == 'list' && value['url']
+      end
+
       def accessors_already_defined?(attribute)
         respond_to?(attribute) && respond_to?("#{attribute}=")
       end
 
       def set_property(attribute, value)
+        value_to_set = parsed_value_for_attribute(attribute, value)
+        call_setter_for_attribute(attribute, value_to_set)
+      end
+
+      def parsed_value_for_attribute(attribute, value)
         if typed_property?(attribute, value)
-          value_to_set = Intercom::Lib::TypedJsonDeserializer.new(value).deserialize
+          Intercom::Lib::TypedJsonDeserializer.new(value, client).deserialize
         elsif flat_store_attribute?(attribute)
-          value_to_set = Intercom::Lib::FlatStore.new(value)
+          Intercom::Lib::FlatStore.new(value)
         else
-          value_to_set = value
+          value
         end
-        call_setter_for_attribute(attribute, value_to_set)
       end
 
       def custom_attribute_field?(attribute)
@@ -97,12 +124,12 @@ module Intercom
       end
 
       def typed_value?(value)
-        value.is_a? Hash and !!value['type']
+        value.is_a?(Hash) && !!value['type']
       end
 
       def call_setter_for_attribute(attribute, value)
-        setter_method = "#{attribute.to_s}="
-        self.send(setter_method, value)
+        setter_method = "#{attribute}="
+        send(setter_method, value)
       end
 
       def initialize_missing_flat_store_attributes
@@ -120,7 +147,7 @@ module Intercom
 
       module ClassMethods
         def from_api(api_response)
-          object = self.new
+          object = new
           object.from_response(api_response)
           object
         end
@@ -129,7 +156,6 @@ module Intercom
       def self.included(base)
         base.extend(ClassMethods)
       end
-
     end
   end
 end

data/lib/intercom/traits/dirty_tracking.rb

@@ -22,7 +22,14 @@ module Intercom
 
       def field_changed?(field_name)
         @changed_fields ||= Set.new
-        @changed_fields.include?(field_name.to_s)
+        field = instance_variable_get("@#{field_name}")
+        if field.respond_to?(:field_changed?)
+          field.to_hash.any? do |attribute, _|
+            field.field_changed?(attribute)
+          end
+        else
+          @changed_fields.include?(field_name.to_s)
+        end
       end
 
       def instance_variables_excluding_dirty_tracking_field

data/lib/intercom/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'intercom/traits/incrementable_attributes'
 require 'intercom/traits/api_resource'
 
@@ -6,9 +8,16 @@ module Intercom
     include Traits::IncrementableAttributes
     include Traits::ApiResource
 
-    def identity_vars ; [:id, :email, :user_id] ; end
-    def flat_store_attributes ; [:custom_attributes] ; end
-    def update_verb ; 'post' ; end
+    def identity_vars
+      %i[id email user_id]
+    end
+
+    def flat_store_attributes
+      [:custom_attributes]
+    end
 
+    def update_verb
+      'post'
+    end
   end
 end

data/lib/intercom/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Intercom
   module Utils
     class << self
@@ -7,6 +9,7 @@ module Intercom
 
       def pluralize(str)
         return str.gsub(/y$/, 'ies') if str =~ /y$/
+
         "#{str}s"
       end
 
@@ -23,7 +26,13 @@ module Intercom
       end
 
       def resource_class_to_singular_name(resource_class)
-        resource_class.to_s.split('::')[-1].downcase
+        resource_name = resource_class.to_s.split('::')[-1]
+        resource_name = maybe_underscore_name(resource_name)
+        resource_name.downcase
+      end
+
+      def maybe_underscore_name(resource_name)
+        resource_name.gsub!(/(.)([A-Z])/, '\1_\2') || resource_name
       end
 
       def resource_class_to_collection_name(resource_class)
@@ -52,9 +61,11 @@ module Intercom
       end
 
       def entity_key_from_type(type)
+        return 'data' if type == 'list'
+
         is_list = type.split('.')[1] == 'list'
         entity_name = type.split('.')[0]
-        is_list ?  Utils.pluralize(entity_name) : entity_name
+        is_list ? Utils.pluralize(entity_name) : entity_name
       end
     end
   end

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "3.9.5"
+  VERSION = "4.1.3"
 end

data/lib/intercom/visitor.rb

@@ -8,7 +8,5 @@ module Intercom
 
     def identity_vars ; [:id, :email, :user_id] ; end
     def flat_store_attributes ; [:custom_attributes] ; end
-    def update_verb ; 'put' ; end
-
   end
 end

data/lib/intercom.rb

@@ -1,41 +1,52 @@
-require "intercom/version"
+# frozen_string_literal: true
+
+require 'intercom/version'
 require 'intercom/service/admin'
+require 'intercom/service/article'
+require 'intercom/service/collection'
 require 'intercom/service/company'
 require 'intercom/service/contact'
 require 'intercom/service/conversation'
 require 'intercom/service/count'
-require 'intercom/service/customer'
 require 'intercom/service/event'
 require 'intercom/service/message'
 require 'intercom/service/note'
 require 'intercom/service/job'
 require 'intercom/service/subscription'
 require 'intercom/service/segment'
+require 'intercom/service/section'
 require 'intercom/service/tag'
 require 'intercom/service/team'
-require 'intercom/service/user'
 require 'intercom/service/visitor'
+require 'intercom/service/user'
+require 'intercom/service/lead'
+require 'intercom/deprecated_resources.rb'
 require 'intercom/options'
 require 'intercom/client'
-require "intercom/contact"
-require "intercom/count"
-require "intercom/customer"
-require "intercom/user"
-require "intercom/company"
-require "intercom/note"
-require "intercom/job"
-require "intercom/tag"
-require "intercom/segment"
-require "intercom/event"
-require "intercom/conversation"
-require "intercom/message"
-require "intercom/admin"
-require "intercom/request"
-require "intercom/subscription"
-require "intercom/team"
-require "intercom/errors"
-require "intercom/visitor"
-require "json"
+require 'intercom/contact'
+require 'intercom/user'
+require 'intercom/lead'
+require 'intercom/count'
+require 'intercom/collection'
+require 'intercom/company'
+require 'intercom/service/data_attribute'
+require 'intercom/note'
+require 'intercom/job'
+require 'intercom/tag'
+require 'intercom/segment'
+require 'intercom/section'
+require 'intercom/event'
+require 'intercom/conversation'
+require 'intercom/message'
+require 'intercom/admin'
+require 'intercom/article'
+require 'intercom/request'
+require 'intercom/subscription'
+require 'intercom/team'
+require 'intercom/errors'
+require 'intercom/visitor'
+require 'intercom/data_attribute'
+require 'json'
 
 ##
 # Intercom is a customer relationship management and messaging tool for web app owners