diff --git a/lib/intercom.rb b/lib/intercom.rb index 264ec92a..ac89b7d5 100644 --- a/lib/intercom.rb +++ b/lib/intercom.rb @@ -29,7 +29,6 @@ require "intercom/admin" require "intercom/request" require "intercom/subscription" -require "intercom/utils" require "intercom/errors" require "intercom/visitor" require "json" diff --git a/lib/intercom/api_operations/bulk/submit.rb b/lib/intercom/api_operations/bulk/submit.rb index 2fb68710..7336e2ec 100644 --- a/lib/intercom/api_operations/bulk/submit.rb +++ b/lib/intercom/api_operations/bulk/submit.rb @@ -1,3 +1,5 @@ +require 'intercom/utils' + module Intercom module ApiOperations module Bulk diff --git a/lib/intercom/api_operations/delete.rb b/lib/intercom/api_operations/delete.rb index 864eb552..dbb466be 100644 --- a/lib/intercom/api_operations/delete.rb +++ b/lib/intercom/api_operations/delete.rb @@ -1,4 +1,4 @@ -require 'intercom/traits/api_resource' +require 'intercom/utils' module Intercom module ApiOperations diff --git a/lib/intercom/api_operations/find.rb b/lib/intercom/api_operations/find.rb index 361a9d57..9744062b 100644 --- a/lib/intercom/api_operations/find.rb +++ b/lib/intercom/api_operations/find.rb @@ -1,3 +1,5 @@ +require 'intercom/utils' + module Intercom module ApiOperations module Find diff --git a/lib/intercom/api_operations/find_all.rb b/lib/intercom/api_operations/find_all.rb index cdbac043..6f06f3b0 100644 --- a/lib/intercom/api_operations/find_all.rb +++ b/lib/intercom/api_operations/find_all.rb @@ -1,4 +1,5 @@ require 'intercom/client_collection_proxy' +require 'intercom/utils' module Intercom module ApiOperations diff --git a/lib/intercom/api_operations/list.rb b/lib/intercom/api_operations/list.rb index 27833453..c11fb19b 100644 --- a/lib/intercom/api_operations/list.rb +++ b/lib/intercom/api_operations/list.rb @@ -1,4 +1,5 @@ require 'intercom/client_collection_proxy' +require 'intercom/utils' module Intercom module ApiOperations diff --git a/lib/intercom/api_operations/load.rb b/lib/intercom/api_operations/load.rb index 58bfdc83..6d25a152 100644 --- a/lib/intercom/api_operations/load.rb +++ b/lib/intercom/api_operations/load.rb @@ -1,3 +1,5 @@ +require 'intercom/utils' + module Intercom module ApiOperations module Load diff --git a/lib/intercom/api_operations/save.rb b/lib/intercom/api_operations/save.rb index 126582c8..f90a9a7c 100644 --- a/lib/intercom/api_operations/save.rb +++ b/lib/intercom/api_operations/save.rb @@ -1,4 +1,5 @@ -require 'intercom/traits/api_resource' +require 'intercom/utils' +require 'ext/sliceable_hash' module Intercom module ApiOperations diff --git a/lib/intercom/api_operations/scroll.rb b/lib/intercom/api_operations/scroll.rb index d66407c5..c3204d17 100644 --- a/lib/intercom/api_operations/scroll.rb +++ b/lib/intercom/api_operations/scroll.rb @@ -1,4 +1,5 @@ require 'intercom/scroll_collection_proxy' +require 'intercom/utils' module Intercom module ApiOperations @@ -13,4 +14,4 @@ def scroll() end end -end \ No newline at end of file +end diff --git a/lib/intercom/client_collection_proxy.rb b/lib/intercom/client_collection_proxy.rb index fe261741..dc2bcc44 100644 --- a/lib/intercom/client_collection_proxy.rb +++ b/lib/intercom/client_collection_proxy.rb @@ -1,5 +1,4 @@ require "intercom/utils" -require "ext/sliceable_hash" module Intercom class ClientCollectionProxy diff --git a/lib/intercom/extended_api_operations/segments.rb b/lib/intercom/extended_api_operations/segments.rb index 5fc2eacc..a1bee733 100644 --- a/lib/intercom/extended_api_operations/segments.rb +++ b/lib/intercom/extended_api_operations/segments.rb @@ -1,5 +1,5 @@ -require 'intercom/traits/api_resource' require 'intercom/client_collection_proxy' +require 'intercom/utils' module Intercom module ExtendedApiOperations diff --git a/lib/intercom/extended_api_operations/tags.rb b/lib/intercom/extended_api_operations/tags.rb index cecc6e7e..2e9b9e41 100644 --- a/lib/intercom/extended_api_operations/tags.rb +++ b/lib/intercom/extended_api_operations/tags.rb @@ -1,5 +1,5 @@ -require 'intercom/traits/api_resource' require 'intercom/client_collection_proxy' +require 'intercom/utils' module Intercom module ExtendedApiOperations diff --git a/lib/intercom/extended_api_operations/users.rb b/lib/intercom/extended_api_operations/users.rb index 7401dbc4..55756531 100644 --- a/lib/intercom/extended_api_operations/users.rb +++ b/lib/intercom/extended_api_operations/users.rb @@ -1,4 +1,5 @@ -require 'intercom/traits/api_resource' +require 'intercom/client_collection_proxy' +require 'intercom/utils' module Intercom module ExtendedApiOperations diff --git a/lib/intercom/lib/typed_json_deserializer.rb b/lib/intercom/lib/typed_json_deserializer.rb index f4b0b598..f805a5e2 100644 --- a/lib/intercom/lib/typed_json_deserializer.rb +++ b/lib/intercom/lib/typed_json_deserializer.rb @@ -1,6 +1,7 @@ +require 'intercom/utils' + module Intercom module Lib - # Responsibility: To decide whether we are deserializing a collection or an # entity of a particular type and to dispatch deserialization class TypedJsonDeserializer diff --git a/lib/intercom/scroll_collection_proxy.rb b/lib/intercom/scroll_collection_proxy.rb index 8982d3af..0727fe36 100644 --- a/lib/intercom/scroll_collection_proxy.rb +++ b/lib/intercom/scroll_collection_proxy.rb @@ -1,5 +1,4 @@ require "intercom/utils" -require "ext/sliceable_hash" module Intercom class ScrollCollectionProxy @@ -80,4 +79,4 @@ def extract_scroll_param(response_hash) response_hash['scroll_param'] end end -end \ No newline at end of file +end diff --git a/lib/intercom/service/conversation.rb b/lib/intercom/service/conversation.rb index 8c62e41b..31e51486 100644 --- a/lib/intercom/service/conversation.rb +++ b/lib/intercom/service/conversation.rb @@ -3,6 +3,7 @@ require 'intercom/api_operations/find' require 'intercom/api_operations/load' require 'intercom/api_operations/save' +require 'intercom/utils' module Intercom module Service