freight_kit 0.1.20 → 0.1.22

data/freight_kit.gemspec

@@ -1,39 +1,24 @@
-# frozen_string_literal: true
-
 version = File.read(File.expand_path('VERSION', __dir__)).strip.freeze
 
 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')
   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.8')
+  spec.add_development_dependency('rubocop-next', '~> 1.0.9')
   spec.add_development_dependency('yard', '~> 0.9.28')
 
   spec.add_dependency('activemodel', '>= 7.1', '< 8.1.5')
@@ -42,14 +27,18 @@ Gem::Specification.new do |spec|
   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('httpx', '>= 1.9.0', '< 2')
+  spec.add_dependency('countries', '~> 8.1')
+  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')
   spec.add_dependency('zeitwerk', '>= 2.6.0', '< 2.8.4')

data/lib/freight_kit/address_normalizer.rb

@@ -0,0 +1,24 @@
+module FreightKit
+  # Normalizes US street addresses for comparison, using the StreetAddress gem's
+  # direction and street type tables.
+  class AddressNormalizer
+    UNIT_DESIGNATORS = ['apt', 'bldg', 'building', 'dept', 'fl', 'floor', 'rm', 'room', 'ste', 'suite', 'unit'].freeze
+
+    class << self
+      # Normalizes a street line so that, for example, "22205 E. 19th Ave." and
+      # "22205 East 19th Avenue" both become "22205 e 19th ave".
+      #
+      # @param address1 [String, nil]
+      # @return [String, nil]
+      def street_key(address1)
+        return if address1.blank?
+
+        words = address1.split('#').first.to_s.downcase.delete('.').gsub(/[^a-z0-9\s]/, ' ').split
+        words = words.take_while { |word| UNIT_DESIGNATORS.exclude?(word) }
+        return unless words.first&.match?(/\d/)
+
+        words.map { |word| StreetAddress::US::DIRECTIONAL[word]&.downcase || StreetAddress::US::STREET_TYPES[word] || word }.join(' ')
+      end
+    end
+  end
+end

data/lib/freight_kit/amazon_warehouse.rb

@@ -0,0 +1,33 @@
+module FreightKit
+  # Amazon warehouses in the United States, from OpenStreetMap.
+  #
+  # Regenerate the list with `rake amazon_warehouses:update`.
+  module AmazonWarehouse
+    extend self
+
+    def all
+      @all ||= YAML.safe_load_file(
+        File.expand_path('../../configuration/locations/amazon_warehouses.yml', __dir__),
+        permitted_classes: [Symbol]
+      )
+    end
+
+    # @param location [Location]
+    # @return [Hash, nil] The warehouse at the location, if any.
+    def find(location)
+      postal_code = location&.postal_code&.[](/\A\d{5}/)
+      return if postal_code.blank?
+
+      street_key = AddressNormalizer.street_key(location.address1)
+      return if street_key.blank?
+
+      by_postal_code[postal_code]&.find { |warehouse| warehouse[:street_key] == street_key }
+    end
+
+    def include?(location) = find(location).present?
+
+    private
+
+    def by_postal_code = @by_postal_code ||= all.group_by { |warehouse| warehouse[:postal_code] }
+  end
+end

data/lib/freight_kit/api_clients/soap_client.rb

@@ -1,15 +1,17 @@
-# frozen_string_literal: true
-
 module FreightKit
   class SoapClient
     API_EXCEPTIONS = [
-                       Savon::HTTPError,
-                       Net::ReadTimeout,
-                       Net::OpenTimeout,
-                       Errno::ECONNREFUSED,
-                       Errno::ECONNRESET,
-                       Errno::EHOSTUNREACH,
-                     ]
+      Errno::ECONNREFUSED,
+      Errno::ECONNRESET,
+      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
@@ -28,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}")
@@ -66,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