Merge pull request #287 from Empact/requires-cleanup

Cleanup requires a bit
intercom · Dec 20, 2016 · 6c7e425 · 6c7e425
2 parents 4fb4963 + ffcd022
commit 6c7e425
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+end
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+end
diff --git 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