hubspot-api-ruby 0.22.0 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3d97cfc276be3f205c542eb1352380c09bb8d407401b2b61f17a8700cd2a22
-  data.tar.gz: 1de23e65dbaf0db5e7b6021a2581bc29f929d67f79cc4b82c8f692140513c250
+  metadata.gz: a1c4dba7d7f1b326dda694f28411d5f2ee995ff5e81cd1b6ffa5cc74485ecdb0
+  data.tar.gz: 81d1e069ad0cb2a2c4b8146627ef3410cd99ffbe0a3b6135650a807cc16792d4
 SHA512:
-  metadata.gz: 72910346b6c2b93631f6f4f028c299e610a9cd0a4b2cb2aac60d406c0d6cdcb644fbf7569e774ce2a80066bb81607ab125d464b058c235f7e70e1625471eb98c
-  data.tar.gz: 4003f625b0a6cdc5a446cd8422d41e23acb042d11e90b229e38bfd7e7188344cd0c72e11cf76f62fd99ed8ebb3aebf2743168e099cc0822e2923ea9ae3b88485
+  metadata.gz: 50e8e0acc2ba97a6fc0c967b5885f185f4fdf3062d81d06e75e2b2434fc0236b256b011b0ccca42a541232d934d7cec41d67ca0e8aa109c86f786854a2ffebf4
+  data.tar.gz: 0470bc959124fae32c3b7629ee517b47795f551668c437ef0158d05bef0ce2bd9e76b489d89b0ffd09bb6f77c1fd4c42d45e764d39e56386d84a28ae814e9681

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.2"
   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
@@ -105,6 +106,14 @@ class Hubspot::Contact < Hubspot::Resource
     end
   end
 
+  def [](name)
+    return @changes[name] if changes.key? name
+
+    name_property = @properties[name]
+
+    name_property.is_a?(Hash) ? name_property['value'] : name_property
+  end
+
   def name
     [firstname, lastname].compact.join(' ')
   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)
@@ -227,11 +230,11 @@ module Hubspot
       singleton_class.instance_eval do
         keys.each do |k|
           # Define a getter
-          define_method(k) { @changes[k.to_sym] || @properties.dig(k, 'value') }
+          define_method(k) { self[k] }
 
           # Define a setter
           define_method("#{k}=") do |v|
-            @changes[k.to_sym] = v
+            @changes[k] = v
           end
         end
       end
@@ -244,9 +247,9 @@ module Hubspot
         add_accessors([attr])
 
         # Call the new setter
-        return send(method_name, arguments[0])
+        send(method_name, arguments[0])
       elsif @properties.key?(method_name)
-        return @properties[method_name]['value']
+        self[method_name]
       else
         super
       end

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.2
 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