freight_kit 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 543816b71edfd222f466c27be9e96722cb616ebb33768e3985379aea350b36d8
-  data.tar.gz: 9aba35e8079b412e35cf2a868ac3b7f0b7c7d47ac2a1b595bc2bcb06ba4e920d
+  metadata.gz: 170c2e1d454e583098180d4ffa29c937dcc687972ebc896c58056bd3285e02f5
+  data.tar.gz: c144297e62782b1f9836b4c24bc0367b2132d9319382c5b2e96668694b953247
 SHA512:
-  metadata.gz: 363cd6ebe87b53b68dc5a8a715657ed62069e9bc55a81fdef7c4ad6d056913f1d33651787fd726167337c1ffb38194c9b2c1af84a6501002f62af6aba050ab8c
-  data.tar.gz: eda608438300dd2581bef08ea6b8c4bb6ab0166d7f98cc1027c034da683e84a49a51b9c31d8681c6481c92c625a09c7fe673820ff63fee5b9e0f9a0e267b497a
+  metadata.gz: f2cadca4dbab2f033bf5b761131701a13807b7180ff5dd90f85ca79dc235bc109fa5afa7e908d9bfa19914ec5633b6ecec36653281e3bf0ae728e448b0fa9b1f
+  data.tar.gz: 5c6cc78939f8d056a0e9dce8686ccffc1620619a582277074619a403943f335fda9a8935831d913a21e426e4fa488eb2f40ab7cecd0c1fe749a57b8b85995ed8

data/README.md

@@ -84,20 +84,22 @@ Debug output contains request headers and bodies, which include carrier credenti
 
 The client uses conditional requests: it sends `If-None-Match` and `If-Modified-Since` and reuses the cached body when the carrier replies `304 Not Modified`.
 
-By default, the client keeps cached responses in an in-process `ActiveSupport::Cache::MemoryStore`. To share the cache between processes, set your own backend at boot. The backend must respond to `read`, `write`, and `delete_matched`, like `ActiveSupport::Cache::Store`.
+FreightKit keeps cached data, such as HTTP responses, in `FreightKit.cache`. By default, this is an in-process `ActiveSupport::Cache::MemoryStore`. To share the cache between processes, set your own backend at boot. The backend must respond to `read`, `write`, `fetch`, and `delete_matched`, like `ActiveSupport::Cache::Store`.
 
 In Rails, add this line to an initializer:
 
 ```ruby
-FreightKit::HTTPClient.cache = Rails.cache
+FreightKit.cache = Rails.cache
 ```
 
 In Hanami or plain Ruby, give any compatible store:
 
 ```ruby
-FreightKit::HTTPClient.cache = ActiveSupport::Cache::RedisCacheStore.new(url: ENV.fetch('REDIS_URL'))
+FreightKit.cache = ActiveSupport::Cache::RedisCacheStore.new(url: ENV.fetch('REDIS_URL'))
 ```
 
+To use a different store for HTTP responses only, set `FreightKit::HTTPClient.cache`.
+
 Cache entries contain carrier response bodies. Use a backend that you trust with that data. Keys are SHA-256 digests of the method, the URL, and all request headers. Requests with different credentials thus never share an entry. To turn off the cache, set `ActiveSupport::Cache::NullStore.new`.
 
 ## Standard Usage

data/Rakefile

@@ -1,6 +1,4 @@
 desc 'Load FreightKit'
-task(:environment) do
-  require_relative 'lib/freight_kit'
-end
+task(:environment) { require_relative 'lib/freight_kit' }
 
 Dir[File.expand_path('tasks/*.rake', __dir__)].each { |task| import(task) }

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/freight_kit.gemspec

@@ -4,27 +4,14 @@ Gem::Specification.new do |spec|
   spec.name = 'freight_kit'
   spec.version = version
 
-  spec.authors = [
-    'Third Party Transportation Systems LLC',
-    'Brody Hoskins',
-    'Sub Pop Records',
-    'Shopify'
-  ]
-  spec.email = [
-    'hello@next-tms.com',
-    'brody@brody.digital',
-    'webmaster@subpop.com',
-    'integrations-team@shopify.com'
-  ]
+  spec.authors = ['Third Party Transportation Systems LLC', 'Brody Hoskins', 'Sub Pop Records', 'Shopify']
+  spec.email = ['hello@next-tms.com', 'brody@brody.digital', 'webmaster@subpop.com', 'integrations-team@shopify.com']
 
   spec.description = 'Freight carrier API and website abstraction library for transportation management systems (TMS)'
   spec.homepage = 'https://github.com/next-tms/freight_kit'
   spec.summary = spec.description
 
-  spec.files = Dir['[A-Z]*'] +
-               Dir['configuration/*/*.yml'] +
-               Dir['lib/**/*'] +
-               Dir['test/**/*']
+  spec.files = Dir['[A-Z]*'] + Dir['configuration/*/*.yml'] + Dir['lib/**/*'] + Dir['schemas/*'] + Dir['test/**/*']
   spec.require_paths = ['lib']
 
   spec.add_development_dependency('faker', '~> 3.8.0')
@@ -41,14 +28,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency('brotli', '>= 0.9.2', '< 1') # CVE-2026-111497
   spec.add_dependency('business_time', '~> 0.13.0')
   spec.add_dependency('countries', '~> 8.1')
-  spec.add_dependency('httpx', '>= 1.9.0', '< 2')
+  spec.add_dependency('graphql', '>= 2.0', '< 3') # Next TMS
+  spec.add_dependency('graphql-client', '>= 0.23.0', '< 1') # Next TMS
+  spec.add_dependency('httpx', '>= 1.9.0', '!= 1.9.1', '< 2') # 1.9.1: https://github.com/HoneyryderChuck/httpx/issues/162
   spec.add_dependency('json', '< 3') # measured
-  spec.add_dependency('measured', '>= 2.0', '< 3.2.2')
+  spec.add_dependency('measured', '>= 2.0', '< 3.2.3')
   spec.add_dependency('mimemagic', '~> 0.4.3')
   spec.add_dependency('multi_xml', '>= 0.9.1', '< 1')
   spec.add_dependency('nokogiri', '>= 1.6', '< 1.20')
   spec.add_dependency('place_kit', '~> 0.0.6')
-  spec.add_dependency('savon', '>= 2.17', '< 2.18')
+  spec.add_dependency('savon', '>= 2.17', '< 2.19')
   spec.add_dependency('StreetAddress', '~> 2.0')
   spec.add_dependency('tzinfo-data', '~> 1.2023', '>= 1.2023.3')
   spec.add_dependency('watir', '>= 7.0', '< 7.4')

data/lib/freight_kit/address_normalizer.rb

@@ -17,9 +17,7 @@ module FreightKit
         words = words.take_while { |word| UNIT_DESIGNATORS.exclude?(word) }
         return unless words.first&.match?(/\d/)
 
-        words.map do |word|
-          StreetAddress::US::DIRECTIONAL[word]&.downcase || StreetAddress::US::STREET_TYPES[word] || word
-        end.join(' ')
+        words.map { |word| StreetAddress::US::DIRECTIONAL[word]&.downcase || StreetAddress::US::STREET_TYPES[word] || word }.join(' ')
       end
     end
   end

data/lib/freight_kit/api_clients/soap_client.rb

@@ -1,14 +1,18 @@
 module FreightKit
   class SoapClient
     API_EXCEPTIONS = [
-      Savon::HTTPError,
-      Net::ReadTimeout,
-      Net::OpenTimeout,
       Errno::ECONNREFUSED,
       Errno::ECONNRESET,
-      Errno::EHOSTUNREACH
+      Errno::EHOSTUNREACH,
+      HTTPX::ConnectionError,
+      HTTPX::TimeoutError,
+      Savon::HTTPError
     ].freeze
 
+    WSDL_CACHE_HEADERS = ['cache-control', 'etag', 'expires', 'last-modified'].freeze
+    WSDL_EXPIRES_IN = 1.day
+    WSDL_NAMESPACE = 'freight_kit/soap_client/wsdl'.freeze
+
     def initialize(carrier:, action:, client_args:, call_args:, soap_operation:)
       @carrier = carrier
       @action = action
@@ -26,7 +30,7 @@ module FreightKit
       # For testing and debugging
       # client_args.merge!(log: true, pretty_print_xml: true)
 
-      Savon.client(**client_args).call(soap_operation, **call_args).body
+      Savon.client(**savon_args).call(soap_operation, **call_args).body
     rescue *api_exceptions => e
       response = build_response_class(action:)
       response.error = ResponseError.new("Network Error: #{e}")
@@ -64,5 +68,26 @@ module FreightKit
       when :pickup then PickupResponse.new(request:, response: nil)
       end
     end
+
+    def fetch_wsdl(url)
+      key = "#{WSDL_NAMESPACE}/#{Digest::SHA256.hexdigest(url)}"
+      cached = FreightKit.cache.read(key)
+      return cached if cached
+
+      response = HTTPClient.get(url)
+      raise Wasabi::Resolver::HTTPError.new("Error: #{response.code} for url #{url}", response) unless (200..299).cover?(response.code)
+
+      if WSDL_CACHE_HEADERS.none? { |field| response.headers.key?(field) }
+        FreightKit.cache.write(key, response.body, expires_in: WSDL_EXPIRES_IN)
+      end
+
+      response.body
+    end
+
+    def savon_args
+      args = client_args.merge(adapter: HTTPClient::HTTPIAdapter::NAME)
+      args[:wsdl] = fetch_wsdl(args[:wsdl]) if args[:wsdl].to_s.match?(%r{\Ahttps?://})
+      args
+    end
   end
 end

data/lib/freight_kit/carrier.rb

@@ -72,10 +72,7 @@ module FreightKit
       # @param package [FreightKit::Package]
       # @return [Measured::Length]
       def longest_dimension(package)
-        [
-          Measured::Length.new(package.length(:inches), :inches),
-          Measured::Length.new(package.width(:inches), :inches)
-        ].max
+        [Measured::Length.new(package.length(:inches), :inches), Measured::Length.new(package.width(:inches), :inches)].max
       end
 
       # FreightKit accessorials the carrier prices, mapped to the carrier's codes.
@@ -254,9 +251,7 @@ module FreightKit
             [package.height(:inches), package.length(:inches), package.width(:inches)].any?(&:zero?)
           end
 
-          uncovered_overlength = packages.any? do |package|
-            overlength?(package) && overlength_rule_for(tariff, package).nil?
-          end
+          uncovered_overlength = packages.any? { |package| overlength?(package) && overlength_rule_for(tariff, package).nil? }
 
           if missing_dimensions
             message << 'item dimensions are required'
@@ -432,6 +427,10 @@ module FreightKit
 
     protected
 
+    # Proxy for HTTP requests, from the optional `:api_proxy` credential.
+    # @return [String|NilClass]
+    def proxy_url = fetch_credential(:api_proxy)&.proxy_url
+
     # Use after building the request to save for later inspection.
     # @return [void]
     def save_request(request) = @last_request = request

data/lib/freight_kit/carriers/abf_freight_system.rb

@@ -32,9 +32,7 @@ module FreightKit
         def scac = 'ABFS'
 
         def serviceable_accessorials?(accessorials)
-          unsupported_accessorials = unserviceable_accessorials.select do |key|
-            accessorials.include?(key)
-          end.sort!
+          unsupported_accessorials = unserviceable_accessorials.select { |key| accessorials.include?(key) }.sort!
 
           message = "#{unsupported_accessorials.join(', ')} unserviceable"
           raise FreightKit::UnserviceableError, message if unsupported_accessorials.any?
@@ -105,9 +103,7 @@ module FreightKit
           # query params
           raise FreightKit::UnserviceableError, 'Too many packages' if packages.count > 15
 
-          unsupported_packaging_types = packages.map(&:packaging).map(&:type).select do |type|
-            PACKAGE_TYPES.keys.exclude?(type)
-          end.sort!
+          unsupported_packaging_types = packages.map(&:packaging).map(&:type).select { |type| PACKAGE_TYPES.keys.exclude?(type) }.sort!
 
           message = "#{unsupported_packaging_types.join(', ').upcase_first} unserviceable"
           raise FreightKit::UnserviceableError, message if unsupported_packaging_types.any?
@@ -305,9 +301,7 @@ module FreightKit
         end
 
         other_options = {}.tap do |builder|
-          alpha2_codes = [shipment.destination.country, shipment.origin.country].map do |country|
-            country.code(:alpha2).value
-          end
+          alpha2_codes = [shipment.destination.country, shipment.origin.country].map { |country| country.code(:alpha2).value }
 
           builder['Acc_ARR'] = 'Y' if shipment.accessorials.include?(:appointment_delivery)
 
@@ -329,25 +323,15 @@ module FreightKit
           builder['Acc_HAZ'] = 'Y' if shipment.packages.any?(&:hazmat?)
           builder['Acc_PALLET'] = 'Y' if shipment.packages.map(&:packaging).all?(&:pallet?)
 
-          unless shipment.accessorials.intersect?(%i[
-                                                    church_pickup
-                                                    inside_pickup
-                                                    liftgate_pickup
-                                                    residential_pickup
-                                                    restaurant_pickup
-                                                  ])
+          unless shipment.accessorials.intersect?(%i[church_pickup inside_pickup liftgate_pickup residential_pickup restaurant_pickup])
             builder['Acc_SL'] = 'Y'
           end
 
           builder['Acc_SS'] = 'Y'
 
-          longest_dimension_in = if shipment.packages.all? do |package|
-                                      package.length(:inch).present? && package.width(:inch).present?
-                                    end
+          longest_dimension_in = if shipment.packages.all? { |package| package.length(:inch).present? && package.width(:inch).present? }
 
-                                   shipment.packages.map do |package|
-                                     [package.length(:in), package.width(:in)].max
-                                   end.max.ceil
+                                   shipment.packages.map { |package| [package.length(:in), package.width(:in)].max }.max.ceil
                                  end
 
           if longest_dimension_in.present?
@@ -367,8 +351,7 @@ module FreightKit
           end
         end
 
-        params = [account, commodities, consignee, delivery, other_options, pickup, shipper, specifics, third_party]
-                 .reduce({}, :merge)
+        params = [account, commodities, consignee, delivery, other_options, pickup, shipper, specifics, third_party].reduce({}, :merge)
 
         build_request(:rates, { params: })
       end
@@ -394,9 +377,9 @@ module FreightKit
         url = request[:url]
 
         response = if method == :post
-                     HTTPClient.post(url, headers:, body:)
+                     HTTPClient.post(url, headers:, body:, proxy_url:)
                    else
-                     HTTPClient.get(url, headers:)
+                     HTTPClient.get(url, headers:, proxy_url:)
                    end
 
         response.deep_transform_keys! { |key| key.downcase.to_sym }[:abf] if response&.parsed_response

data/lib/freight_kit/carriers/aloha_freight_forwarders.rb

@@ -17,11 +17,7 @@ module FreightKit
 
         def contacts
           [
-            Contact.new(
-              department: 'Rating',
-              email: 'rates@alohafreight.com',
-              id: '5de89baa-e0df-4374-a3be-018251dd6f4e'
-            )
+            Contact.new(department: 'Rating', email: 'rates@alohafreight.com', id: '5de89baa-e0df-4374-a3be-018251dd6f4e')
           ]
         end
 

data/lib/freight_kit/carriers/amado_trucking.rb

@@ -4,11 +4,7 @@ module FreightKit
       class << self
         def contacts
           [
-            Contact.new(
-              department: 'Dispatch',
-              email: 'la.dispatch@amadotrucking.com',
-              id: 'c5dab2fd-b178-41f7-bc2b-3f53f8717c01'
-            )
+            Contact.new(department: 'Dispatch', email: 'la.dispatch@amadotrucking.com', id: 'c5dab2fd-b178-41f7-bc2b-3f53f8717c01')
           ]
         end
 

data/lib/freight_kit/carriers/clear_lane_freight_systems.rb

@@ -274,9 +274,7 @@ module FreightKit
       end
 
       def parse_amount(amount)
-        ['$', ','].each do |char|
-          amount = amount.sub(char, '')
-        end
+        ['$', ','].each { |char| amount = amount.sub(char, '') }
 
         return 0 if amount.blank?
 
@@ -312,13 +310,10 @@ module FreightKit
 
         # Hack to get around JavaScript messing up our input
         sleep(1)
-        from.chars.each do |char|
-          browser.text_field(name: 'txtFromDate').append(char)
-        end
+        from.chars.each { |char| browser.text_field(name: 'txtFromDate').append(char) }
 
         browser.text_field(name: 'txtToDate').click
-        browser.element(xpath: '/html/body/form/div[3]/div[4]/div[3]/div[2]/div/div/div[3]/div').wait_until(&:present?)
-               .click
+        browser.element(xpath: '/html/body/form/div[3]/div[4]/div[3]/div[2]/div/div/div[3]/div').wait_until(&:present?).click
 
         browser.button(name: 'btnSubmit').click
 
@@ -335,9 +330,7 @@ module FreightKit
           return document_response
         end
 
-        browser.element(xpath: '/html/body/form/div[3]/div[4]/div[8]/div/table/tbody/tr/td[12]/a')
-               .wait_until(&:present?)
-               .click
+        browser.element(xpath: '/html/body/form/div[3]/div[4]/div[8]/div/table/tbody/tr/td[12]/a').wait_until(&:present?).click
 
         browser.switch_window
 
@@ -376,7 +369,7 @@ module FreightKit
         document_response.request = URI.parse(url)
 
         begin
-          response = HTTPClient.get(url)
+          response = HTTPClient.get(url, proxy_url:)
         rescue StandardError => e
           document_response.error = e
           return document_response
@@ -409,9 +402,7 @@ module FreightKit
 
         if error.present?
           if error.include?('do not service this lane')
-            rate_response.error = UnserviceableError.new(
-              'Incorrect ZIP code or no service available at origin and/or destination'
-            )
+            rate_response.error = UnserviceableError.new('Incorrect ZIP code or no service available at origin and/or destination')
             return rate_response
           end
 

data/lib/freight_kit/carriers/cpl_express.rb

@@ -4,11 +4,7 @@ module FreightKit
       class << self
         def contacts
           [
-            Contact.new(
-              department: 'Dispatch',
-              email: 'dispatch@cplexpress.com',
-              id: 'ba43e014-2e59-43d6-8f39-acb80128b8c9'
-            ),
+            Contact.new(department: 'Dispatch', email: 'dispatch@cplexpress.com', id: 'ba43e014-2e59-43d6-8f39-acb80128b8c9'),
             Contact.new(department: 'Main', id: 'a7daa1e5-4abb-48de-9893-493e91806a83', phone: '+13104189008')
           ]
         end

data/lib/freight_kit/carriers/cross_country_freight_solutions.rb

@@ -128,7 +128,7 @@ module FreightKit
         def minimum_length_for_overlength_fees = Measured::Length.new(6, :feet)
         def name = 'CrossCountry Freight Solutions'
         def overlength_fees_require_tariff? = false
-        def required_credential_types = %i[api_key api_proxy]
+        def required_credential_types = %i[api_key]
         def requirements = %i[credentials]
         def scac = 'CCYQ'
         def unquotable_accessorials = %i[athletic_facility_delivery dock_dropoff dock_pickup]
@@ -174,9 +174,7 @@ module FreightKit
 
           next if longest_dimension < 96
 
-          package.quantity.times do
-            accessorials << { Code: 'EXLEN', Factor: longest_dimension }
-          end
+          package.quantity.times { accessorials << { Code: 'EXLEN', Factor: longest_dimension } }
         end
 
         shipment.accessorials.map do |accessorial|
@@ -266,16 +264,8 @@ module FreightKit
 
       def build_request(action, body: {}, query: {})
         api_key = fetch_credential(:api_key).api_key
-        proxy_url = fetch_credential(:api_proxy).proxy_url
-
-        request = {
-          url: build_url(action),
-          headers: { APIKEY: api_key },
-          method: API.dig(:methods, action),
-          body:,
-          query:,
-          proxy_url:
-        }.compact
+
+        request = { url: build_url(action), headers: { APIKEY: api_key }, method: API.dig(:methods, action), body:, query: }.compact
 
         save_request(request)
         request
@@ -291,7 +281,7 @@ module FreightKit
           headers: request[:headers].merge(JSON_HEADERS),
           body: request[:body],
           query: request[:query],
-          proxy: request[:proxy_url]
+          proxy_url:
         )
 
         unless response.code == 200
@@ -377,8 +367,7 @@ module FreightKit
         expires_at = ::Time.iso8601(response['QuoteExpiryDate'])
 
         transit_days = (
-          ::Time.iso8601(response['EarliestDeliveryDate']).to_date -
-          ::Time.iso8601(response['PickupDate']).to_date
+          ::Time.iso8601(response['EarliestDeliveryDate']).to_date - ::Time.iso8601(response['PickupDate']).to_date
         ).to_i
 
         prices = []

data/lib/freight_kit/carriers/dependable_highway_express.rb

@@ -155,10 +155,7 @@ module FreightKit
         },
         use_ssl: { rates: false, track: false }
       }.freeze
-      CITY_STATES = {
-        ca: ['Los Angeles', 'Mammoth Lakes', 'Sacramento', 'Redding', 'West Sacramento'],
-        nv: ['Reno', 'Sparks']
-      }.freeze
+      CITY_STATES = { ca: ['Los Angeles', 'Mammoth Lakes', 'Sacramento', 'Redding', 'West Sacramento'], nv: ['Reno', 'Sparks'] }.freeze
       EVENTS = {
         types: {
           arrived_at_terminal: 'linehaul arrived',
@@ -180,8 +177,7 @@ module FreightKit
         country_codes = [shipment.destination.country.code(:alpha2).value, shipment.origin.country.code(:alpha2).value]
 
         if country_codes.reject { |c| c.upcase == 'US' }.any?
-          raise UnserviceableError,
-                "No service from #{shipment.origin.postal_code} to #{shipment.destination.postal_code}"
+          raise UnserviceableError, "No service from #{shipment.origin.postal_code} to #{shipment.destination.postal_code}"
         end
 
         accessorials = []
@@ -262,9 +258,7 @@ module FreightKit
       def parse_amount(amount)
         negative = amount.include?('(') && amount.include?(')')
 
-        ['$', ',', '(', ')'].each do |char|
-          amount = amount.sub(char, '')
-        end
+        ['$', ',', '(', ')'].each { |char| amount = amount.sub(char, '') }
 
         return 0 if amount.blank?
 
@@ -333,8 +327,7 @@ module FreightKit
         browser.button(name: 'ctl00$ContentPlaceHolder1$btnSubmit').click
 
         begin
-          browser.element(xpath: '//*[@id="ContentPlaceHolder1_GridView1"]/tbody/tr[2]/td[2]/a')
-                 .click
+          browser.element(xpath: '//*[@id="ContentPlaceHolder1_GridView1"]/tbody/tr[2]/td[2]/a').click
         rescue Watir::Exception::UnknownObjectException
           document_response.error = DocumentNotFoundError.new
           return document_response
@@ -373,7 +366,7 @@ module FreightKit
         document_response.request = URI.parse(url)
 
         begin
-          response = HTTPClient.get(url)
+          response = HTTPClient.get(url, proxy_url:)
         rescue StandardError => e
           document_response.error = e
           return document_response
@@ -438,12 +431,7 @@ module FreightKit
 
         prices = []
 
-        shipment_details = response.dig(
-          :get_rates_response,
-          :get_rates_result,
-          :shipment_detail_response,
-          :shipment_detail_row
-        )
+        shipment_details = response.dig(:get_rates_response, :get_rates_result, :shipment_detail_response, :shipment_detail_row)
 
         shipment_details.each do |shipment_detail|
           next if shipment_detail[:charge].blank?

data/lib/freight_kit/carriers/forward_air.rb

@@ -316,22 +316,14 @@ module FreightKit
       end
 
       def build_document_request(doc_id:, tracking_number:)
-        request = {
-          url: build_url(:document, doc_id:, tracking_number:),
-          headers: build_headers,
-          method: API.dig(:methods, :documents)
-        }
+        request = { url: build_url(:document, doc_id:, tracking_number:), headers: build_headers, method: API.dig(:methods, :documents) }
 
         save_request(request)
         request
       end
 
       def build_documents_request(tracking_number)
-        request = {
-          url: build_url(:documents, tracking_number:),
-          headers: build_headers,
-          method: API.dig(:methods, :documents)
-        }
+        request = { url: build_url(:documents, tracking_number:), headers: build_headers, method: API.dig(:methods, :documents) }
 
         save_request(request)
         request
@@ -570,9 +562,9 @@ module FreightKit
 
         response = case method
                    when :post
-                     HTTPClient.post(url, headers:, body:)
+                     HTTPClient.post(url, headers:, body:, proxy_url:)
                    else
-                     HTTPClient.get(url, headers:)
+                     HTTPClient.get(url, headers:, proxy_url:)
                    end
 
         if (200..299).exclude?(response.code)

data/lib/freight_kit/carriers/on_trac.rb

@@ -155,29 +155,11 @@ module FreightKit
         service:,
         shipment:
       )
-        request = build_shipment_request(
-          delivery_from:,
-          delivery_to:,
-          dispatcher:,
-          pickup_from:,
-          pickup_to:,
-          scac:,
-          service:,
-          shipment:
-        )
+        request = build_shipment_request(delivery_from:, delivery_to:, dispatcher:, pickup_from:, pickup_to:, scac:, service:, shipment:)
 
         labels = parse_shipment_response(commit(request))
 
-        request = build_pickup_request(
-          delivery_from:,
-          delivery_to:,
-          dispatcher:,
-          pickup_from:,
-          pickup_to:,
-          scac:,
-          service:,
-          shipment:
-        )
+        request = build_pickup_request(delivery_from:, delivery_to:, dispatcher:, pickup_from:, pickup_to:, scac:, service:, shipment:)
 
         parse_pickup_response(response: commit(request), labels:)
       end
@@ -417,9 +399,9 @@ module FreightKit
 
         response = case method
                    when :post
-                     HTTPClient.post(url, headers:, body:)
+                     HTTPClient.post(url, headers:, body:, proxy_url:)
                    else
-                     HTTPClient.get(url, headers:)
+                     HTTPClient.get(url, headers:, proxy_url:)
                    end
 
         response.parsed_response if response&.parsed_response
@@ -487,8 +469,8 @@ module FreightKit
         prices = []
         transit_days = nil
 
-        api_shipments = response.dig('OnTracRateResponse', 'Shipments', 'Shipment')
-        api_shipments = [api_shipments] unless api_shipments.is_a?(Array)
+        api_shipments = Array.wrap(response.dig('OnTracRateResponse', 'Shipments', 'Shipment'))
+        return rate_response.tap { |item| item.error = ResponseError.new('API Error: Blank shipment') } if api_shipments.empty?
 
         if api_shipments.any? { |api_shipment| api_shipment['Error']&.downcase&.include?('not serviced') }
           rate_response.error = UnserviceableError.new
@@ -546,7 +528,7 @@ module FreightKit
         end
 
         api_shipments = response.dig('OnTracShipmentResponse', 'Shipments', 'Shipment')
-        api_shipments = [api_shipments] unless api_shipments.is_a?(Array)
+        api_shipments = Array.wrap(api_shipments)
 
         base64_labels = api_shipments&.map { |s| s['Label'] }
         raise FreightKit::ResponseError, 'API Error: Blank label' if base64_labels.blank?

data/lib/freight_kit/carriers/peninsula_truck_lines.rb

@@ -100,21 +100,13 @@ module FreightKit
 
         call_args = { message: request }
 
-        ::FreightKit::SoapClient.new(
-          carrier: self,
-          action:,
-          client_args:,
-          call_args:,
-          soap_operation: API.dig(:actions, action)
-        ).call
+        ::FreightKit::SoapClient.new(carrier: self, action:, client_args:, call_args:, soap_operation: API.dig(:actions, action)).call
       end
 
       def parse_amount(amount)
         negative = amount.start_with?('-$') || amount.start_with?('-')
 
-        ['$', '-', ','].each do |char|
-          amount = amount.sub(char, '')
-        end
+        ['$', '-', ','].each { |char| amount = amount.sub(char, '') }
 
         return 0 if amount.blank?
 
@@ -182,17 +174,9 @@ module FreightKit
           )
         end
 
-        prices << Price.new(
-          blame: :api,
-          cents: parse_amount(result.dig(:quote, :discount_amount)),
-          description: 'Discount'
-        )
+        prices << Price.new(blame: :api, cents: parse_amount(result.dig(:quote, :discount_amount)), description: 'Discount')
 
-        prices << Price.new(
-          blame: :api,
-          cents: parse_amount(result.dig(:quote, :fsc_amount)),
-          description: 'Fuel surcharge'
-        )
+        prices << Price.new(blame: :api, cents: parse_amount(result.dig(:quote, :fsc_amount)), description: 'Fuel surcharge')
 
         rate = Rate.new(
           carrier: self,