ruby_hubspot_api 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f455ed36bd0ae0284959198213bea7924099b97fc0b43b4ac50b4ad21a73def2
-  data.tar.gz: 9ba207fcf4fdf8c14889d130a0cdd3284ff75816873d994084d80b410e8306e1
+  metadata.gz: 52c9ee03d417a29792dbd370399982a03662cb621c0ab3e5ec0a2abd7de89ac5
+  data.tar.gz: aae2926993d4b6dcf78b8e728c031631225f667c882f0b6d0710601ff62c0772
 SHA512:
-  metadata.gz: 0d4274f0519d4fe99a09f06405689a3b45145a6890b4c5a1052e7e6e38bf91ae4ce9d96669d8bb97a5acd7e92110a0eeac4c73e7e0e6ea3b93fd1393f2f4c648
-  data.tar.gz: 42829d5342d0dbd126b9200b609c662518dce48e55a82a6e3f6536ee4ed7bdf1c9af14007114e1f883ca036df53cc49522d239d803e5bdfceb525170a18adbac
+  metadata.gz: 6d2c9d82565c619a189bfc0780c914bb1b10cf769eb94b66e1e702fa5268fedadf7e3b9a188f6a1b0caa67c1b2d432e8f6401ffb890ca01efc768abc16ae3d3a
+  data.tar.gz: e66a9d5daa8373529a3a2ee07c474d288d94327fc40d83ed08e050e1dbb83c8f89217c95083035396f212ed78b97348f1a9437889d2719cd9dbf49d4624cbce3

data/.rubocop.yml

@@ -1,6 +1,19 @@
-# .rubocop.yml
+Documentation:
+    Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+  Exclude:
+    - spec/**/*.rb
+
+# Metrics/MethodLength:
+#   Max: 20
+
+# Metrics/ClassLength:
+#   Max: 200
 
-# Ignore Metrics/BlockLength for the spec directory
 Metrics/BlockLength:
-  Exclude: 
-    - spec/**/*.rb
+  #   Max: 50
+  # Ignore Metrics/BlockLength for the spec directory
+  Exclude:
+    - spec/**/*.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_hubspot_api (0.2)
+    ruby_hubspot_api (0.2.2)
       httparty (>= 0.1, < 1.0)
 
 GEM
@@ -9,35 +9,33 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.0.2)
     byebug (11.1.3)
-    codecov (0.2.12)
-      json
-      simplecov
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
     crack (1.0.0)
       bigdecimal
       rexml
     diff-lcs (1.5.1)
-    docile (1.4.1)
+    docile (1.3.5)
     dotenv (2.8.1)
     hashdiff (1.1.1)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.7.2)
     method_source (1.1.0)
     mini_mime (1.1.2)
     multi_xml (0.6.0)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     public_suffix (4.0.7)
     rake (13.2.1)
-    rexml (3.3.7)
+    rexml (3.2.5)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -51,15 +49,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    simplecov (0.22.0)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.4)
     vcr (6.0.0)
-    webmock (3.23.1)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -84,4 +80,4 @@ DEPENDENCIES
   webmock (>= 3.0)
 
 BUNDLED WITH
-   2.3.27
+   2.2.34

data/lib/hubspot/api_client.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# HubSpot API Client
+# Handles all HTTP interactions with the HubSpot API.
+# It manages GET, POST, PATCH, and DELETE requests.
 module Hubspot
   # All interations with the Hubspot API happen here...
   class ApiClient
@@ -57,10 +60,14 @@ module Hubspot
 
       def log_request(http_method, url, response, start_time, extra = nil)
         d = Time.now - start_time
-        Hubspot.logger.info("#{http_method.to_s.upcase} #{url} took #{d.round(2)}s with status #{response.code}")
+
+        Hubspot.logger.info(
+          "#{http_method.to_s.upcase} #{url} took #{d.round(2)}s with status #{response.code}"
+        )
+
         return unless Hubspot.logger.debug?
 
-        Hubspot.logger.debug("Request body: #{extra}") if extra
+        Hubspot.logger.debug("Request body: #{extra[:body]}") if extra
         Hubspot.logger.debug("Response body: #{response.body}")
       end
 
@@ -91,7 +98,7 @@ module Hubspot
 
       def retry_request(request, retries)
         # Re-issues the original request using the retry logic
-        http_method = request.http_method::METHOD.downcase # Use the METHOD constant to get the method string
+        http_method = request.http_method::METHOD.downcase
         response = HTTParty.send(http_method, request.uri, request.options)
         handle_response(response, retries)
       end

data/lib/hubspot/batch.rb

@@ -31,8 +31,24 @@ module Hubspot
     CONTACT_LIMIT = 10
     DEFAULT_LIMIT = 100
 
+    def inspect
+      "#<#{self.class.name} " \
+      "@resource_count=#{@resources.size}, " \
+      "@id_property=#{@id_property.inspect}, " \
+      "@resource_type=#{@resources.first&.resource_name}, " \
+      "@responses_count=#{@responses.size}>"
+    end
+
     # rubocop:disable Lint/MissingSuper
-    def initialize(resources = [], id_property: 'id')
+    def initialize(resources = [], id_property: 'id', resource_matcher: nil)
+      if resource_matcher
+        unless resource_matcher.is_a?(Proc) && resource_matcher.arity == 2
+          raise ArgumentError, 'resource_matcher must be a proc that accepts exactly 2 arguments'
+        end
+
+        @resource_matcher = resource_matcher
+      end
+
       @resources = []
       @id_property = id_property # Set id_property for the batch (default: 'id')
       @responses = []            # Store multiple BatchResponse objects here
@@ -122,9 +138,12 @@ module Hubspot
         next if resource.changes.empty?
 
         {
-          id: resource.public_send(@id_property),   # Dynamically get the ID based on the batch's id_property
-          idProperty: determine_id_property,        # Use the helper method to decide whether to include idProperty
-          properties: resource.changes              # Gather the changes for the resource
+          # Dynamically get the ID based on the batch's id_property
+          id: resource.public_send(@id_property),
+          # Use the helper method to decide whether to include idProperty
+          idProperty: determine_id_property,
+          # Gather the changes for the resource
+          properties: resource.changes
         }.compact   # Removes nil keys
       end.compact   # Removes nil entries
     end
@@ -146,7 +165,8 @@ module Hubspot
 
     # Perform batch request based on the provided action (upsert, update, create, or archive)
     def batch_request(type, inputs, action)
-      response = self.class.post("/crm/v3/objects/#{type}/batch/#{action}", body: { inputs: inputs }.to_json)
+      response = self.class.post("/crm/v3/objects/#{type}/batch/#{action}",
+                                 body: { inputs: inputs }.to_json)
       BatchResponse.new(response.code, handle_response(response))
     end
 
@@ -157,7 +177,8 @@ module Hubspot
       # check if there are any resources without a value from the id_property
       return unless @resources.any? { |resource| resource.public_send(id_property).blank? }
 
-      raise ArgumentError, "All resources must have a non-blank value for #{@id_property} to perform upsert"
+      raise ArgumentError,
+            "All resources must have a non-blank value for #{@id_property} to perform upsert"
     end
 
     # Return the appropriate batch size limit for the resource type
@@ -167,6 +188,8 @@ module Hubspot
 
     # Process responses from the batch API call
     def process_responses
+      # TODO: issue a warning if the id_property is email and the action is upsert*
+      # people may have more than one email address abd Hubspot views that as one record
       @responses.each do |response|
         next unless response['results']
 
@@ -192,36 +215,56 @@ module Hubspot
     end
 
     def find_resource_from_result(result)
-      case @action
-      when 'update', 'upsert'
-        find_resource_from_id(result['id'].to_i)
-
-      #
-      # when specifying idProperty in the upsert request
-      # the Hubspot API returns the id value (aka the hs_object_id)
-      # instead of the value of the <idProperty> field, so the value of the field
-      # is only stored in results['properties'][@id_property] if it changed!
-      # so this condition is redundant but left here in case Hubspot updates the response
-      #
-      # when 'upsert'
-      #   resource_id = result.dig('properties', @id_property) || result['id']
-      #   find_resource_from_id_property(resource_id)
-      #
-      when 'create'
-        # For create, check if the resource's changes are entirely contained in the result's properties
-        @resources.reject(&:persisted?).find do |resource|
-          resource.changes.any? && resource.changes.all? { |key, value| result['properties'][key.to_s] == value }
-        end
+      action_method = method_for_action
+      send(action_method, result) if action_method
+    end
+
+    def method_for_action
+      {
+        'create' => :find_resource_for_created_result,
+        'update' => :find_resource_from_updated_result,
+        'upsert' => :find_resource_from_upserted_result
+      }[@action]
+    end
+
+    def find_resource_for_created_result(result)
+      properties = result['properties']
+
+      @resources.reject(&:persisted?).find do |resource|
+        next unless resource.changes.any?
+
+        resource.changes.all? { |key, value| properties[key.to_s] == value }
       end
     end
 
+    def find_resource_from_updated_result(result)
+      resource_id = id_property == 'id' ? result['id'].to_i : result.dig('properties', id_property)
+      find_resource_from_id(resource_id)
+    end
+
     def find_resource_from_id(resource_id)
-      @resources.find { |r| r.id == resource_id }
+      return find_resource_from_id_property(resource_id) unless @id_property == 'id'
+
+      @resources.find { |resource| resource.id == resource_id }
     end
 
-    # def find_resource_from_id_property(resource_id)
-    #   @resources.find { |r| r.public_send(@id_property) == resource_id }
-    # end
+    def find_resource_from_id_property(resource_id)
+      @resources.find do |resource|
+        resource.respond_to?(@id_property) && resource.public_send(@id_property) == resource_id
+      end
+    end
+
+    def find_resource_from_upserted_result(result)
+      # if this was inserted then match on all the fields
+      return find_resource_for_created_result(result['properties']) if result['new']
+
+      # call the custom resource matcher if specified
+      if @resource_matcher
+        @resources.find { |resource| @resource_matcher.call(resource, result) }
+      else
+        find_resource_from_updated_result(result)
+      end
+    end
 
     def update_resource_properties(resource, properties)
       properties.each do |key, value|
@@ -238,7 +281,9 @@ module Hubspot
 
     class << self
       def read(object_class, object_ids = [], id_property: 'id')
-        raise ArgumentError, 'Must be a valid Hubspot resource class' unless object_class < Hubspot::Resource
+        unless object_class < Hubspot::Resource
+          raise ArgumentError, 'Must be a valid Hubspot resource class'
+        end
 
         # fetch all the matching resources with paging handled
         resources = object_class.batch_read(object_ids, id_property: id_property).all

data/lib/hubspot/config.rb

@@ -15,6 +15,11 @@ module Hubspot
       apply_log_level
     end
 
+    # Apply the log level to the logger
+    def apply_log_level
+      @logger.level = @log_level
+    end
+
     private
 
     # Initialize the default logger
@@ -43,11 +48,6 @@ module Hubspot
     end
     # rubocop:enable Metrics/MethodLength
 
-    # Apply the log level to the logger
-    def apply_log_level
-      @logger.level = @log_level
-    end
-
     # Set the default log level based on environment
     def default_log_level
       if defined?(Rails) && Rails.env.test?

data/lib/hubspot/form.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hubspot
+  class Form < Resource
+    METADATA_FIELDS = %w[createdAt updatedAt archived].freeze
+
+    def inspect
+      "#<#{self.class.name} " \
+      "@name=#{name}, " \
+      "@fieldGroups=#{respond_to?('fieldGroups') ? fieldGroups.size : '-'}>"
+    end
+
+    class << self
+      def api_root
+        '/marketing/v3'
+      end
+    end
+
+    private
+
+    # Extract ID from data and leave as a string
+    def extract_id(data)
+      data.delete('id')
+    end
+  end
+end

data/lib/hubspot/paged_batch.rb

@@ -10,6 +10,15 @@ module Hubspot
 
     MAX_LIMIT = 100 # HubSpot max items per page
 
+    # customised inspect
+    def inspect
+      "#<#{self.class.name} " \
+      "@url=#{@url.inspect}, " \
+      "@params=#{@params.inspect}, " \
+      "@resource_class=#{@resource_class.inspect}, " \
+      "@object_ids_count=#{@object_ids.size}>"
+    end
+
     # rubocop:disable Lint/MissingSuper
     def initialize(url:, params: {}, resource_class: nil, object_ids: [])
       @url = url
@@ -22,8 +31,7 @@ module Hubspot
     def each_page
       @object_ids.each_slice(MAX_LIMIT) do |ids|
         response = fetch_page(ids)
-        results = response['results'] || []
-        mapped_results = @resource_class ? results.map { |result| @resource_class.new(result) } : results
+        mapped_results = process_results(response)
         yield mapped_results unless mapped_results.empty?
       end
     end
@@ -45,12 +53,19 @@ module Hubspot
     private
 
     def fetch_page(object_ids)
-      params_with_ids = @params.dup
+      params_with_ids = @params.dup || {}
       params_with_ids[:inputs] = object_ids.map { |id| { id: id } }
 
       response = self.class.post(@url, body: params_with_ids.to_json)
 
       handle_response(response)
     end
+
+    def process_results(response)
+      results = response['results'] || []
+      return results unless @resource_class
+
+      results.map { |result| @resource_class.new(result) }
+    end
   end
 end

data/lib/hubspot/paged_collection.rb

@@ -10,21 +10,18 @@ module Hubspot
 
     MAX_LIMIT = 100 # HubSpot max items per page
 
-    # rubocop:disable Lint/MissingSuper
     def initialize(url:, params: {}, resource_class: nil, method: :get)
       @url = url
       @params = params
       @resource_class = resource_class
       @method = method.to_sym
     end
-    # rubocop:enable Lint/MissingSuper
 
     def each_page
       offset = nil
       loop do
         response = fetch_page(offset)
-        results = response['results'] || []
-        mapped_results = @resource_class ? results.map { |result| @resource_class.new(result) } : results
+        mapped_results = process_results(response)
         yield mapped_results unless mapped_results.empty?
         offset = response.dig('paging', 'next', 'after')
         break unless offset
@@ -83,5 +80,12 @@ module Hubspot
         self.class.send(@method, @url, body: params.to_json)
       end
     end
+
+    def process_results(response)
+      results = response['results'] || []
+      return results unless @resource_class
+
+      results.map { |result| @resource_class.new(result) }
+    end
   end
 end

data/lib/hubspot/resource.rb

@@ -8,13 +8,14 @@ module Hubspot
   # rubocop:disable Metrics/ClassLength
 
   # HubSpot Resource Base Class
-  # This class provides common functionality for interacting with HubSpot API resources such as Contacts, Companies, etc
+  # This class provides common functionality for interacting with
+  # HubSpot API resources such as Contacts, Companies, etc
   #
-  # It supports common operations like finding, creating, updating, and deleting resources, as well as batch operations.
+  # It supports common operations like finding, creating, updating,
+  # and deleting resources, as well as batch operations.
   #
-  # This class is meant to be inherited by specific resources like `Hubspot::Contact`.
-  #
-  # You can access the properties of a resource instance by calling the property name as method
+  # This class is meant to be inherited by specific resources
+  # like `Hubspot::Contact`.
   #
   # Example Usage:
   #   Hubspot::Contact.find(1)
@@ -49,8 +50,12 @@ module Hubspot
       #   contact = Hubspot::Contact.find(1)
       #
       # Returns An instance of the resource.
-      def find(id)
-        response = get("/crm/v3/objects/#{resource_name}/#{id}")
+      def find(id, properties = nil)
+        all_properties = build_property_list(properties)
+        if all_properties.is_a?(Array) && !all_properties.empty?
+          params = { query: { properties: all_properties } }
+        end
+        response = get("#{api_root}/#{resource_name}/#{id}", params || {})
         instantiate_from_response(response)
       end
 
@@ -67,8 +72,11 @@ module Hubspot
       # Returns An instance of the resource.
       def find_by(property, value, properties = nil)
         params = { idProperty: property }
-        params[:properties] = properties if properties.is_a?(Array)
-        response = get("/crm/v3/objects/#{resource_name}/#{value}", query: params)
+
+        all_properties = build_property_list(properties)
+        params[:properties] = all_properties unless all_properties.empty?
+
+        response = get("#{api_root}/#{resource_name}/#{value}", query: params)
         instantiate_from_response(response)
       end
 
@@ -81,7 +89,7 @@ module Hubspot
       #
       # Returns [Resource] The newly created resource.
       def create(params)
-        response = post("/crm/v3/objects/#{resource_name}", body: { properties: params }.to_json)
+        response = post("#{api_root}/#{resource_name}", body: { properties: params }.to_json)
         instantiate_from_response(response)
       end
 
@@ -93,10 +101,11 @@ module Hubspot
       # Example:
       #   contact.update(1, name: "Jane Doe")
       #
-      # Returns True if the update was successful, false if not
+      # Returns True if the update was successful
       def update(id, params)
-        response = patch("/crm/v3/objects/#{resource_name}/#{id}", body: { properties: params }.to_json)
-        raise Hubspot.error_from_response(response) unless response.success?
+        response = patch("#{api_root}/#{resource_name}/#{id}",
+                         body: { properties: params }.to_json)
+        handle_response(response)
 
         true
       end
@@ -108,10 +117,10 @@ module Hubspot
       # Example:
       #   Hubspot::Contact.archive(1)
       #
-      # Returns True if the deletion was successful, false if not
+      # Returns True if the deletion was successful
       def archive(id)
-        response = delete("/crm/v3/objects/#{resource_name}/#{id}")
-        raise Hubspot.error_from_response(response) unless response.success?
+        response = delete("#{api_root}/#{resource_name}/#{id}")
+        handle_response(response)
 
         true
       end
@@ -125,8 +134,14 @@ module Hubspot
       #
       # Returns [PagedCollection] A collection of resources.
       def list(params = {})
+        all_properties = build_property_list(params[:properties])
+
+        if all_properties.is_a?(Array) && !all_properties.empty?
+          params[:properties] = all_properties.join(',')
+        end
+
         PagedCollection.new(
-          url: "/crm/v3/objects/#{resource_name}",
+          url: list_page_uri,
           params: params,
           resource_class: self
         )
@@ -142,13 +157,15 @@ module Hubspot
       # Example:
       #   Hubspot::Contact.batch_read([1, 2, 3])
       #
-      # Returns [PagedBatch] A paged batch of resources (call .each_page to cycle through pages from the API)
-      def batch_read(object_ids = [], id_property: 'id')
-        params = id_property == 'id' ? {} : { idProperty: id_property }
+      # Returns [PagedBatch] A paged batch of resources
+      def batch_read(object_ids = [], properties: [], id_property: 'id')
+        params = {}
+        params[:idProperty] = id_property unless id_property == 'id'
+        params[:properties] = properties unless properties.blank?
 
         PagedBatch.new(
-          url: "/crm/v3/objects/#{resource_name}/batch/read",
-          params: params,
+          url: "#{api_root}/#{resource_name}/batch/read",
+          params: params.empty? ? nil : params,
           object_ids: object_ids,
           resource_class: self
         )
@@ -161,7 +178,7 @@ module Hubspot
       # id_property - The property to use for identifying resources (default: 'id').
       #
       # Example:
-      #   Hubspot::Contact.batch_read([1, 2, 3])
+      #   Hubspot::Contact.batch_read_all(hubspot_contact_ids)
       #
       # Returns [Hubspot::Batch] A batch of resources that can be operated on further
       def batch_read_all(object_ids = [], id_property: 'id')
@@ -203,9 +220,11 @@ module Hubspot
       #
       # Example:
       #   property = Hubspot::Contact.property('industry_sector')
-      #   values_for_select = property.options.each_with_object({}) { |prop, ps| ps[prop['value']] = prop['label'] }
+      #   values_for_select = property.options.each_with_object({}) do |prop, hash|
+      #     hash[prop['value']] = prop['label']
+      #   end
       #
-      # Returns [Array<Hubspot::Property>] An array of hubspot properties
+      # Returns [Hubspot::Property] A hubspot property
       def property(property_name)
         properties.detect { |prop| prop.name == property_name }
       end
@@ -225,8 +244,10 @@ module Hubspot
 
       # Search for resources using a flexible query format and optional properties.
       #
-      # This method allows searching for resources by passing a query in the form of a string (for full-text search)
-      # or a hash with special suffixes on the keys to define different comparison operators.
+      # This method allows searching for resources by passing a query in the form of a string
+      # (for full-text search) or a hash with special suffixes on the keys to
+      # define different comparison operators.
+      #
       # You can also specify which properties to return and the number of results per page.
       #
       # Available suffixes for query keys (when using a hash):
@@ -244,14 +265,15 @@ module Hubspot
       #   - A String: for full-text search.
       #   - A Hash: where each key represents a property and may have suffixes for the comparison
       #     (e.g., `{ email_contains: 'example.org', age_gt: 30 }`).
-      # properties - An optional array of property names to return in the search results. [Array<String>]
+      # properties - An optional array of property names to return in the search results.
       #   If not specified or empty, HubSpot will return the default set of properties.
-      # page_size - The number of results to return per page (default is 10 for contacts and 100 for everything else).
+      # page_size - The number of results to return per page
+      #   (default is 10 for contacts and 100 for everything else).
       #
       # Example Usage:
       #   # Full-text search for 'example.org':
-      #   contacts = Hubspot::Contact.search(query: "example.org",
-      #                                      properties: ["email", "firstname", "lastname"], page_size: 50)
+      #   props = %w[email firstname lastname]
+      #   contacts = Hubspot::Contact.search(query: "example.org", properties: props, page_size: 50)
       #
       #   # Search for contacts whose email contains 'example.org' and are older than 30:
       #   contacts = Hubspot::Contact.search(
@@ -282,7 +304,7 @@ module Hubspot
 
         # Perform the search and return a PagedCollection
         PagedCollection.new(
-          url: "/crm/v3/objects/#{resource_name}/search",
+          url: "#{api_root}/#{resource_name}/search",
           params: search_body,
           resource_class: self,
           method: :post
@@ -291,6 +313,10 @@ module Hubspot
 
       # rubocop:enable Metrics/MethodLength
 
+      # The root of the api call. Mostly this will be "crm"
+      # but you can override this to account for a different
+      # object hierarchy
+
       # Define the resource name based on the class
       def resource_name
         name = self.name.split('::').last.downcase
@@ -301,8 +327,22 @@ module Hubspot
         end
       end
 
+      # List of properties that will always be retrieved
+      # should be overridden in specific resource class
+      def required_properties
+        []
+      end
+
       private
 
+      def api_root
+        '/crm/v3/objects'
+      end
+
+      def list_page_uri
+        "#{api_root}/#{resource_name}"
+      end
+
       # Instantiate a single resource object from the response
       def instantiate_from_response(response)
         data = handle_response(response)
@@ -337,9 +377,18 @@ module Hubspot
         # Default to 'EQ' operator if no suffix is found
         { propertyName: key.to_s, operator: 'EQ' }
       end
+
+      # Internal make a list of properties to request from the API
+      # will be merged with any required_properties defined on the class
+      def build_property_list(properties)
+        properties = [] unless properties.is_a?(Array)
+        raise 'Must be an array' unless required_properties.is_a?(Array)
+
+        properties.concat(required_properties).uniq
+      end
     end
 
-    # rubocop:disable Ling/MissingSuper
+    # rubocop:disable Lint/MissingSuper
 
     # Public: Initialize a resouce
     #
@@ -350,13 +399,14 @@ module Hubspot
     #     of the object against your own data
     #
     # Example:
-    #   contact = Hubspot::Contact.new(firstname: 'Luke', lastname: 'Skywalker', email: 'luke@jedi.org')
+    #   attrs = { firstname: 'Luke', lastname: 'Skywalker', email: 'luke@jedi.org' }
+    #   contact = Hubspot::Contact.new(attrs)
     #   contact.persisted? # false
     #   contact.save # creates the record in Hubspot
     #   contact.persisted? # true
     #   puts "Contact saved with hubspot id #{contact.id}"
     #
-    #   existing_contact = Hubspot::Contact.new(id: hubspot_id, properties: contact.to_hubspot_properties)
+    #   existing_contact = Hubspot::Contact.new(id: hubspot_id, properties: contact.to_hubspot)
     def initialize(data = {})
       data.transform_keys!(&:to_s)
       @id = extract_id(data)
@@ -368,8 +418,7 @@ module Hubspot
         initialize_new_object(data)
       end
     end
-
-    # rubocop:enable Ling/MissingSuper
+    # rubocop:enable Lint/MissingSuper
 
     # Determine the state of the object
     #
@@ -405,25 +454,44 @@ module Hubspot
       @id ? true : false
     end
 
-    # Update the resource
+    # Public - Update the resource and persist to the api
     #
-    # params - hash of properties to update in key value pairs
+    # attributes - hash of properties to update in key value pairs
     #
     # Example:
     #   contact = Hubspot::Contact.find(hubspot_contact_id)
     #   contact.update(status: 'gold customer', last_contacted_at: Time.now.utc.iso8601)
     #
     # Returns Boolean
-    def update(params)
+    def update(attributes)
       raise 'Not able to update as not persisted' unless persisted?
 
-      params.each do |key, value|
-        send("#{key}=", value) # This will trigger the @changes tracking via method_missing
-      end
+      update_attributes(attributes)
 
       save
     end
 
+    # Public - Update resource attributes
+    #
+    # Does not persist to the api but processes each attribute correctly
+    #
+    # Example:
+    #   contact = Hubspot::Contact.find(hubspot_contact_id)
+    #   contact.changes? # false
+    #   contact.update_attributes(education: 'Graduate', university: 'Life')
+    #   contact.education # Graduate
+    #   contact.changes? # true
+    #   contact.changes # { "education" => "Graduate", "university" => "Life" }
+    #
+    # Returns Hash of changes
+    def update_attributes(attributes)
+      raise ArgumentError, 'must be a hash' unless attributes.is_a?(Hash)
+
+      attributes.each do |key, value|
+        send("#{key}=", value) # This will trigger the @changes tracking via method_missing
+      end
+    end
+
     # Archive the object in Hubspot
     #
     # Example:
@@ -488,9 +556,17 @@ module Hubspot
 
     # Initialize from API response, separating metadata from properties
     def initialize_from_api(data)
-      @metadata = extract_metadata(data)
-      properties_data = data['properties'] || {}
+      if data['properties']
+        @metadata = data.reject { |key, _v| key == 'properties' }
+        handle_properties(data['properties'])
+      else
+        handle_properties(data)
+      end
 
+      @changes = {}
+    end
+
+    def handle_properties(properties_data)
       properties_data.each do |key, value|
         if METADATA_FIELDS.include?(key)
           @metadata[key] = value
@@ -498,8 +574,6 @@ module Hubspot
           @properties[key] = value
         end
       end
-
-      @changes = {}
     end
 
     # Initialize a new object (no API response)

data/lib/hubspot/user.rb

@@ -1,8 +1,32 @@
 # frozen_string_literal: true
 
 module Hubspot
+  # ORM for hubspot users
+  #
+  # Hubspot users consist mostly of read_only attributes (you can add custom properties).
+  # As such we extend this class to ensure that we retrieve useful data back from the API
+  # and provide helper methods to resolve hubspot fields e.g. user.email calls user.hs_email etc
   class User < Resource
+    class << self
+      def required_properties
+        %w[hs_email hs_given_name hs_family_name]
+      end
+    end
+
+    def first_name
+      hs_given_name
+    end
+    alias firstname first_name
+
+    def last_name
+      hs_family_name
+    end
+    alias lastname last_name
+
+    def email
+      hs_email
+    end
   end
 
-  Owner = User  
+  Owner = User
 end

data/lib/hubspot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hubspot
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/hubspot.rb

@@ -20,6 +20,7 @@ module Hubspot
       yield(config) if block_given?
       set_client_headers if config.access_token
       set_request_timeouts
+      config.apply_log_level
     end
 
     def configured?

data/lib/ruby_hubspot_api.rb

@@ -12,13 +12,18 @@ require_relative 'hubspot/config'
 require_relative 'hubspot/exceptions'
 require_relative 'hubspot/api_client'
 
-# load base class then modules
+# load base class then models
 require_relative 'hubspot/resource'
 require_relative 'hubspot/property'
+
+# load CRM models
 require_relative 'hubspot/contact'
 require_relative 'hubspot/company'
 require_relative 'hubspot/user'
 
+# load marketing models
+require_relative 'hubspot/form'
+
 # Load other components
 require_relative 'hubspot/batch'
 require_relative 'hubspot/paged_collection'

data/lib/support/patches.rb

@@ -9,3 +9,30 @@ class Object
     end
   end
 end
+
+# At some point this will seem like a bad idea ;)
+
+# :nocov:
+if RUBY_VERSION < '2.5.0'
+  class Hash
+    # Non-mutating version (returns a new hash with transformed keys)
+    def transform_keys
+      return enum_for(:transform_keys) unless block_given?
+      result = {}
+      each_key do |key|
+        result[yield(key)] = self[key]
+      end
+      result
+    end
+
+    # Mutating version (modifies the hash in place)
+    def transform_keys!
+      return enum_for(:transform_keys!) unless block_given?
+      keys.each do |key|
+        self[yield(key)] = delete(key)
+      end
+      self
+    end
+  end
+end
+# :nocov:end

data/ruby_hubspot_api.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/sensadrome/ruby_hubspot_api'
   spec.license = 'MIT'
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.4'
 
   # Prevent pushing this gem to RubyGems.org.
   # To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_hubspot_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Simon Brook
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -223,6 +223,7 @@ files:
 - lib/hubspot/config.rb
 - lib/hubspot/contact.rb
 - lib/hubspot/exceptions.rb
+- lib/hubspot/form.rb
 - lib/hubspot/paged_batch.rb
 - lib/hubspot/paged_collection.rb
 - lib/hubspot/property.rb
@@ -246,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="