freight_kit 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a406cb84bd27793e12873104e9651751eeae80b471f4f9f3f03253e6a87608
-  data.tar.gz: 32e26ef8e56aceb725c241d360826eaec666f780b0dd48b587b25979d6848fb8
+  metadata.gz: 1e392cefbfa1b1c12e4d2e621d8d0dc1494c2430e5e0a09a7be19988160451d7
+  data.tar.gz: df5d3d666b1a2451743785fdb49d5e122bde1976213bd4d815b340ff3554e936
 SHA512:
-  metadata.gz: 42b08cceb7e17d62591c6bfd1f9c03150ac7c314787daabe563ca509ce87aba3382567c97f069d6dc96927de1b06d075c7925a2eb9c510ccfc675b7769fb26b2
-  data.tar.gz: 9ce954dd5948deb22a460910264e99cabb06f3b810f254a7aea32af79273bb7d4f4919ac60ddbe1ce76c299c2048a44bf8ccada188864e093ceacea59593e1a0
+  metadata.gz: 40759f132709d80e55ee140e8b95bcaa91d0f625a850ccc54d517ba38c068021b75844d42faa6bc4cd2f88ce1acb0affa0725174a4698da705a092faf1da4aa0
+  data.tar.gz: 7f4b01a90b460b075540b987973635fa9ea6e60c0fd740faad5e8de5f4d455922829382fe76341fe61fc9603f5c9c0f5087f791748046fbbd261779da5c40571

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    freight_kit (0.1.17)
+    freight_kit (0.1.19)
       active_utils (>= 3.3.1, < 3.7.0)
-      activemodel (>= 7.1, < 8.1.4)
-      activesupport (>= 7.1, < 8.1.4)
+      activemodel (>= 7.1, < 8.1.5)
+      activesupport (>= 7.1, < 8.1.5)
       benchmark (~> 0.5.0)
       business_time (~> 0.13.0)
       httparty (~> 0.10)
@@ -12,11 +12,10 @@ PATH
       mimemagic (~> 0.4.3)
       nokogiri (>= 1.6, < 1.20)
       place_kit (~> 0.0.6)
-      rmagick (>= 4.2.5, < 7.1.0)
       savon (>= 2.17, < 2.18)
       tzinfo-data (~> 1.2023, >= 1.2023.3)
       watir (>= 7.0, < 7.4)
-      zeitwerk (>= 2.6.0, < 2.8.3)
+      zeitwerk (>= 2.6.0, < 2.8.4)
 
 GEM
   remote: https://rubygems.org/
@@ -39,20 +38,21 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    akami (1.3.1)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    akami (1.3.3)
+      base64
       gyoku (>= 0.4.0)
       nokogiri
-    ast (2.4.3)
+    ast (2.4.2)
     base64 (0.3.0)
     benchmark (0.5.0)
-    bigdecimal (4.1.2)
-    builder (3.2.4)
+    bigdecimal (3.3.1)
+    builder (3.3.0)
     business_time (0.13.0)
       activesupport (>= 3.2.0)
       tzinfo
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     csv (3.3.5)
     date (3.5.1)
@@ -60,7 +60,7 @@ GEM
     drb (2.2.3)
     faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.3)
+    faraday (2.14.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -77,12 +77,12 @@ GEM
       mutex_m
       nkf
       rack (>= 2.0, < 4)
-    i18n (1.14.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.21.1)
-    language_server-protocol (3.17.0.6)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
     logger (1.7.0)
-    mail (2.9.1)
+    mail (2.9.0)
       logger
       mini_mime (>= 0.1.1)
       net-imap
@@ -94,13 +94,15 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
-    minitest (5.15.0)
-    multi_xml (0.6.0)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     mutex_m (0.3.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4.1)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -109,32 +111,27 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nkf (0.3.0)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nkf (0.2.0)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nori (2.6.0)
-    observer (0.1.2)
-    parallel (1.28.0)
-    parser (3.3.12.0)
+    nori (2.7.1)
+      bigdecimal
+    parallel (1.25.1)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
-    pkg-config (1.6.5)
     place_kit (0.0.6)
       activesupport (>= 7.1, < 8.1.4)
       csv (~> 3.3)
     prism (1.9.0)
-    public_suffix (5.0.3)
-    racc (1.7.1)
-    rack (3.0.8)
+    public_suffix (7.0.5)
+    racc (1.8.1)
+    rack (3.2.6)
     rainbow (3.1.1)
     rake (13.4.2)
     redcarpet (3.6.0)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rmagick (7.0.5)
-      observer (~> 0.1)
-      pkg-config (~> 1.4)
+    regexp_parser (2.9.0)
+    rexml (3.4.4)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -159,11 +156,10 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.50.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    rubocop-graphql (1.5.4)
-      rubocop (>= 1.50, < 2)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-graphql (1.5.2)
+      rubocop (>= 0.90, < 2)
     rubocop-next (1.0.7)
       rubocop (>= 1.56, < 1.65)
       rubocop-graphql (>= 1.4, < 1.6)
@@ -171,14 +167,14 @@ GEM
       rubocop-rake (~> 0.6.0)
       rubocop-rspec (>= 2.23.2, < 3.1.0)
       rubocop-shopify (>= 2.14, < 2.16)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.5)
+    rubocop-rspec (3.0.1)
       rubocop (~> 1.61)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
@@ -194,31 +190,34 @@ GEM
       nori (~> 2.4)
       wasabi (>= 5.1.0, < 6)
     securerandom (0.4.1)
-    selenium-webdriver (4.12.0)
+    selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     timeout (0.6.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (2.5.0)
     uri (1.1.1)
     wasabi (5.1.0)
       addressable
       faraday (>= 1.9, < 3)
       nokogiri (>= 1.13.9)
-    watir (7.1.0)
+    watir (7.3.0)
       regexp_parser (>= 1.2, < 3)
-      selenium-webdriver (~> 4.0)
-    websocket (1.2.9)
+      selenium-webdriver (~> 4.2)
+    websocket (1.2.10)
     yard (0.9.34)
-    zeitwerk (2.8.2)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
+  arm64-darwin-24
   arm64-darwin-25
+  arm64-darwin-27
 
 DEPENDENCIES
   faker (~> 3.8.0)
@@ -230,4 +229,4 @@ DEPENDENCIES
   yard (~> 0.9.28)
 
 BUNDLED WITH
-   2.4.19
+  4.0.23

data/README.md

@@ -65,6 +65,42 @@ Or standalone:
 $ gem install freight_kit
 ```
 
+## HTTP Client
+
+FreightKit sends HTTP requests through `FreightKit::HTTPClient`, a wrapper around HTTPX. The client keeps connections open between requests, and it reuses HTTP/2 connections. If a connection fails, the client retries only idempotent requests, such as GET. It never retries a POST, because the carrier can already have processed it. The client asks carriers for Brotli, Zstandard, gzip, and deflate compression.
+
+### Logging
+
+The client writes request and response details at the debug level. By default it uses `Rails.logger`, or the Hanami app logger. Outside Rails and Hanami, it logs to standard output at the level in the `LOG_LEVEL` environment variable. The default level is `info`.
+
+To use a different logger, set it at boot:
+
+```ruby
+FreightKit::HTTPClient.logger = Logger.new($stdout, level: :debug)
+```
+
+Debug output contains request headers and bodies, which include carrier credentials. Do not use the debug level in production.
+
+### Cache
+
+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`.
+
+In Rails, add this line to an initializer:
+
+```ruby
+FreightKit::HTTPClient.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'))
+```
+
+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
 
 Start off by initializing a `Carrier`:

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/freight_kit.gemspec

@@ -33,24 +33,27 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake', '~> 13.4.2')
   spec.add_development_dependency('redcarpet', '~> 3.6.0') # for yard
   spec.add_development_dependency('rspec', '~> 3.12')
-  spec.add_development_dependency('rubocop-next', '~> 1.0.7')
+  spec.add_development_dependency('rubocop-next', '~> 1.0.8')
   spec.add_development_dependency('yard', '~> 0.9.28')
 
-  spec.add_dependency('activemodel', '>= 7.1', '< 8.1.4')
-  spec.add_dependency('activesupport', '>= 7.1', '< 8.1.4')
+  spec.add_dependency('activemodel', '>= 7.1', '< 8.1.5')
+  spec.add_dependency('activesupport', '>= 7.1', '< 8.1.5')
   spec.add_dependency('active_utils', '>= 3.3.1', '< 3.7.0')
   spec.add_dependency('benchmark', '~> 0.5.0')
+  spec.add_dependency('brotli', '>= 0.9.2', '< 1') # CVE-2026-111497
   spec.add_dependency('business_time', '~> 0.13.0')
-  spec.add_dependency('httparty', '~> 0.10')
+  spec.add_dependency('httpx', '>= 1.9.0', '< 2')
+  spec.add_dependency('json', '< 3') # measured
   spec.add_dependency('measured', '>= 2.0', '< 3.2.2')
   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('rmagick', '>= 4.2.5', '< 7.2.0')
   spec.add_dependency('savon', '>= 2.17', '< 2.18')
   spec.add_dependency('tzinfo-data', '~> 1.2023', '>= 1.2023.3')
   spec.add_dependency('watir', '>= 7.0', '< 7.4')
   spec.add_dependency('zeitwerk', '>= 2.6.0', '< 2.8.4')
+  spec.add_dependency('zstd-ruby', '>= 2.0.10', '< 3') # bundles libzstd >= 1.5.4 (CVE-2022-4899)
 
-  spec.required_ruby_version = '>= 3.2.0'
+  spec.required_ruby_version = '>= 3.3.0'
 end

data/lib/freight_kit/carriers/abfs.rb

@@ -124,9 +124,9 @@ module FreightKit
       url = request[:url]
 
       response = if method == :post
-                   HTTParty.post(url, headers:, body:, debug_output: $stdout)
+                   HTTPClient.post(url, headers:, body:)
                  else
-                   HTTParty.get(url, headers:, debug_output: $stdout)
+                   HTTPClient.get(url, headers:)
                  end
 
       response.deep_transform_keys! { |key| key.downcase.to_sym }[:abf] if response&.parsed_response

data/lib/freight_kit/carriers/ccyq.rb

@@ -63,19 +63,13 @@ module FreightKit
     end
 
     def commit(_action, request)
-      proxy_uri = URI.parse(request[:proxy_url])
-
-      response = HTTParty.send(
+      response = HTTPClient.request(
         request[:method],
         request[:url],
         headers: request[:headers].merge(JSON_HEADERS),
         body: request[:body],
         query: request[:query],
-        http_proxyaddr: proxy_uri.host,
-        http_proxyport: proxy_uri.port.to_s,
-        http_proxyuser: proxy_uri.user,
-        http_proxypass: proxy_uri.password,
-        debug_output: $stdout,
+        proxy: request[:proxy_url],
       )
 
       unless response.code == 200
@@ -154,7 +148,6 @@ module FreightKit
       service:,
       shipment:
     )
-
       dispatcher_phone = dispatcher.phone.delete('^0-9')
       receiver_phone = shipment.destination.contact.phone.delete('^0-9')
 

data/lib/freight_kit/carriers/clni.rb

@@ -199,7 +199,7 @@ module FreightKit
       sleep(50) # so Chrome can finish downloading, Selenoid default timeout is 60s
 
       download_url = "#{selenoid_credential.selenoid_options[:download_url]}/#{browser.driver.session_id}"
-      response = HTTParty.get("#{download_url}/?json")
+      response = HTTPClient.get("#{download_url}/?json")
 
       filename = URI.encode_www_form_component(JSON.parse(response.body)&.last)
       url = "#{download_url}/#{filename}"
@@ -207,7 +207,7 @@ module FreightKit
       document_response.request = URI.parse(url)
 
       begin
-        response = HTTParty.get(url)
+        response = HTTPClient.get(url)
       rescue StandardError => e
         document_response.error = e
         return document_response

data/lib/freight_kit/carriers/cnwy.rb

@@ -102,9 +102,9 @@ module FreightKit
 
       response = case method
                  when :post
-                   HTTParty.post(url, headers:, body:, debug_output: $stdout)
+                   HTTPClient.post(url, headers:, body:)
                  else
-                   HTTParty.get(url, headers:, debug_output: $stdout)
+                   HTTPClient.get(url, headers:)
                  end
 
       begin
@@ -292,7 +292,7 @@ module FreightKit
       days = if comment.blank?
                nil
              else
-               comment.match(/\d+ days/)&.to_s&.split(' days')&.first&.to_i
+               comment[/(\d+) days/, 1]&.to_i
              end
 
       expires_at = if days.is_a?(Integer) && days.positive?

data/lib/freight_kit/carriers/dphe.rb

@@ -165,7 +165,7 @@ module FreightKit
       sleep(10) # so Chrome can finish downloading
 
       download_url = "#{selenoid_credential.selenoid_options[:download_url]}/#{browser.driver.session_id}"
-      response = HTTParty.get("#{download_url}/?json")
+      response = HTTPClient.get("#{download_url}/?json")
 
       filename = URI.encode_www_form_component(JSON.parse(response.body)&.last)
       url = "#{download_url}/#{filename}"
@@ -173,7 +173,7 @@ module FreightKit
       document_response.request = URI.parse(url)
 
       begin
-        response = HTTParty.get(url)
+        response = HTTPClient.get(url)
       rescue StandardError => e
         document_response.error = e
         return document_response
@@ -223,11 +223,9 @@ module FreightKit
 
       accessorials = accessorials.uniq.join(',')
 
-      shipment_detail = []
-      shipment.packages.each do |package|
-        shipment_detail << [package.quantity, package.freight_class, package.pounds(:total)].join('|')
-      end
-      shipment_detail = shipment_detail.join('|')
+      shipment_detail = shipment.packages.map do |package|
+        [package.quantity, package.freight_class, package.pounds(:total)].join('|')
+      end.join('|')
 
       api_credentials = fetch_credential(:api)
 
@@ -386,7 +384,7 @@ module FreightKit
       country = ActiveUtils::Country.find('USA')
 
       shipper_location = Location.new(
-        address1: search_result[:shipperaddress]&.squish&.strip&.titleize,
+        address1: search_result[:shipperaddress]&.squish&.titleize,
         city: search_result[:shipper_city].squish.strip.titleize,
         province: search_result[:shipper_state].strip.upcase,
         postal_code: search_result[:shipper_zip].strip,
@@ -394,7 +392,7 @@ module FreightKit
       )
 
       receiver_location = Location.new(
-        address1: search_result[:consaddress]&.squish&.strip&.titleize,
+        address1: search_result[:consaddress]&.squish&.titleize,
         city: search_result[:cons_city].squish.strip.titleize,
         province: search_result[:cons_state].strip.upcase,
         postal_code: search_result[:cons_zip].strip,

data/lib/freight_kit/carriers/drrq.rb

@@ -126,9 +126,9 @@ module FreightKit
 
       case method
       when :post
-        HTTParty.post(url, headers:, body:)
+        HTTPClient.post(url, headers:, body:)
       else
-        HTTParty.get(url, headers:)
+        HTTPClient.get(url, headers:)
       end
     end
 
@@ -222,7 +222,8 @@ module FreightKit
       rescue Selenium::WebDriver::Error::UnexpectedAlertOpenError => e
         browser.close
 
-        message = e.message[/{(.*?)}/m, 1]&.split(':')&.last&.squish
+        message = e.message[/{(.*?)}/m, 1]&.split(':')&.last
+        message = message&.squish
 
         document_response.error = InvalidCredentialsError.new(message)
         return document_response
@@ -299,7 +300,7 @@ module FreightKit
       end
 
       begin
-        response = HTTParty.get(url)
+        response = HTTPClient.get(url)
       rescue StandardError => e
         document_response.error = e
         return document_response
@@ -472,20 +473,19 @@ module FreightKit
     def build_rate_request(shipment:)
       accessorials = build_accessorials(shipment:)
 
-      items = []
-      shipment.packages.each do |package|
-        items << {
-                   Name: package.description,
-                   FreightClass: package.freight_class.to_s,
-                   Weight: package.pounds(:total).ceil.to_s,
-                   WeightUnits: 'lb',
-                   Width: package.width(:in).ceil,
-                   Length: package.length(:in).ceil,
-                   Height: package.height(:in).ceil,
-                   DimensionUnits: 'in',
-                   Quantity: package.quantity,
-                   QuantityUnits: 'PLT' # Check this
-                 }
+      items = shipment.packages.map do |package|
+        {
+          Name: package.description,
+          FreightClass: package.freight_class.to_s,
+          Weight: package.pounds(:total).ceil.to_s,
+          WeightUnits: 'lb',
+          Width: package.width(:in).ceil,
+          Length: package.length(:in).ceil,
+          Height: package.height(:in).ceil,
+          DimensionUnits: 'in',
+          Quantity: package.quantity,
+          QuantityUnits: 'PLT' # Check this
+        }
       end
 
       pickup_event_date = shipment.pickup_at.date_time_with_zone

data/lib/freight_kit/carriers/fwda.rb

@@ -293,9 +293,9 @@ module FreightKit
 
       response = case method
                  when :post
-                   HTTParty.post(url, headers:, body:, debug_output: $stdout)
+                   HTTPClient.post(url, headers:, body:)
                  else
-                   HTTParty.get(url, headers:, debug_output: $stdout)
+                   HTTPClient.get(url, headers:)
                  end
 
       if (200..299).exclude?(response.code)
@@ -308,7 +308,7 @@ module FreightKit
         raise FreightKit::ResponseError, message
       end
 
-      return response if response.headers.content_type != 'application/json'
+      return response if response.content_type != 'application/json'
 
       json = JSON.parse(response.body)
       error = json.is_a?(Array) ? nil : json['errorMessage']

data/lib/freight_kit/carriers/otcl.rb

@@ -166,9 +166,9 @@ module FreightKit
 
       response = case method
                  when :post
-                   HTTParty.post(url, headers:, body:, debug_output: $stdout)
+                   HTTPClient.post(url, headers:, body:)
                  else
-                   HTTParty.get(url, headers:, debug_output: $stdout)
+                   HTTPClient.get(url, headers:)
                  end
 
       response.parsed_response if response&.parsed_response
@@ -201,7 +201,6 @@ module FreightKit
       service:,
       shipment:
     )
-
       dispatcher_phone = dispatcher.phone.sub('+1', '').delete('^0-9')
 
       raise UnserviceableError, 'Palletized freight unsupported' unless shipment.loose?
@@ -242,7 +241,6 @@ module FreightKit
       service:,
       shipment:
     )
-
       dispatcher_phone = dispatcher.phone.sub('+1', '').delete('^0-9')
       receiver_phone = shipment.destination.contact.phone.sub('+1', '').delete('^0-9')
 
@@ -379,13 +377,7 @@ module FreightKit
       base64_labels = api_shipments&.map { |s| s['Label'] }
       raise FreightKit::ResponseError, 'API Error: Blank label' if base64_labels.blank?
 
-      labels = []
-
-      base64_labels.each do |base64_label|
-        labels << Label.new(data: base64_label)
-      end
-
-      labels
+      base64_labels.map { |base64_label| Label.new(data: base64_label) }
     end
 
     # Rates
@@ -431,7 +423,7 @@ module FreightKit
           parts << "ID#{i}"
           parts << shipment.origin.postal_code
           parts << shipment.destination.postal_code
-          parts << shipment.accessorials.include?(:residential_delivery) ? 'true' : 'false'
+          parts << shipment.accessorials.include?(:residential_delivery).to_s
           parts << '0'
           parts << 'false' # Staurday delivery
           parts << declared_value

data/lib/freight_kit/carriers/saia.rb

@@ -229,10 +229,8 @@ module FreightKit
       rate_accessorial_items = result.dig(:rate_accessorials, :rate_accessorial_item)
       rate_accessorial_items = [rate_accessorial_items] if rate_accessorial_items.is_a?(Hash)
 
-      prices = []
-
-      rate_accessorial_items.each do |rate_accessorial_item|
-        prices << Price.new(
+      prices = rate_accessorial_items.map do |rate_accessorial_item|
+        Price.new(
           blame: :api,
           cents: (rate_accessorial_item[:amount].to_f * 100).to_i,
           description: rate_accessorial_item[:description]&.titleize&.squish,
@@ -352,7 +350,7 @@ module FreightKit
 
       shipper_location = Location.new(
         address1:,
-        city: search_result.dig(:shipper, :city)&.squish&.strip&.titleize,
+        city: search_result.dig(:shipper, :city)&.squish&.titleize,
         province: search_result.dig(:shipper, :state)&.strip&.upcase,
         postal_code: search_result.dig(:shipper, :zipcode)&.strip,
         country: ActiveUtils::Country.find('USA'),
@@ -368,7 +366,7 @@ module FreightKit
 
       receiver_location = Location.new(
         address1:,
-        city: search_result.dig(:consignee, :city)&.squish&.strip&.titleize,
+        city: search_result.dig(:consignee, :city)&.squish&.titleize,
         province: search_result.dig(:consignee, :state)&.strip&.upcase,
         postal_code: search_result.dig(:consignee, :zipcode)&.strip,
         country: ActiveUtils::Country.find('USA'),

data/lib/freight_kit/carriers/sefl.rb

@@ -104,9 +104,9 @@ module FreightKit
 
       case method
       when :post
-        HTTParty.post(url, headers:, body:)
+        HTTPClient.post(url, headers:, body:)
       else
-        HTTParty.get(url, headers:)
+        HTTPClient.get(url, headers:)
       end
     end
 

data/lib/freight_kit/carriers/tqyl.rb

@@ -58,13 +58,12 @@ module FreightKit
     end
 
     def commit(request)
-      response = HTTParty.send(
+      response = HTTPClient.request(
         request[:method],
         request[:url],
         headers: request[:headers].merge(subscription_key_headers),
         query: request[:query],
         body: request[:body],
-        debug_output: $stdout,
       )
 
       parsed_response = JSON.parse(response.body)
@@ -184,7 +183,6 @@ module FreightKit
       service:,
       shipment:
     )
-
       origin = shipment.origin
       destination = shipment.destination
       shipper_phone = shipment.origin.contact.phone.delete('^0-9')