hubspot-api-client 1.0.1 → 2.0.0

data/lib/hubspot/configuration.rb

@@ -119,7 +119,7 @@ module Hubspot
     def initialize
       @scheme = 'https'
       @host = 'api.hubapi.com'
-      @base_path = '/crm/v3/objects'
+      @base_path = ''
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0

data/lib/hubspot/helpers/get_all_helper.rb

@@ -0,0 +1,27 @@
+module Hubspot
+  module Helpers
+    module GetAllHelper
+      MAX_PAGE_SIZE = 100
+      # List
+      # Read all contacts. Control what is returned via the `properties` query param.
+      # @param [Hash] opts the optional parameters
+      # @option opts [Array<String>] :properties A comma separated list of the properties to be returned in the response. If any of the specified properties are not present on the requested object(s), they will be ignored.
+      # @option opts [Array<String>] :associations A comma separated list of object types to retrieve associated IDs for. If any of the specified associations do not exist, they will be ignored.
+      # @option opts [Boolean] :archived Whether to return only results that have been archived. (default to false)
+      # @return Array
+      def get_all(opts = {})
+        after = nil
+        objects = []
+        loop do
+          page_opts = opts.merge(limit: MAX_PAGE_SIZE, after: after)
+          page = get_page(page_opts)
+          objects.concat(page.results)
+          break objects unless page.paging.present?
+
+          after = page.paging._next.after
+        end
+
+      end
+    end
+  end
+end

data/lib/hubspot/{oauth.rb → oauth_helper.rb}

@@ -1,5 +1,5 @@
 module Hubspot
-  class OAuth
+  class OAuthHelper
     AUTHORIZE_URL = 'https://app.hubspot.com/oauth/authorize'.freeze
     class << self
       def authorize_url(client_id:, redirect_uri:, scope:, optional_scope: [])

data/lib/hubspot/version.rb

@@ -1,3 +1,3 @@
  module Hubspot
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
  end

data/sample-apps/companies-app/Gemfile

@@ -5,7 +5,7 @@ ruby '2.6.3'
 
 gem 'rails', '~> 5.2.3'
 gem 'sqlite3'
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'jbuilder', '~> 2.5'

data/sample-apps/companies-app/Gemfile.lock

@@ -142,8 +142,9 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.1)
-    puma (3.12.1)
-    rack (2.0.7)
+    puma (4.3.1)
+      nio4r (~> 2.0)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -253,7 +254,7 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   pry
   pry-byebug
-  puma (~> 3.11)
+  puma (~> 4.3)
   rails (~> 5.2.3)
   rspec-rails (~> 3.5)
   sass-rails (~> 5.0)

data/sample-apps/companies-app/app/controllers/companies_controller.rb

@@ -20,7 +20,7 @@ class CompaniesController < ApplicationController
   def create
     Services::Hubspot::Companies::Create.new(company_params).call
     redirect_to :companies
-  rescue Hubspot::Client::Crm::Companies::ApiError => e
+  rescue Hubspot::Crm::Companies::ApiError => e
     error_message = JSON.parse(e.response_body)['message']
     redirect_to new_company_path, flash: { error: error_message }
   end
@@ -29,7 +29,7 @@ class CompaniesController < ApplicationController
     @company = Services::Hubspot::Companies::GetById.new(params[:id]).call
     Services::Hubspot::Companies::Update.new(params[:id], company_params).call
     redirect_to :companies
-  rescue Hubspot::Client::Crm::Companies::ApiError => e
+  rescue Hubspot::Crm::Companies::ApiError => e
     error_message = JSON.parse(e.response_body)['message']
     redirect_to company_path(params[:id]), flash: { error: error_message }
   end

data/sample-apps/companies-app/app/controllers/contacts_controller.rb

@@ -6,7 +6,7 @@ class ContactsController < ApplicationController
       @search_q = params[:search]
       Services::Hubspot::Contacts::Search.new(email: @search_q).call
     else
-      Services::Hubspot::Contacts::GetAll.new(limit: 100).call.sort_by(&:created_at).reverse
+      Services::Hubspot::Contacts::GetPage.new(limit: 100).call.sort_by(&:created_at).reverse
     end
     @associated_contacts = Services::Hubspot::Associations::GetById.new(params[:company_id]).call || []
   end

data/sample-apps/companies-app/app/lib/services/authorization/get_authorization_uri.rb

@@ -10,7 +10,7 @@ module Services
       def call
         check_presence_of_credentials
 
-        ::Hubspot::OAuth.authorize_url(
+        ::Hubspot::OAuthHelper.authorize_url(
           client_id: ENV['HUBSPOT_CLIENT_ID'],
           redirect_uri: redirect_uri,
           scope: %w[contacts]

data/sample-apps/companies-app/app/lib/services/authorization/tokens/generate.rb

@@ -8,7 +8,7 @@ module Services
         end
 
         def call
-          tokens_api = ::Hubspot::Client::OAuth::Api::TokensApi.new
+          tokens_api = ::Hubspot::OAuth::TokensApi.new
           tokens = tokens_api.post_oauth_v1_token(
             grant_type: :authorization_code,
             code: @code,

data/sample-apps/companies-app/app/lib/services/authorization/tokens/refresh.rb

@@ -15,7 +15,7 @@ module Services
         private
 
         def refresh_tokens
-          tokens_api = ::Hubspot::Client::OAuth::Api::TokensApi.new
+          tokens_api = ::Hubspot::OAuth::TokensApi.new
           tokens = tokens_api.post_oauth_v1_token(
             grant_type: :refresh_token,
             refresh_token: @tokens[:refresh_token],

data/sample-apps/companies-app/app/lib/services/hubspot/associations/create.rb

@@ -8,7 +8,7 @@ module Services
         end
 
         def call
-          ::Hubspot::Client::Crm::Associations::Api::BatchApi.new.create_batch(
+          ::Hubspot::Crm::Associations::BatchApi.new.create_batch(
             'companies',
             'contacts',
             body: association,
@@ -19,16 +19,16 @@ module Services
         private
 
         def association
-          ::Hubspot::Client::Crm::Associations::Models::BatchInputPublicAssociation.new(
+          ::Hubspot::Crm::Associations::BatchInputPublicAssociation.new(
             inputs: contacts_to_associate
           )
         end
 
         def contacts_to_associate
           @contacts_ids.map do |id|
-            ::Hubspot::Client::Crm::Associations::Models::PublicAssociation.new(
-              from: ::Hubspot::Client::Crm::Associations::Models::PublicObjectId.new(id: @company_id),
-              to: ::Hubspot::Client::Crm::Associations::Models::PublicObjectId.new(id: id)
+            ::Hubspot::Crm::Associations::PublicAssociation.new(
+              from: ::Hubspot::Crm::Associations::PublicObjectId.new(id: @company_id),
+              to: ::Hubspot::Crm::Associations::PublicObjectId.new(id: id)
             )
           end
         end

data/sample-apps/companies-app/app/lib/services/hubspot/associations/delete.rb

@@ -8,7 +8,7 @@ module Services
         end
 
         def call
-          ::Hubspot::Client::Crm::Associations::Api::BatchApi.new.archive_batch(
+          ::Hubspot::Crm::Associations::BatchApi.new.archive_batch(
             'companies',
             'contacts',
             body: association,
@@ -19,16 +19,16 @@ module Services
         private
 
         def association
-          ::Hubspot::Client::Crm::Associations::Models::BatchInputPublicAssociation.new(
+          ::Hubspot::Crm::Associations::BatchInputPublicAssociation.new(
             inputs: contacts_to_assotiate
           )
         end
 
         def contacts_to_assotiate
           @contacts_ids.map do |id|
-            ::Hubspot::Client::Crm::Associations::Models::PublicAssociation.new(
-              from: ::Hubspot::Client::Crm::Associations::Models::PublicObjectId.new(id: @company_id),
-              to: ::Hubspot::Client::Crm::Associations::Models::PublicObjectId.new(id: id)
+            ::Hubspot::Crm::Associations::PublicAssociation.new(
+              from: ::Hubspot::Crm::Associations::PublicObjectId.new(id: @company_id),
+              to: ::Hubspot::Crm::Associations::PublicObjectId.new(id: id)
             )
           end
         end

data/sample-apps/companies-app/app/lib/services/hubspot/associations/get_by_id.rb

@@ -9,7 +9,7 @@ module Services
         def call
           return unless associated_contacts_id_object.present?
 
-          contacts_list = ::Hubspot::Client::Crm::Contacts::Api::BatchApi.new.read_batch(
+          contacts_list = ::Hubspot::Crm::Contacts::BatchApi.new.read_batch(
             body: associated_contacts_id_object,
             auth_names: 'oauth2'
           ).results
@@ -18,18 +18,18 @@ module Services
         private
 
         def associated_contacts_id_object
-          id_objects = ::Hubspot::Client::Crm::Associations::Api::BatchApi.new.read_batch(
+          id_objects = ::Hubspot::Crm::Associations::BatchApi.new.read_batch(
             'companies',
             'contacts',
             body: company_id_object,
             auth_names: 'oauth2'
           ).results
           id_objects = id_objects.present? ? id_objects[0].to : []
-          ::Hubspot::Client::Crm::Contacts::Models::BatchReadInputSimplePublicObjectId.new(inputs: id_objects)
+          ::Hubspot::Crm::Contacts::BatchReadInputSimplePublicObjectId.new(inputs: id_objects)
         end
 
         def company_id_object
-          @company_id_object ||= ::Hubspot::Client::Crm::Associations::Models::BatchInputPublicObjectId.new(
+          @company_id_object ||= ::Hubspot::Crm::Associations::BatchInputPublicObjectId.new(
             inputs: [@company_id]
           )
         end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/create.rb

@@ -7,14 +7,14 @@ module Services
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          basic_api = ::Hubspot::Crm::Companies::BasicApi.new
           basic_api.create(auth_names: 'oauth2', body: company)
         end
 
         private
 
         def company
-          ::Hubspot::Client::Crm::Companies::Models::SimplePublicObjectInput.new(
+          ::Hubspot::Crm::Companies::SimplePublicObjectInput.new(
             properties: @properties
           )
         end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/destroy.rb

@@ -7,7 +7,7 @@ module Services
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          basic_api = ::Hubspot::Crm::Companies::BasicApi.new
           basic_api.archive(@id, auth_names: 'oauth2')
         end
       end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/export.rb

@@ -29,7 +29,7 @@ module Services
         end
 
         def basic_api
-          @basic_api ||= ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          @basic_api ||= ::Hubspot::Crm::Companies::BasicApi.new
         end
 
         def convert_to_csv(companies, properties: PROPERTIES_TO_EXPORT)

data/sample-apps/companies-app/app/lib/services/hubspot/companies/get_all.rb

@@ -7,7 +7,7 @@ module Services
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          basic_api = ::Hubspot::Crm::Companies::BasicApi.new
           results = basic_api.get_page(auth_names: 'oauth2', limit: @limit).results
         end
       end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/get_by_id.rb

@@ -7,7 +7,7 @@ module Services
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          basic_api = ::Hubspot::Crm::Companies::BasicApi.new
           basic_api.get_by_id(@id, auth_names: 'oauth2')
         end
       end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/search.rb

@@ -7,20 +7,20 @@ module Services
         end
 
         def call
-          search_api = ::Hubspot::Client::Crm::Companies::Api::SearchApi.new
+          search_api = ::Hubspot::Crm::Companies::SearchApi.new
           search_api.do_search(body: search_request, auth_names: 'oauth2').results
         end
 
         private
 
         def search_request
-          filter = ::Hubspot::Client::Crm::Companies::Models::Filter.new(
+          filter = ::Hubspot::Crm::Companies::Filter.new(
             property_name: 'domain',
             operator: 'EQ',
             value: @domain
           )
-          filter_group = ::Hubspot::Client::Crm::Companies::Models::FilterGroup.new(filters: [filter])
-          ::Hubspot::Client::Crm::Companies::Models::PublicObjectSearchRequest.new(filter_groups: [filter_group])
+          filter_group = ::Hubspot::Crm::Companies::FilterGroup.new(filters: [filter])
+          ::Hubspot::Crm::Companies::PublicObjectSearchRequest.new(filter_groups: [filter_group])
         end
       end
     end

data/sample-apps/companies-app/app/lib/services/hubspot/companies/update.rb

@@ -8,7 +8,7 @@ module Services
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Companies::Api::BasicApi.new
+          basic_api = ::Hubspot::Crm::Companies::BasicApi.new
           params = { auth_names: 'oauth2', body: company }
           basic_api.update(@id, params)
         end
@@ -16,7 +16,7 @@ module Services
         private
 
         def company
-          ::Hubspot::Client::Crm::Companies::Models::SimplePublicObjectInput.new(
+          ::Hubspot::Crm::Companies::SimplePublicObjectInput.new(
             properties: @properties
           )
         end

data/sample-apps/{oauth-app/app/lib/services/hubspot/contacts/get_all.rb → companies-app/app/lib/services/hubspot/contacts/get_page.rb}

@@ -1,14 +1,14 @@
 module Services
   module Hubspot
     module Contacts
-      class GetAll
+      class GetPage
         def initialize(limit: 10)
           @limit = limit
         end
 
         def call
-          basic_api = ::Hubspot::Client::Crm::Objects::Api::BasicApi.new
-          results = basic_api.get_page('contact', auth_names: 'oauth2', limit: @limit).results
+          basic_api = ::Hubspot::Crm::Contacts::BasicApi.new
+          results = basic_api.get_page(auth_names: 'oauth2', limit: @limit).results
           results = add_fullnames(results)
         end
 

data/sample-apps/companies-app/app/lib/services/hubspot/contacts/search.rb

@@ -7,20 +7,20 @@ module Services
         end
 
         def call
-          search_api = ::Hubspot::Client::Crm::Contacts::Api::SearchApi.new
+          search_api = ::Hubspot::Crm::Contacts::SearchApi.new
           search_api.do_search(body: search_request, auth_names: 'oauth2').results
         end
 
         private
 
         def search_request
-          filter = ::Hubspot::Client::Crm::Contacts::Models::Filter.new(
+          filter = ::Hubspot::Crm::Contacts::Filter.new(
             property_name: 'email',
             operator: 'EQ',
             value: @email
           )
-          filter_group = ::Hubspot::Client::Crm::Contacts::Models::FilterGroup.new(filters: [filter])
-          ::Hubspot::Client::Crm::Contacts::Models::PublicObjectSearchRequest.new(filter_groups: [filter_group])
+          filter_group = ::Hubspot::Crm::Contacts::FilterGroup.new(filters: [filter])
+          ::Hubspot::Crm::Contacts::PublicObjectSearchRequest.new(filter_groups: [filter_group])
         end
       end
     end

data/sample-apps/companies-app/app/views/oauth/authorization/login.html.erb

@@ -2,7 +2,7 @@
   <pre>
     <p>// app/lib/services/authorization/get_authorization_uri.rb - Generate URL for OAuth</p>
 
-    <p>::Hubspot::OAuth.authorize_url(</p>
+    <p>::Hubspot::OAuthHelper.authorize_url(</p>
     <p>  client_id: 'client_id',</p>
     <p>  redirect_uri: redirect_uri,</p>
     <p>  scope: %w[contacts]</p>

data/sample-apps/contacts-app/Gemfile

@@ -5,7 +5,7 @@ ruby '2.6.3'
 
 gem 'rails', '~> 5.2.3'
 gem 'sqlite3'
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'jbuilder', '~> 2.5'

data/sample-apps/contacts-app/Gemfile.lock

@@ -142,8 +142,9 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.1)
-    puma (3.12.1)
-    rack (2.0.7)
+    puma (4.3.1)
+      nio4r (~> 2.0)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -253,7 +254,7 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   pry
   pry-byebug
-  puma (~> 3.11)
+  puma (~> 4.3)
   rails (~> 5.2.3)
   rspec-rails (~> 3.5)
   sass-rails (~> 5.0)

data/sample-apps/contacts-app/app/controllers/contacts_controller.rb

@@ -8,7 +8,7 @@ class ContactsController < ApplicationController
       Services::Hubspot::Contacts::Search.new(email: @search_q).call
     else
       # https://developers.hubspot.com/docs/methods/contacts/get_contacts
-      Services::Hubspot::Contacts::GetAll.new(limit: 100).call.sort_by(&:created_at).reverse
+      Services::Hubspot::Contacts::GetPage.new(limit: 100).call.sort_by(&:created_at).reverse
     end
   end
 
@@ -21,7 +21,7 @@ class ContactsController < ApplicationController
   def create
     Services::Hubspot::Contacts::Create.new(email: params[:email]).call
     redirect_to :contacts
-  rescue Hubspot::Client::Crm::Contacts::ApiError => e
+  rescue Hubspot::Crm::Contacts::ApiError => e
     error_message = JSON.parse(e.response_body)['message']
     redirect_to new_contact_path, flash: { error: error_message }
   end
@@ -30,7 +30,7 @@ class ContactsController < ApplicationController
     @contact = Services::Hubspot::Contacts::GetById.new(params[:id]).call
     Services::Hubspot::Contacts::Update.new(params[:id], contact_params).call
     redirect_to :contacts
-  rescue Hubspot::Client::Crm::Contacts::ApiError => e
+  rescue Hubspot::Crm::Contacts::ApiError => e
     error_message = JSON.parse(e.response_body)['message']
     redirect_to contact_path(params[:id]), flash: { error: error_message }
   end