easypost 4.0.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4033b69b8c91126ab87ed8a16c3b5dd8bd7b4b06b9e7cc4011fe478163244a3a
-  data.tar.gz: 554e850ea8107cd0d8de3efca5c0ed18834c7b51c5c437ca9e6c4f8d197489a2
+  metadata.gz: 2b2de1c12852ffd59083d6ee132f2071577e7ff774f77cb515b444f75eaf86fc
+  data.tar.gz: 98b1d4bce4a86d9cdf3480f91e818dc362af2963e38f9bccb434b557aebf6bcc
 SHA512:
-  metadata.gz: 77335abc417c0cf3d1af97d9b4941b00f8dec6400282d0f4f25a3408c47b82eaa5f8a8de6564f250e6a985f3261c296eb22d535eed3d04cc5c7a2716c5239352
-  data.tar.gz: 27cc114d89dddec6d2bf7862cd0f15c8d875f739a806a1589ca2626fc61ed9387ee5602d373c85902d6fc8908fe266df347d5d7409a4e9af42cb0091e5791690
+  metadata.gz: 97fceef78d0d5706cd0ddb553f6da95ad5a27fe2491069f2eb416dafcb296a158d6e03bab6232ef0efe63f7503a256830635847288e99f17129920adade55eae
+  data.tar.gz: 2d3a0058d85435a3b743ef9f1b3f21e42bd77bf5cf830f5522794369f27315a9ca673f65fb9f3900df718668d2207ed63c295b7f36f415979cd53dae8cfe0110

data/.gitignore

@@ -28,3 +28,4 @@ Icon
 .Spotlight-V100
 .Trashes
 vendor/
+.env

data/CHANGELOG.md

@@ -1,225 +1,239 @@
 # CHANGELOG
 
+## v4.1.2 (2022-03-16)
+
+- Rolls back the original connection behavior of establishing a new connection for every request (restores previous expectations for multithreaded implementations)
+
+## v4.1.1 (2022-03-14)
+
+- Fixes a bug that prematurely closed connections when using multithreading by wrapping requests in a mutex (closes #148)
+
+## v4.1.0 (2022-03-09)
+
+- Adds support for custom client connections (#142)
+  - Reduces memory usage by reusing connections
+- Extends all objects with `Enumerable` allowing for iterator patterns (#143)
+
 ## v4.0.0 (2022-02-25)
 
-* Bumps minimum Ruby version from `2.2` to `2.5`
-* Bumps dev dependencies
-* Documents each interface of the project in code
-* Overhauls the test suite with full coverage
-* Introduces `Rubocop` and lints the entire project
-* Removes the unusable `Print` and `PrintJob` objects
-* Removes deprecated and unusable `stamp_and_barcode_by_reference` method on the Batch object
-* Explicitly returns an error of "not implemented" for `Rate.all` and `Parcel.all`
-* Removes the `Shipment.get_rates` function as shipments already contain rates. If you need to get new rates for a shipment, use the `Shipment.regenerate_rates` function instead
-* Removes the parameters from `Address.verify` as they are unusable
-* Removes the deprecated `http_status` property of the `EasyPost::Error` object as it was replaced with `status`
-* Fixes a bug that would append an extra `id` field to each retrieved object
-* Various other small improvements and bug fixes
+- Bumps minimum Ruby version from `2.2` to `2.5`
+- Bumps dev dependencies
+- Documents each interface of the project in code
+- Overhauls the test suite with full coverage
+- Introduces `Rubocop` and lints the entire project
+- Removes the unusable `Print` and `PrintJob` objects
+- Removes deprecated and unusable `stamp_and_barcode_by_reference` method on the Batch object
+- Explicitly returns an error of "not implemented" for `Rate.all` and `Parcel.all`
+- Removes the `Shipment.get_rates` function as shipments already contain rates. If you need to get new rates for a shipment, use the `Shipment.regenerate_rates` function instead
+- Removes the parameters from `Address.verify` as they are unusable
+- Removes the deprecated `http_status` property of the `EasyPost::Error` object as it was replaced with `status`
+- Fixes a bug that would append an extra `id` field to each retrieved object
+- Various other small improvements and bug fixes
 
 ## v3.5.0 (2021-12-06)
 
-* Adds the `update_brand` method to the user object (closes #122)
+- Adds the `update_brand` method to the user object (closes #122)
 
 ## v3.4.0 (2021-07-13)
 
-* Removed deprecated `Item` object
-* Sorted EasyPost Resources list
-* Remove 2015-vintage experimental `all_updated` method on Tracker
-* Fixes API key retrieval (#120, thanks @andychongyz)
-* Adds `regenerate_rates` method for new rerate API
-* Adds `deconstruct_keys` method to allow for pattern matching on EasyPost objects
+- Removed deprecated `Item` object
+- Sorted EasyPost Resources list
+- Remove 2015-vintage experimental `all_updated` method on Tracker
+- Fixes API key retrieval (#120, thanks @andychongyz)
+- Adds `regenerate_rates` method for new rerate API
+- Adds `deconstruct_keys` method to allow for pattern matching on EasyPost objects
 
 ## v3.3.0 (2021-06-10)
 
-* Adds `SmartRate` functionality to the `Shipments` object (available by calling `get_smartrates` on a shipment)
-* Fix bug where `EasyPost::CarrierAccount.types` was hitting the wrong endpoint
+- Adds `SmartRate` functionality to the `Shipments` object (available by calling `get_smartrates` on a shipment)
+- Fix bug where `EasyPost::CarrierAccount.types` was hitting the wrong endpoint
 
 ## v3.2.0 (2021-01-14)
 
-* Replace Travis CI with Github Actions
-* Add Ruby 3.0 to supported platforms (#110; thanks @maxwell)
+- Replace Travis CI with Github Actions
+- Add Ruby 3.0 to supported platforms (#110; thanks @maxwell)
 
 ## v3.1.5 (2020-12-16)
 
-* Fix attribute lookup when manually constructing objects (#105; thanks @drewtempelmeyer)
-* Flatten class names and clean up some other style issues
-* Fix `EasyPost::Address.create_and_verify`, broken since 3.1.0 (#108; thanks @rajbirverma)
+- Fix attribute lookup when manually constructing objects (#105; thanks @drewtempelmeyer)
+- Flatten class names and clean up some other style issues
+- Fix `EasyPost::Address.create_and_verify`, broken since 3.1.0 (#108; thanks @rajbirverma)
 
 ## v3.1.4 (2020-09-29)
 
-* Don't modify params passed into Address#create (#78; thanks @TheRusskiy)
-* Don't modify `carriers` and `services` parameters to `Shipment.lowest_rate` (#71 / #103, thanks @vladvinnikov and @jurisgalang)
-* When constructing an easypost object, convert the key to a string (#102; thanks @Geesu)
-* Expose the raw HTTP response as `#http_body` on `EasyPost::Error` objects (#101; thanks @Geesu)
+- Don't modify params passed into Address#create (#78; thanks @TheRusskiy)
+- Don't modify `carriers` and `services` parameters to `Shipment.lowest_rate` (#71 / #103, thanks @vladvinnikov and @jurisgalang)
+- When constructing an easypost object, convert the key to a string (#102; thanks @Geesu)
+- Expose the raw HTTP response as `#http_body` on `EasyPost::Error` objects (#101; thanks @Geesu)
 
 ## v3.1.3 (2020-06-26)
 
-* Fix bug causing Authorization header to be included in User-Agent header. All users must upgrade.
+- Fix bug causing Authorization header to be included in User-Agent header. All users must upgrade.
 
 ## v3.1.2 (2020-06-24)
 
-* Bad gem push. New version required.
+- Bad gem push. New version required.
 
 ## v3.1.1 (2020-06-23)
 
-* Fix bug where EasyPost.http_config was invalid when not explicitly initialized.
+- Fix bug where EasyPost.http_config was invalid when not explicitly initialized.
 
 ## v3.1.0 (2020-06-23)
 
-* Add Shipment Invoice and Refund Report
-* Remove dependencies on `RestClient` and `MultiJson`
-* Remove some deprecated endpoints
+- Add Shipment Invoice and Refund Report
+- Remove dependencies on `RestClient` and `MultiJson`
+- Remove some deprecated endpoints
 
 ## v3.0.1 (2018-05-17)
 
-* Enforce TLS certificate validity by default
+- Enforce TLS certificate validity by default
 
 ## v3.0.0 (2018-02-15)
 
-* Require use of ruby ~> 2.0 and TLSv1.2
+- Require use of ruby ~> 2.0 and TLSv1.2
 
 ## v2.7.3 (2018-02-05)
 
-* Fix bug with introduced around certain JSON objects with IDs (thanks vladvinnikov!)
+- Fix bug with introduced around certain JSON objects with IDs (thanks vladvinnikov!)
 
 ## v2.7.2 (2018-02-01)
 
-* Removed unused and unsupported code paths for Container model
-* Removed unused and unsupported code path for Stamp and Barcode methods on the Shipment model
-* Fixed a bug with non-model JSON object with an "id" key being treated as models and raising errors
+- Removed unused and unsupported code paths for Container model
+- Removed unused and unsupported code path for Stamp and Barcode methods on the Shipment model
+- Fixed a bug with non-model JSON object with an "id" key being treated as models and raising errors
 
 ## v2.7.1 (2017-05-25)
 
-* Allow reports to be retrieved without passing a type
+- Allow reports to be retrieved without passing a type
 
 ## v2.7.0 (2017-04-04)
 
-* Changed Report CRUD signatures. requires report type to be passed
+- Changed Report CRUD signatures. requires report type to be passed
 
 ## v2.6.2 (2017-02-14)
 
-* Added get_rates method for Orders
+- Added get_rates method for Orders
 
 ## v2.6.1 (2017-01-19)
 
-* Updated create method for ScanForms
+- Updated create method for ScanForms
 
 ## v2.6.0 (2017-01-17)
 
-* Add basic CRUD methods for Webhooks
+- Add basic CRUD methods for Webhooks
 
 ## v2.5.0 (2016-12-19)
 
-* Add prefixes to report in utils
+- Add prefixes to report in utils
 
 ## v2.4.0 (2016-12-08)
 
-* Add report resource to ruby client
+- Add report resource to ruby client
 
 ## v2.3.0 (2016-11-25)
 
-* Updated dependencies to allow rest-client 2.0.0 and above
+- Updated dependencies to allow rest-client 2.0.0 and above
 
 ## v2.2.0 (2016-07-260
 
-* Added standalone Insurance model
+- Added standalone Insurance model
 
 ## v2.1.11 (2016-02-04)
 
-* Allowed user creation for top-level users
+- Allowed user creation for top-level users
 
 ## v2.1.10 (2015-12-23)
 
-* Added verify and verify_strict params to Address.create
-* Added Tracker.create_list and Tracker.all_updated for working with large
-numbers of Trackers.
+- Added verify and verify_strict params to Address.create
+- Added Tracker.create_list and Tracker.all_updated for working with large
+  numbers of Trackers.
 
 ## v2.1.9 (2015-11-04)
 
-* Added new tests for Tracker.all
-* Updated some old examples
+- Added new tests for Tracker.all
+- Updated some old examples
 
 ## v2.1.8 (2015-10-21)
 
-* Added Cancel method for Pickups (thanks Ramie Blatt!)
+- Added Cancel method for Pickups (thanks Ramie Blatt!)
 
 ## v2.1.7 (2015-10-05)
 
-* Fixed Address.create_and_verify and changed how errors are raised (thanks Dimitri Roche!)
-* Require newer version of the multi_json package
+- Fixed Address.create_and_verify and changed how errors are raised (thanks Dimitri Roche!)
+- Require newer version of the multi_json package
 
 ## v2.1.6 (2015-06-10)
 
-* Added Address message accessor for backwards compatability
+- Added Address message accessor for backwards compatability
 
 ## v2.1.5 (2015-06-10)
 
-* Removed Address.message
+- Removed Address.message
 
 ## v2.1.4 (2015-06-03)
 
-* Add Printer and PrintJob resources.
+- Add Printer and PrintJob resources.
 
 ## v2.1.3 (2015-04-30)
 
-* Bux fix, EasyPost::Errors no longer break with a nil json body.
+- Bux fix, EasyPost::Errors no longer break with a nil json body.
 
 ## v2.1.2 (2015-04-29)
 
-* EasyPost::Errors now correctly parse field errors and error codes.
+- EasyPost::Errors now correctly parse field errors and error codes.
 
 ## v2.1.1 (2015-04-15)
 
-* CarrierAccount will now correctly save in-place modifications to credentials
-* Nested variables should now be saved correctly across all models
-* Fixed version numbering confusion (the previous version was 2.0.15, not 2.1.0)
+- CarrierAccount will now correctly save in-place modifications to credentials
+- Nested variables should now be saved correctly across all models
+- Fixed version numbering confusion (the previous version was 2.0.15, not 2.1.0)
 
 ## v2.0.15 (2015-04-15)
 
-* Added tracker to shipment buy response
-* Updated tracker tests
+- Added tracker to shipment buy response
+- Updated tracker tests
 
 ## v2.0.14 (2015-04-15)
 
-* Added User and CarrierAccount models with CRUD functionality
+- Added User and CarrierAccount models with CRUD functionality
 
 ## v2.0.13 (2014-10-30)
 
-* Added Pickup, PickupRate resources.
-* Added ability to pass api_key to a few resources that were missing it.
+- Added Pickup, PickupRate resources.
+- Added ability to pass api_key to a few resources that were missing it.
 
 ## v2.0.12 (2014-07-07)
 
-* Added Item, Container, and Order resources.
-* Fixed and added a lot of tests.
+- Added Item, Container, and Order resources.
+- Fixed and added a lot of tests.
 
 ## v2.0.11 (2013-12-16)
 
-* Added Event.receive method for parsing events sent by webhook.
-* Fixed tests to account for the tracking code returning and array of details instead of a Hash
+- Added Event.receive method for parsing events sent by webhook.
+- Fixed tests to account for the tracking code returning and array of details instead of a Hash
 
 ## v2.0.10 (2013-10-03)
 
-* API Addition: Event resource added for webhook consumption.
+- API Addition: Event resource added for webhook consumption.
 
 ## v2.0.9 (2013-09-19)
 
-* Interface Change: Changed batch.scan_form to batch.create_scan_form to support the ability to refer to scan forms associated to batches.
+- Interface Change: Changed batch.scan_form to batch.create_scan_form to support the ability to refer to scan forms associated to batches.
 
 ## v2.0.3 (2013-07-31)
 
-* API Addition: Tracker resource added. Trackers can be used to register any tracking code with EasyPost webhooks.
+- API Addition: Tracker resource added. Trackers can be used to register any tracking code with EasyPost webhooks.
 
 ## v2.0.2 (2013-07-23)
 
-* API Addition: Shipment.track_with_code returns tracking details for any tracking code.
+- API Addition: Shipment.track_with_code returns tracking details for any tracking code.
 
 ## v2.0.1 (2013-07-07)
 
-* API Addition: Address.create_and_verify returns a verified address in one step.
-* API Addition: Shipment.label forces the creation of additional label formats (pdf, epl2, zpl).
-* API Addition: Shipment.insure purchases insurance for a shipment.
-* Library Update: Added the ability to negatively filter carriers and services with Shipment.lowest_rate (e.g. '!usps').
+- API Addition: Address.create_and_verify returns a verified address in one step.
+- API Addition: Shipment.label forces the creation of additional label formats (pdf, epl2, zpl).
+- API Addition: Shipment.insure purchases insurance for a shipment.
+- Library Update: Added the ability to negatively filter carriers and services with Shipment.lowest_rate (e.g. '!usps').
 
 ## v2.0.0 (2013-06-25)
 

data/README.md

@@ -103,3 +103,54 @@ Up-to-date documentation at: https://easypost.com/docs
 # Run tests (coverage is generated on a successful test suite run)
 EASYPOST_TEST_API_KEY=123... EASYPOST_PROD_API_KEY=123... bundle exec rspec
 ```
+
+## Custom connections
+
+Set `EasyPost.default_connection` to an object that responds to `call(method, path, api_key = nil, body = nil)`
+
+### Faraday
+
+```ruby
+require 'faraday'
+require 'faraday/response/logger'
+require 'logger'
+
+EasyPost.default_connection = lambda do |method, path, api_key = nil, body = nil|
+  Faraday
+    .new(url: EasyPost.api_base, headers: EasyPost.default_headers) { |builder|
+      builder.use Faraday::Response::Logger, Logger.new(STDOUT), {bodies: true, headers: true}
+      builder.adapter :net_http
+    }
+    .public_send(method, path) { |request|
+      request.headers['Authorization'] = EasyPost.authorization(api_key)
+      request.body = JSON.dump(EasyPost::Util.objects_to_ids(body)) if body
+    }.yield_self { |response|
+      EasyPost.parse_response(
+        status: response.status,
+        body: response.body,
+        json: response.headers['Content-Type'].start_with?('application/json'),
+      )
+    }
+end
+```
+
+### Typhoeus
+
+```ruby
+require 'typhoeus'
+
+EasyPost.default_connection = lambda do |method, path, api_key = nil, body = nil|
+  Typhoeus.public_send(
+    method,
+    File.join(EasyPost.api_base, path),
+    headers: EasyPost.default_headers.merge('Authorization' => EasyPost.authorization(api_key)),
+    body: body.nil? ? nil : JSON.dump(EasyPost::Util.objects_to_ids(body)),
+  ).yield_self { |response|
+    EasyPost.parse_response(
+      status: response.code,
+      body: response.body,
+      json: response.headers['Content-Type'].start_with?('application/json'),
+    )
+  }
+end
+```

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.2

data/lib/easypost/connection.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+EasyPost::Connection = Struct.new(:uri, :config, keyword_init: true) do
+  # Make an HTTP request with Ruby's {Net::HTTP}
+  #
+  # @param method [Symbol] the HTTP Verb (get, method, put, post, etc.)
+  # @param path [String] URI path of the resource
+  # @param requested_api_key [String] ({EasyPost.api_key}) key set Authorization header.
+  # @param body [String] (nil) body of the request
+  # @raise [EasyPost::Error] if the response has a non-2xx status code
+  # @return [Hash] JSON object parsed from the response body
+  def call(method, path, api_key = nil, body = nil)
+    connection =
+      if config[:proxy]
+        proxy_uri = URI(config[:proxy])
+        Net::HTTP.new(
+          uri.host,
+          uri.port,
+          proxy_uri.host,
+          proxy_uri.port,
+          proxy_uri.user,
+          proxy_uri.password,
+        )
+      else
+        Net::HTTP.new(uri.host, uri.port)
+      end
+
+    connection.use_ssl = true
+
+    config.each do |name, value|
+      # Discrepancies between RestClient and Net::HTTP.
+      case name
+      when :verify_ssl
+        name = :verify_mode
+      when :timeout
+        name = :read_timeout
+      end
+
+      # Handled in the creation of the client.
+      if name == :proxy
+        next
+      end
+
+      connection.public_send("#{name}=", value)
+    end
+
+    request = Net::HTTP.const_get(method.capitalize).new(path)
+    request.body = JSON.dump(EasyPost::Util.objects_to_ids(body)) if body
+
+    EasyPost.default_headers.each_pair { |h, v| request[h] = v }
+    request['Authorization'] = EasyPost.authorization(api_key) if api_key
+
+    response = connection.request(request)
+
+    EasyPost.parse_response(
+      status: response.code.to_i,
+      body: response.body,
+      json: response['Content-Type'].start_with?('application/json'),
+    )
+  end
+end

data/lib/easypost/resource.rb

@@ -2,6 +2,8 @@
 
 # The Resource object is extended by each EasyPost object.
 class EasyPost::Resource < EasyPost::EasyPostObject
+  extend Enumerable
+
   # The class name of an EasyPost object.
   def self.class_name
     camel = name.split('::')[-1]
@@ -46,6 +48,18 @@ class EasyPost::Resource < EasyPost::EasyPostObject
     EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
 
+  def self.each(filters = {}, api_key = EasyPost.api_key, &block)
+    return to_enum(:each, filters, api_key) unless block_given?
+
+    loop do
+      page, has_more = all(filters, api_key).values
+      last = page.each(&block).last
+      break if page.empty? || !has_more
+
+      filters[:before_id] = last.id
+    end
+  end
+
   # Retrieve an EasyPost object.
   def self.retrieve(id, api_key = nil)
     instance = new(id, api_key)

data/lib/easypost.rb

@@ -9,6 +9,7 @@ require 'easypost/util'
 require 'easypost/object'
 require 'easypost/resource'
 require 'easypost/error'
+require 'easypost/connection'
 
 # Resources
 require 'easypost/address'
@@ -37,32 +38,42 @@ require 'easypost/user'
 require 'easypost/webhook'
 
 module EasyPost
-  @api_key = nil
-  @api_base = 'https://api.easypost.com'
+  DEFAULT_API_BASE = 'https://api.easypost.com'
+  DEFAULT_USER_AGENT = "EasyPost/v2 RubyClient/#{EasyPost::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
-  # Set the ApiKey.
-  def self.api_key=(api_key)
-    @api_key = api_key
+  class << self
+    attr_accessor :api_key, :api_base
+    attr_writer :default_connection
   end
 
-  # Get the ApiKey.
-  def self.api_key
-    @api_key
+  self.api_base = DEFAULT_API_BASE
+
+  def self.default_headers
+    @default_headers ||= {
+      'Content-Type' => 'application/json',
+      'User-Agent' => EasyPost::DEFAULT_USER_AGENT,
+    }
   end
 
-  # Set the API base.
-  def self.api_base=(api_base)
-    @api_base = api_base
+  def self.default_connection
+    @default_connection ||= EasyPost::Connection.new(
+      uri: URI(api_base),
+      config: http_config,
+    )
   end
 
-  # Get the API base.
-  def self.api_base
-    @api_base
+  def self.authorization(key)
+    "Basic #{Base64.strict_encode64("#{key}:")}"
   end
 
   # Reset the HTTP config.
   def self.reset_http_config
-    @http_config = {
+    http_config.clear
+    self.default_connection = nil
+  end
+
+  def self.default_http_config
+    http_config = {
       timeout: 60,
       open_timeout: 30,
       verify_ssl: OpenSSL::SSL::VERIFY_PEER,
@@ -70,89 +81,60 @@ module EasyPost
 
     ruby_version = Gem::Version.new(RUBY_VERSION)
     if ruby_version >= Gem::Version.new('2.5.0')
-      @http_config[:min_version] = OpenSSL::SSL::TLS1_2_VERSION
+      http_config[:min_version] = OpenSSL::SSL::TLS1_2_VERSION
     else
-      @http_config[:ssl_version] = :TLSv1_2 # rubocop:disable Naming/VariableNumber
+      http_config[:ssl_version] = :TLSv1_2 # rubocop:disable Naming/VariableNumber
     end
 
-    @http_config
+    http_config
   end
 
   # Get the HTTP config.
   def self.http_config
-    @http_config ||= reset_http_config
+    @http_config ||= default_http_config
   end
 
   # Set the HTTP config.
   def self.http_config=(http_config_params)
     http_config.merge!(http_config_params)
+
+    self.default_connection = nil
   end
 
   # Create an EasyPost Client.
-  def self.make_client(uri)
-    client = if http_config[:proxy]
-               proxy_uri = URI(http_config[:proxy])
-               Net::HTTP.new(
-                 uri.host,
-                 uri.port,
-                 proxy_uri.host,
-                 proxy_uri.port,
-                 proxy_uri.user,
-                 proxy_uri.password,
-               )
-             else
-               Net::HTTP.new(uri.host, uri.port)
-             end
-    client.use_ssl = true
-
-    http_config.each do |name, value|
-      # Discrepancies between RestClient and Net::HTTP.
-      case name
-      when :verify_ssl
-        name = :verify_mode
-      when :timeout
-        name = :read_timeout
-      end
-
-      # Handled in the creation of the client.
-      if name == :proxy
-        next
-      end
-
-      client.send("#{name}=", value)
-    end
-
-    client
+  #
+  # @deprecated
+  def self.make_client(url)
+    EasyPost::Connection.new(uri: URI(url), config: http_config).create
   end
 
-  # Make an HTTP request.
+  # Make an HTTP request against the {default_connection}
+  #
+  # @param method [Symbol] the HTTP Verb (get, method, put, post, etc.)
+  # @param path [String] URI path of the resource
+  # @param requested_api_key [String] ({EasyPost.api_key}) key set Authorization header.
+  # @param body [Object] (nil) object to be dumped to JSON
+  # @raise [EasyPost::Error] if the response has a non-2xx status code
+  # @return [Hash] JSON object parsed from the response body
   def self.make_request(method, path, api_key = nil, body = nil)
-    client = make_client(URI(@api_base))
-
-    request = Net::HTTP.const_get(method.capitalize).new(path)
-    if body
-      request.body = JSON.dump(EasyPost::Util.objects_to_ids(body))
-    end
-
-    request['Content-Type'] = 'application/json'
-    request['User-Agent'] = "EasyPost/v2 RubyClient/#{VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
-    if api_key ||= @api_key
-      request['Authorization'] = "Basic #{Base64.strict_encode64("#{api_key}:")}"
-    end
-
-    response = client.request(request)
+    default_connection.call(method, path, api_key || EasyPost.api_key, body)
+  end
 
-    if (400..599).include? response.code.to_i
-      error = JSON.parse(response.body)['error']
-      raise EasyPost::Error.new(error['message'], response.code.to_i, error['code'], error['errors'], response.body)
+  def self.parse_response(status:, body:, json:)
+    if status >= 400
+      error = JSON.parse(body)['error']
+
+      raise EasyPost::Error.new(
+        error['message'],
+        status,
+        error['code'],
+        error['errors'],
+        body,
+      )
     end
 
-    if response['Content-Type'].include? 'application/json'
-      JSON.parse(response.body)
-    else
-      response.body
-    end
+    json ? JSON.parse(body) : body
   rescue JSON::ParserError
-    raise "Invalid response object from API, unable to decode.\n#{response.body}"
+    raise "Invalid response object from API, unable to decode.\n#{body}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.2
 platform: ruby
 authors:
 - EasyPost Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -163,6 +163,7 @@ files:
 - lib/easypost/brand.rb
 - lib/easypost/carrier_account.rb
 - lib/easypost/carrier_type.rb
+- lib/easypost/connection.rb
 - lib/easypost/customs_info.rb
 - lib/easypost/customs_item.rb
 - lib/easypost/error.rb