square.rb 13.1.0.20210818 → 16.0.1.20211117

data/lib/square/configuration.rb

@@ -3,17 +3,9 @@ module Square
   # are configured in this class.
   class Configuration
     # The attribute readers for properties.
-    attr_reader :http_client
-    attr_reader :timeout
-    attr_reader :max_retries
-    attr_reader :retry_interval
-    attr_reader :backoff_factor
-    attr_reader :retry_statuses
-    attr_reader :retry_methods
-    attr_reader :environment
-    attr_reader :custom_url
-    attr_reader :square_version
-    attr_reader :access_token
+    attr_reader :http_client, :http_client_instance, :timeout, :max_retries, :retry_interval,
+                :backoff_factor, :retry_statuses, :retry_methods, :environment, :custom_url,
+                :square_version, :access_token
 
     def additional_headers
       @additional_headers.clone
@@ -23,13 +15,16 @@ module Square
       attr_reader :environments
     end
 
-    def initialize(timeout: 60, max_retries: 0, retry_interval: 1,
-                   backoff_factor: 2,
+    def initialize(http_client_instance: nil, timeout: 60, max_retries: 0,
+                   retry_interval: 1, backoff_factor: 2,
                    retry_statuses: [408, 413, 429, 500, 502, 503, 504, 521, 522, 524],
                    retry_methods: %i[get put], environment: 'production',
                    custom_url: 'https://connect.squareup.com',
-                   square_version: '2021-08-18', access_token: 'TODO: Replace',
+                   square_version: '2021-11-17', access_token: '',
                    additional_headers: {})
+      # The Http Client passed from the sdk user for making requests
+      @http_client_instance = http_client_instance
+
       # The value to use for connection timeout
       @timeout = timeout
 
@@ -68,10 +63,12 @@ module Square
       @http_client = create_http_client
     end
 
-    def clone_with(timeout: nil, max_retries: nil, retry_interval: nil,
-                   backoff_factor: nil, retry_statuses: nil, retry_methods: nil,
-                   environment: nil, custom_url: nil, square_version: nil,
-                   access_token: nil, additional_headers: nil)
+    def clone_with(http_client_instance: nil, timeout: nil, max_retries: nil,
+                   retry_interval: nil, backoff_factor: nil,
+                   retry_statuses: nil, retry_methods: nil, environment: nil,
+                   custom_url: nil, square_version: nil, access_token: nil,
+                   additional_headers: nil)
+      http_client_instance ||= self.http_client_instance
       timeout ||= self.timeout
       max_retries ||= self.max_retries
       retry_interval ||= self.retry_interval
@@ -84,7 +81,8 @@ module Square
       access_token ||= self.access_token
       additional_headers ||= self.additional_headers
 
-      Configuration.new(timeout: timeout, max_retries: max_retries,
+      Configuration.new(http_client_instance: http_client_instance,
+                        timeout: timeout, max_retries: max_retries,
                         retry_interval: retry_interval,
                         backoff_factor: backoff_factor,
                         retry_statuses: retry_statuses,
@@ -99,7 +97,8 @@ module Square
                         retry_interval: retry_interval,
                         backoff_factor: backoff_factor,
                         retry_statuses: retry_statuses,
-                        retry_methods: retry_methods)
+                        retry_methods: retry_methods,
+                        http_client_instance: http_client_instance)
     end
 
     # All the environments the SDK can run in.

data/lib/square/http/api_response.rb

@@ -25,7 +25,7 @@ module Square
           end.new(*data.values)
 
           @cursor = data.fetch(:cursor, nil)
-          data.reject! { |k| k == :cursor || k == :errors }
+          data.reject! { |k| %i[cursor errors].include?(k) }
           @data = Struct.new(*data.keys).new(*data.values) if data.keys.any?
         end
       else

data/lib/square/http/faraday_client.rb

@@ -7,7 +7,25 @@ module Square
     # The constructor.
     def initialize(timeout:, max_retries:, retry_interval:,
                    backoff_factor:, retry_statuses:, retry_methods:,
-                   cache: false, verify: true)
+                   http_client_instance: nil, cache: false, verify: true)
+      if http_client_instance.nil?
+        create_connection(timeout: timeout, max_retries: max_retries,
+                          retry_interval: retry_interval, backoff_factor: backoff_factor,
+                          retry_statuses: retry_statuses, retry_methods: retry_methods,
+                          cache: cache, verify: verify)
+      else
+        if http_client_instance.instance_variable_get('@connection').nil?
+          raise ArgumentError,
+                "`connection` cannot be nil in `#{self.class}`. Please specify a valid value."
+        end
+        @connection = http_client_instance.instance_variable_get('@connection')
+      end
+    end
+
+    # Method to initialize connection.
+    def create_connection(timeout:, max_retries:, retry_interval:,
+                          backoff_factor:, retry_statuses:, retry_methods:,
+                          cache: false, verify: true)
       @connection = Faraday.new do |faraday|
         faraday.use Faraday::HttpCache, serializer: Marshal if cache
         faraday.use FaradayMiddleware::FollowRedirects
@@ -24,6 +42,7 @@ module Square
         faraday.options[:params_encoder] = Faraday::FlatParamsEncoder
         faraday.options[:timeout] = timeout if timeout.positive?
       end
+      @connection
     end
 
     # Method overridden from HttpClient.

data/lib/square/utilities/file_wrapper.rb

@@ -1,8 +1,7 @@
 module Square
   # A utility to allow users to set the content-type for files
   class FileWrapper
-    attr_reader :content_type
-    attr_reader :file
+    attr_reader :content_type, :file
 
     def initialize(file, content_type: 'application/octet-stream')
       @file = file

data/lib/square.rb

@@ -4,63 +4,62 @@ require 'faraday'
 require 'certifi'
 require 'logging'
 
-require_relative 'square/api_helper.rb'
-require_relative 'square/client.rb'
+require_relative 'square/api_helper'
+require_relative 'square/client'
 
 # Utilities
-require_relative 'square/utilities/file_wrapper.rb'
-require_relative 'square/utilities/date_time_helper.rb'
+require_relative 'square/utilities/file_wrapper'
+require_relative 'square/utilities/date_time_helper'
 
 # Http
-require_relative 'square/http/api_response.rb'
-require_relative 'square/http/http_call_back.rb'
-require_relative 'square/http/http_client.rb'
-require_relative 'square/http/faraday_client.rb'
-require_relative 'square/http/http_method_enum.rb'
-require_relative 'square/http/http_request.rb'
-require_relative 'square/http/http_response.rb'
-require_relative 'square/http/auth/o_auth2.rb'
+require_relative 'square/http/api_response'
+require_relative 'square/http/http_call_back'
+require_relative 'square/http/http_client'
+require_relative 'square/http/faraday_client'
+require_relative 'square/http/http_method_enum'
+require_relative 'square/http/http_request'
+require_relative 'square/http/http_response'
+require_relative 'square/http/auth/o_auth2'
 
 # Models
 
 # Exceptions
-require_relative 'square/exceptions/api_exception.rb'
+require_relative 'square/exceptions/api_exception'
 
-require_relative 'square/configuration.rb'
+require_relative 'square/configuration'
 
 # Controllers
-require_relative 'square/api/base_api.rb'
-require_relative 'square/api/mobile_authorization_api.rb'
-require_relative 'square/api/o_auth_api.rb'
-require_relative 'square/api/v1_employees_api.rb'
-require_relative 'square/api/v1_transactions_api.rb'
-require_relative 'square/api/apple_pay_api.rb'
-require_relative 'square/api/bank_accounts_api.rb'
-require_relative 'square/api/bookings_api.rb'
-require_relative 'square/api/cards_api.rb'
-require_relative 'square/api/cash_drawers_api.rb'
-require_relative 'square/api/catalog_api.rb'
-require_relative 'square/api/customers_api.rb'
-require_relative 'square/api/customer_groups_api.rb'
-require_relative 'square/api/customer_segments_api.rb'
-require_relative 'square/api/devices_api.rb'
-require_relative 'square/api/disputes_api.rb'
-require_relative 'square/api/employees_api.rb'
-require_relative 'square/api/gift_cards_api.rb'
-require_relative 'square/api/gift_card_activities_api.rb'
-require_relative 'square/api/inventory_api.rb'
-require_relative 'square/api/invoices_api.rb'
-require_relative 'square/api/labor_api.rb'
-require_relative 'square/api/locations_api.rb'
-require_relative 'square/api/checkout_api.rb'
-require_relative 'square/api/transactions_api.rb'
-require_relative 'square/api/loyalty_api.rb'
-require_relative 'square/api/merchants_api.rb'
-require_relative 'square/api/orders_api.rb'
-require_relative 'square/api/payments_api.rb'
-require_relative 'square/api/refunds_api.rb'
-require_relative 'square/api/sites_api.rb'
-require_relative 'square/api/snippets_api.rb'
-require_relative 'square/api/subscriptions_api.rb'
-require_relative 'square/api/team_api.rb'
-require_relative 'square/api/terminal_api.rb'
+require_relative 'square/api/base_api'
+require_relative 'square/api/mobile_authorization_api'
+require_relative 'square/api/o_auth_api'
+require_relative 'square/api/v1_transactions_api'
+require_relative 'square/api/apple_pay_api'
+require_relative 'square/api/bank_accounts_api'
+require_relative 'square/api/bookings_api'
+require_relative 'square/api/cards_api'
+require_relative 'square/api/cash_drawers_api'
+require_relative 'square/api/catalog_api'
+require_relative 'square/api/customers_api'
+require_relative 'square/api/customer_groups_api'
+require_relative 'square/api/customer_segments_api'
+require_relative 'square/api/devices_api'
+require_relative 'square/api/disputes_api'
+require_relative 'square/api/employees_api'
+require_relative 'square/api/gift_cards_api'
+require_relative 'square/api/gift_card_activities_api'
+require_relative 'square/api/inventory_api'
+require_relative 'square/api/invoices_api'
+require_relative 'square/api/labor_api'
+require_relative 'square/api/locations_api'
+require_relative 'square/api/checkout_api'
+require_relative 'square/api/transactions_api'
+require_relative 'square/api/loyalty_api'
+require_relative 'square/api/merchants_api'
+require_relative 'square/api/orders_api'
+require_relative 'square/api/payments_api'
+require_relative 'square/api/refunds_api'
+require_relative 'square/api/sites_api'
+require_relative 'square/api/snippets_api'
+require_relative 'square/api/subscriptions_api'
+require_relative 'square/api/team_api'
+require_relative 'square/api/terminal_api'

data/test/test_helper.rb

@@ -82,7 +82,7 @@ class TestHelper
     unless @cache.keys.include? url  
       @cache[url] = Tempfile.new('APIMatic')
       @cache[url].binmode
-      @cache[url].write(open(url, {ssl_ca_cert: Certifi.where}).read)
+      @cache[url].write(URI.open(url, {ssl_ca_cert: Certifi.where}).read)
     end
     return @cache[url].path
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: square.rb
 version: !ruby/object:Gem::Version
-  version: 13.1.0.20210818
+  version: 16.0.1.20211117
 platform: ruby
 authors:
 - Square Developer Platform
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -31,9 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,6 @@ files:
 - lib/square/api/team_api.rb
 - lib/square/api/terminal_api.rb
 - lib/square/api/transactions_api.rb
-- lib/square/api/v1_employees_api.rb
 - lib/square/api/v1_transactions_api.rb
 - lib/square/api_helper.rb
 - lib/square/client.rb
@@ -210,16 +209,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: square