freight_kit 0.1.20 → 0.1.21

data/lib/freight_kit/regions.rb

@@ -0,0 +1,27 @@
+module FreightKit
+  module Regions
+    module_function
+
+    def all
+      locale = I18n.locale
+
+      (@all ||= {})[locale] ||= ISO3166::Country
+                                .all
+                                .flat_map do |iso_country|
+                                  country = Countries.find_by(iso31661_alpha2: iso_country.alpha2)
+
+                                  iso_country
+                                    .subdivisions.map do |abbreviation, subdivision|
+                                    Region.new(
+                                      abbreviation:,
+                                      country:,
+                                      iso31662: "#{iso_country.alpha2}-#{abbreviation}",
+                                      name: subdivision.translations[locale] || subdivision.name
+                                    )
+                                  end
+                                end
+    end
+
+    def find_by(**attributes) = all.find { |region| attributes.all? { |key, value| region.public_send(key) == value } }
+  end
+end

data/lib/freight_kit/shipment_packer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module FreightKit
   class ShipmentPacker
     class OverweightItem < StandardError
@@ -43,7 +41,7 @@ module FreightKit
               item[:quantity] = item[:quantity].to_i - quantity
             end
 
-            items_to_pack.reject! { |i| i[:quantity].to_i == 0 }
+            items_to_pack.reject! { |i| i[:quantity].to_i.zero? }
             state = :package_full
           when :package_full
             packages << FreightKit::Package.new(package_weight, dimensions, value: package_value, currency:)
@@ -56,39 +54,6 @@ module FreightKit
 
       private
 
-      def validate_total_weight(items, maximum_weight)
-        total_weight = 0
-        items.each do |item|
-          total_weight += item[:quantity].to_i * item[:grams].to_i
-
-          if overweight_item?(item[:grams], maximum_weight)
-            message = <<~MESSAGE.squish
-              The item with weight of #{item[:grams]}g is heavier than the allowable package weight of
-              #{maximum_weight}g
-            MESSAGE
-            raise OverweightItem, message
-          end
-
-          raise_excess_quantity_error if maybe_excess_package_quantity?(total_weight, maximum_weight)
-        end
-      end
-
-      def validate_package_quantity(number_of_packages)
-        raise_excess_quantity_error if number_of_packages >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
-      end
-
-      def raise_excess_quantity_error
-        raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages"
-      end
-
-      def overweight_item?(grams, maximum_weight)
-        grams.to_i > maximum_weight
-      end
-
-      def maybe_excess_package_quantity?(total_weight, maximum_weight)
-        total_weight > (maximum_weight * EXCESS_PACKAGE_QUANTITY_THRESHOLD)
-      end
-
       def determine_fillable_quantity_for_package(item, maximum_weight, package_weight)
         item_grams = item[:grams].to_i
         item_quantity = item[:quantity].to_i
@@ -104,12 +69,45 @@ module FreightKit
         end
       end
 
+      def item_value(quantity, price)
+        quantity * Package.cents_from(price)
+      end
+
       def item_weight(quantity, grams)
         quantity * grams.to_i
       end
 
-      def item_value(quantity, price)
-        quantity * Package.cents_from(price)
+      def maybe_excess_package_quantity?(total_weight, maximum_weight)
+        total_weight > (maximum_weight * EXCESS_PACKAGE_QUANTITY_THRESHOLD)
+      end
+
+      def overweight_item?(grams, maximum_weight)
+        grams.to_i > maximum_weight
+      end
+
+      def raise_excess_quantity_error
+        raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages"
+      end
+
+      def validate_package_quantity(number_of_packages)
+        raise_excess_quantity_error if number_of_packages >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
+      end
+
+      def validate_total_weight(items, maximum_weight)
+        total_weight = 0
+        items.each do |item|
+          total_weight += item[:quantity].to_i * item[:grams].to_i
+
+          if overweight_item?(item[:grams], maximum_weight)
+            message = <<~MESSAGE.squish
+              The item with weight of #{item[:grams]}g is heavier than the allowable package weight of
+              #{maximum_weight}g
+            MESSAGE
+            raise OverweightItem, message
+          end
+
+          raise_excess_quantity_error if maybe_excess_package_quantity?(total_weight, maximum_weight)
+        end
       end
     end
   end

data/lib/freight_kit/tariff/overlength_rule.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module FreightKit
   class Tariff
     class OverlengthRule
@@ -12,9 +10,7 @@ module FreightKit
           raise ArgumentError, 'overlength_rule[:max_length] must be one of Measured::Length, NilClass'
         end
 
-        unless min_length.is_a?(Measured::Length)
-          raise ArgumentError, 'overlength_rule[:min_length] must be a Measured::Length'
-        end
+        raise ArgumentError, 'overlength_rule[:min_length] must be a Measured::Length' unless min_length.is_a?(Measured::Length)
 
         @fee_cents = fee_cents
         @max_length = max_length

data/lib/freight_kit/tariff.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module FreightKit
   class Tariff
     attr_accessor :overlength_rules

data/lib/freight_kit.rb

@@ -1,9 +1,8 @@
-# frozen_string_literal: true
-
 require 'active_model'
 require 'active_support/all'
 require 'active_utils'
 require 'business_time'
+require 'countries'
 require 'httpx'
 require 'measured'
 require 'mimemagic'
@@ -12,6 +11,7 @@ require 'nokogiri'
 require 'open-uri'
 require 'place_kit'
 require 'savon'
+require 'street_address'
 require 'watir'
 require 'yaml'
 require 'zeitwerk'
@@ -20,15 +20,91 @@ module FreightKit
   VERSION = File.read(File.expand_path('../VERSION', __dir__)).strip.freeze
 
   class Inflector < Zeitwerk::Inflector
+    CARRIER_ACRONYMS = [
+      'AAA',
+      'AB',
+      'ABF',
+      'BA',
+      'CDC',
+      'CDO',
+      'CMS',
+      'CND',
+      'CPL',
+      'CSA',
+      'CSX',
+      'DAK',
+      'DBR',
+      'DHL',
+      'DRT',
+      'ERA',
+      'EW',
+      'GLS',
+      'GPS',
+      'GSA',
+      'GSP',
+      'GSV',
+      'GTA',
+      'HER',
+      'HN',
+      'JB',
+      'JFJ',
+      'JKB',
+      'JLM',
+      'JP',
+      'KLC',
+      'KM',
+      'KMA',
+      'KRC',
+      'KTX',
+      'LD',
+      'LJ',
+      'LKP',
+      'LTL',
+      'MC',
+      'MS',
+      'MVG',
+      'NT',
+      'NVK',
+      'NY',
+      'PG',
+      'PGS',
+      'PKI',
+      'PWC',
+      'RAC',
+      'RE',
+      'RIST',
+      'RP',
+      'RPM',
+      'SB',
+      'SNA',
+      'SSI',
+      'STG',
+      'THK',
+      'TILI',
+      'TMA',
+      'TMS',
+      'TMT',
+      'TSI',
+      'UP',
+      'UPS',
+      'US',
+      'USA',
+      'USF',
+      'VC',
+      'VMG',
+      'WDWB',
+      'WLB',
+      'XPO',
+      'YRC'
+    ].index_by(&:downcase).freeze
+
     def camelize(basename, abspath)
-      # Carriers are named after their four-letter SCAC (e.g. abfs.rb => ABFS)
-      if File.basename(File.dirname(abspath)) == 'carriers' && basename.match?(/\A[a-z]{4}\z/)
-        return basename.upcase
+      if ['carriers', 'platforms'].include?(File.basename(File.dirname(abspath)))
+        # Carriers and platforms are named after the business (e.g. nt_usa.rb => NTUSA, next_tms.rb => NextTMS)
+        return basename.split('_').map { |word| CARRIER_ACRONYMS[word] || word.capitalize }.join
       end
 
-      if basename =~ /\Ahttp_(.*)/
-        return "HTTP#{super(::Regexp.last_match(1), abspath)}"
-      end
+      return "HTTP#{super(::Regexp.last_match(1), abspath)}" if basename =~ /\Ahttp_(.*)/
 
       super
     end
@@ -38,13 +114,10 @@ end
 loader = Zeitwerk::Loader.for_gem
 
 loader.collapse("#{__dir__}/freight_kit/api_clients")
-loader.collapse("#{__dir__}/freight_kit/carriers")
 loader.collapse("#{__dir__}/freight_kit/errors")
 loader.collapse("#{__dir__}/freight_kit/helpers")
 loader.collapse("#{__dir__}/freight_kit/models")
-loader.collapse("#{__dir__}/freight_kit/platforms")
 
 loader.inflector = FreightKit::Inflector.new
-loader.inflector.inflect('jfj_transportation' => 'JFJTransportation')
 
 loader.setup