hubspot-api-ruby 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3d97cfc276be3f205c542eb1352380c09bb8d407401b2b61f17a8700cd2a22
-  data.tar.gz: 1de23e65dbaf0db5e7b6021a2581bc29f929d67f79cc4b82c8f692140513c250
+  metadata.gz: 660784a9172dc42af4abe066bad9f2a5297fe8d7b4fe3e6f9fed5617d583fcaa
+  data.tar.gz: 1d6d7072a0c0ce71b9dcdba3155572be2f9e5b12b6e3a3fd0bb002acad0836a1
 SHA512:
-  metadata.gz: 72910346b6c2b93631f6f4f028c299e610a9cd0a4b2cb2aac60d406c0d6cdcb644fbf7569e774ce2a80066bb81607ab125d464b058c235f7e70e1625471eb98c
-  data.tar.gz: 4003f625b0a6cdc5a446cd8422d41e23acb042d11e90b229e38bfd7e7188344cd0c72e11cf76f62fd99ed8ebb3aebf2743168e099cc0822e2923ea9ae3b88485
+  metadata.gz: bf383fe3b8dc2cad6e64774874b90163c28cce2c8007bf7dfc850169ae31eda46615416716b9f4299decaa49b5d4309e3d52f3f60498085e3fb073db9376806f
+  data.tar.gz: 3870a04cb0535f399f8e29b1aeb2d95b65aa58cdee7c00b36ec502589099445de94c7a70d88725f0c3d9b10a934ab6ec95587d352d2af4b05a5dcbe32932b9cd

data/hubspot-api-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "hubspot-api-ruby"
-  s.version = "0.22.0"
+  s.version = "0.22.1"
   s.require_paths = ["lib"]
   s.authors = ["Jonathan"]
   s.email = ["jonathan@hoggo.com"]
@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("byebug")
   s.add_development_dependency("faker")
   s.add_development_dependency("factory_bot")
+  s.add_development_dependency("irb")
 end

data/lib/hubspot/contact.rb

@@ -17,12 +17,13 @@ class Hubspot::Contact < Hubspot::Resource
   class << self
     def all(opts = {})
       Hubspot::PagedCollection.new(opts) do |options, after, limit|
-        response = Hubspot::Connection.get_json(
-          ALL_PATH,
-          options.merge('limit' => limit, 'offset' => after, 'offset_param' => 'after')
-        )
+        request_options = options.merge(limit:)
+        request_options[:after] = after if after.present?
+        response = Hubspot::Connection.get_json(ALL_PATH, request_options)
 
-        contacts = response['results'].map { |result| from_result(result) }
+        contacts = response['results'].map do |result| 
+          from_result result, id_field: Hubspot::Resource.id_field 
+        end
         after = response.dig('paging', 'next', 'after')
         [contacts, after, after.present?]
       end

data/lib/hubspot/resource.rb

@@ -9,7 +9,7 @@ module Hubspot
     self.update_method = "put"
 
     class << self
-      def from_result(result)
+      def from_result(result, id_field: self.id_field)
         resource = new(result[id_field])
         resource.send(:initialize_from, result.with_indifferent_access)
         resource
@@ -55,9 +55,12 @@ module Hubspot
       @changes = HashWithIndifferentAccess.new
       @properties = HashWithIndifferentAccess.new
 
-      if id_or_properties.is_a?(Integer) || id_or_properties.nil?
+      case id_or_properties
+      when Integer, NilClass
         @id = id_or_properties
-      elsif id_or_properties.is_a?(Hash)
+      when String
+        @id = Integer id_or_properties
+      when Hash
         @id = id_or_properties.delete(id_field) || id_or_properties.delete(:id)
 
         add_accessors(id_or_properties.keys)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Jonathan
@@ -247,6 +247,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: hubspot-api-ruby is a wrapper for the HubSpot REST API
 email:
 - jonathan@hoggo.com