hubspot-api-client 14.1.0 → 14.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258c55c06d2bb92967ba618919065c527f886d5066f771fae9cd40bde1f7999e
-  data.tar.gz: deb1a80f49da296b0ea65e5bbdd8736f8568167808974db91dbfbbb4b62f8e5e
+  metadata.gz: a4cf7152f7d94654ae7efaef840fc2232392091973642e5b6a877358d665c687
+  data.tar.gz: 7f9b630bc30d894300a8317f170583c1179684f3915f50055821e63fe892bcb4
 SHA512:
-  metadata.gz: 1551a766599640bfef6efc93bb4709c9c0af1d96949787e539b02c130aa744cf4c03d09600668faccc6da656faa324eb5422f5deb71dc5d97f71a5de143cfab6
-  data.tar.gz: c111b2335a6e5b938d3ca0844f4185d2c1637c9b36856ee49e42bb2d6131521e758ecaf2ffac6e91232f692cb540e21a86579f4c57fbc5d161d4623ee5621238
+  metadata.gz: 4a22483996355e355ca0efe55b88d83a66f704936920a64287c05e175a9348a1039acdf6652f3811a380a31c6aceda9be648768b25e9e807035e3e051b1699ba
+  data.tar.gz: 4ba24e78d4f838a817c96a8bd8b3681809d50a2a886dab6b078090423239421794917b79de0eb17e8bfe91b735ac4bfa42a3e66633bef5dfeebb760d98c02cc0

data/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [14.2.0] - 2022-08-25
+### Changed
+
+- using new separate configurations for Hubspot::Client
+
 ## [14.1.0] - 2022-08-23
 ### Changed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hubspot-api-client (14.1.0)
+    hubspot-api-client (14.2.0)
       json (~> 2.1, >= 2.1.0)
       require_all (~> 3.0.0)
       typhoeus (~> 1.4.0)
@@ -10,8 +10,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     ZenTest (4.12.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.16)
@@ -29,7 +29,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     rake (12.3.3)
     rake-release (1.3.0)
       bundler (>= 1.11, < 3)
@@ -51,7 +51,7 @@ GEM
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     vcr (3.0.3)
-    webmock (3.17.1)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/hubspot/client.rb

@@ -2,8 +2,6 @@ require_rel 'discovery'
 
 module Hubspot
   class Client
-    attr_reader :api_key, :access_token
-
     def self.api_modules
       %i[
         automation
@@ -28,25 +26,9 @@ module Hubspot
       'Hubspot::Discovery'
     end
 
-    def configure_api_key
-      Hubspot.configure do |config|
-        config.api_key['hapikey'] = api_key
-      end
-    end
-
-    def configure_access_token
-      Hubspot.configure do |config|
-        config.access_token = access_token
-      end
-    end
-
     def initialize(params)
       raise 'Please, pass :api_key or :access_token' if params[:api_key].nil? && params[:developer_api_key].nil? && params[:access_token].nil?
-      @api_key = params[:api_key] || params[:developer_api_key]
-      @access_token = params[:access_token]
       @params = params
-      configure_api_key if @api_key
-      configure_access_token if @access_token
     end
   end
 end

data/lib/hubspot/discovery/base_api_client.rb

@@ -12,12 +12,16 @@ module Hubspot
         api.methods.grep(/with_http_info/).map {|elem| elem.to_s.gsub('_with_http_info', '').to_sym }
       end
 
+      def config
+        @config ||= new_config
+      end
+
       def api_client
-        api&.api_client
+        @api_client ||= Kernel.const_get("#{self.class.name.gsub('Discovery::', '').gsub(/(.*)::.*/, '\1')}::ApiClient").new(config)
       end
 
       def api
-        @api ||= Kernel.const_get(codegen_api_class).new
+        @api ||= Kernel.const_get(codegen_api_class).new(api_client)
       end
 
       def get_all(params = {})
@@ -26,6 +30,14 @@ module Hubspot
 
       private
 
+      def new_config
+        config = Kernel.const_get("#{self.class.name.gsub('Discovery::', '').gsub(/(.*)::.*/, '\1')}::Configuration").new
+        config.access_token = base_params[:access_token] if base_params[:access_token]
+        config.api_key['hapikey'] = base_params[:api_key] if base_params[:api_key]
+        config.api_key['hapikey'] = base_params[:developer_api_key] if base_params[:developer_api_key]
+        config
+      end
+
       def codegen_api_class
         self.class.name.gsub('Discovery::', '')
       end

data/lib/hubspot/version.rb

@@ -1,3 +1,3 @@
  module Hubspot
-  VERSION = '14.1.0'
+  VERSION = '14.2.0'
  end

data/spec/discovery/base_api_client_spec.rb

@@ -6,6 +6,9 @@ describe 'Hubspot::Discovery::BaseApiClient' do
   end
 
   class Hubspot::SomeApiClass
+    def initialize(api_client)
+    end
+
     def get(test_id, opts = {})
       "got test_id: #{test_id}, opts: #{opts}"
     end
@@ -21,6 +24,11 @@ describe 'Hubspot::Discovery::BaseApiClient' do
     end
   end
 
+  class Hubspot::ApiClient
+    def initialize(config)
+    end
+  end
+
   subject(:client) { Hubspot::Discovery::SomeApiClass.new(access_token: 'test') }
   let(:api) { client.api }
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-api-client
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 14.2.0
 platform: ruby
 authors:
 - HubSpot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus