rate-card 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 320d6905617967d73305befafac57482eed231ff28b39d3282d61a8ae31549ff
-  data.tar.gz: a54e83be25c1f657dd5fe6eb4a416a02a8fb1f88e38439523f43d2a1c9fd9878
+  metadata.gz: 160b23b771a6920c394ff1d8e33b625499f0bd384c8aab8453471c18d1244a23
+  data.tar.gz: c03c94b913253b5037be1f5f4d2b9b11304943712215b81bcbae092148675b84
 SHA512:
-  metadata.gz: d4c28f5cc71b01a00e5e7cd41e785acda43c117d26c456ea313239819fb95b9779efdc0a7b20c20f96a5013049e108c715386bdc28337e7d7bfbc14f0c917c07
-  data.tar.gz: c02ecec88df73aa9fa01d33cd6107d8b1e4911e367bc6d54bb996a92834ee4cfce6add454a5b5209b283509322d276e44548f263af07eaad74fe8e40d4c10f20
+  metadata.gz: d11060dc015d5eaa28ab8ec883bc38b865383f22e85cccce7ea455945b304fabefa0f22c9463e0ed8bdf986fa3b3cc2d43975154d52296ed29999b518343e34a
+  data.tar.gz: 6f1649f1183ab8b1b7627b43494d9277999e22939e4492852be6827ff9694edd768bbd4ca7202bcf714b684ecc7deed9ace3d50661202a26070fdfcb0caf02a6

data/lib/rate_card/constants/addresses.rb

@@ -72,6 +72,40 @@ module RateCard
 
       BY_CARRIER = { 'USPS' => USPS, 'UPS' => UPS, 'FedEx' => FEDEX, 'DHL' => DHL_ECOMMERCE, 'OSM' => OSM }.freeze
 
+      # Rural/remote-area surcharge test addresses. These aren't zone charts
+      # (rural surcharge eligibility is a property of the destination zip on
+      # a carrier's rural list, not something for_carrier's zone lookup
+      # models), so they live outside BY_CARRIER and are looked up directly
+      # by callers that need them.
+      #
+      # Ported from ../rate_table_builder/constants.rb. USPS_RURAL_DAS zones
+      # 4-8 were tagged 'maybe' or unverified in the source file - re-verify
+      # against USPS's rural lookup before relying on them for a real card.
+      USPS_RURAL_DAS = {
+        0 => { address1: '12078 W 4000 N', city: 'Bluebell', state: 'UT', postal_code: '84007', country: 'US' },
+        1 => { address1: '6074 N 4700 W', city: 'Bear River City', state: 'UT', postal_code: '84301', country: 'US' },
+        2 => { address1: '25670 Buffalo Run', city: 'Moran', state: 'WY', postal_code: '83013', country: 'US' },
+        3 => { address1: '17 Texs Loop', city: 'Alder', state: 'MT', postal_code: '59710', country: 'US' },
+        4 => { address1: '1250 153rd St SE', city: 'Norwich', state: 'ND', postal_code: '58768', country: 'US' },
+        5 => { address1: '103 Stonegate Ct', city: 'Gurdon', state: 'AR', postal_code: '71743', country: 'US' },
+        6 => { address1: '31 Edsel Rd', city: 'Webbville', state: 'KY', postal_code: '41180', country: 'US' },
+        7 => { address1: '295 Old Waterford Road', city: 'Littleton', state: 'NH', postal_code: '03561', country: 'US' },
+        8 => { address1: '77 Main Street', city: 'Mars Hill', state: 'ME', postal_code: '04758', country: 'US' }
+      }.freeze
+
+      # UPS has no per-zone rural chart - just one known address per DAS
+      # variant. EDAS = Extended Delivery Area Surcharge, RDAS = Remote
+      # Delivery Area Surcharge.
+      UPS_EDAS_EXCEPTION = { address1: '149 Pheasant Runn Road', city: 'Goshen', state: 'NH', postal_code: '03752',
+                              country: 'US' }.freeze
+
+      UPS_RDAS_EXCEPTION = { address1: '106 Yellow Hammer Rd', city: 'Tyner', state: 'NC', postal_code: '27980',
+                              country: 'US' }.freeze
+
+      # Looked up by surcharge-type symbol rather than zone, since UPS rural
+      # mode sweeps surcharge types instead of zones — see RunSpec#address_for.
+      UPS_RURAL = { edas: UPS_EDAS_EXCEPTION, rdas: UPS_RDAS_EXCEPTION }.freeze
+
       module_function
 
       # Raises rather than falling back. The old USPS default meant asking for

data/lib/rate_card/constants/carriers.rb

@@ -30,6 +30,11 @@ module RateCard
         'dhl' => 'DHL Express', 'dhl_ecommerce' => 'DHL', 'osm' => 'OSM', 'amazon' => 'Amazon'
       }.freeze
 
+      # Carriers with a rural/DAS surcharge test address in Constants::Addresses.
+      # Independent of zone-chart support - a carrier can have a verified zone
+      # chart and no rural chart at all.
+      RURAL_AWARE = %w[USPS UPS].freeze
+
       module_function
 
       # OTHER is only for a malformed entry with no code at all, so a service is
@@ -44,6 +49,10 @@ module RateCard
       def display_order
         DISPLAY_ORDER
       end
+
+      def rural_aware?(carrier)
+        RURAL_AWARE.include?(carrier.to_s)
+      end
     end
   end
 end

data/lib/rate_card/providers/ehub/token_prompt.rb

@@ -32,7 +32,7 @@ module RateCard
 
         def read(ui:, io: $stdin)
           loop do
-            io.print(BRACKETED_PASTE_OFF) if io.tty?
+            $stdout.print(BRACKETED_PASTE_OFF) if io.tty?
             ui.prompt('eHub API token: ')
             raw = read_masked(io)
             return nil if raw.nil?

data/lib/rate_card/run_spec.rb

@@ -16,7 +16,7 @@ module RateCard
   class RunSpec < Struct.new(
     :token, :customer_name, :customer_id, :carrier, :services, :zones,
     :weight_unit, :weights, :package_type, :rate_keys, :output_base,
-    :show_table, :started_at, :rate_mode, :cubic_tiers,
+    :show_table, :started_at, :rate_mode, :cubic_tiers, :rural,
     keyword_init: true
   )
     # Our rate-key name => the field it arrives as in service_rates. Getting
@@ -44,10 +44,26 @@ module RateCard
       self.class.compact_range(zones)
     end
 
+    def zone_label(zone)
+      zone.is_a?(Symbol) ? zone.to_s.upcase : "Z#{zone}"
+    end
+
+    # true for USPS with rural mode on, or any UPS surcharge type/combination.
+    # nil/false (rural mode off, or a non-rural-aware carrier) is falsy here.
+    def rural?
+      !!rural
+    end
+
     # [1,2,3,5] => "1-3,5". Runs of three or more collapse; a pair stays listed,
     # since "4,5" is no longer than "4-5" and reads as what the user typed.
+    #
+    # UPS rural mode sweeps surcharge-type symbols (:edas, :rdas) instead of
+    # numbered zones - those aren't a range at all, so they're just listed.
     def self.compact_range(numbers)
-      sorted = numbers.to_a.sort.uniq
+      array = numbers.to_a
+      return array.join(',') if array.any? { |n| n.is_a?(Symbol) }
+
+      sorted = array.sort.uniq
       runs = sorted.slice_when { |a, b| b != a + 1 }.to_a
       runs.map { |run| run.length >= 3 ? "#{run.first}-#{run.last}" : run.join(',') }.join(',')
     end
@@ -104,7 +120,14 @@ module RateCard
       end
     end
 
+    # A Symbol zone (:edas, :rdas) only ever comes from UPS rural mode, so it
+    # disambiguates from a real zone number without needing to check carrier
+    # or rural separately. USPS rural mode keeps integer zones, just against
+    # the rural chart instead of the normal one.
     def address_for(zone)
+      return Constants::Addresses::UPS_RURAL[zone] if zone.is_a?(Symbol)
+      return Constants::Addresses::USPS_RURAL_DAS[zone] if carrier == 'USPS' && rural?
+
       Constants::Addresses.for_carrier(carrier)[zone]
     end
 
@@ -136,7 +159,16 @@ module RateCard
     end
 
     def run_dir
-      Pathname.new(output_base).join("#{slug}_#{customer_id}_#{timestamp}")
+      Pathname.new(output_base).join("#{slug}_#{customer_id}_#{timestamp}#{rural_suffix}")
+    end
+
+    def rural_suffix
+      case rural
+      when true then '_rural'
+      when :edas, :rdas then "_#{rural}"
+      when :both then '_edas_rdas'
+      else ''
+      end
     end
 
     def validate!

data/lib/rate_card/table_renderer.rb

@@ -47,7 +47,7 @@ module RateCard
     end
 
     def render(service, rate_key)
-      header = [spec.weight_label, *spec.zones.map { |zone| "Z#{zone}" }]
+      header = [spec.weight_label, *spec.zones.map { |zone| spec.zone_label(zone) }]
       body = rows(service, rate_key)
 
       Lipgloss::Table.new

data/lib/rate_card/tui/app.rb

@@ -24,7 +24,7 @@ module RateCard
 
       # No :token stage — see TokenPrompt for why it cannot live in the loop.
       STAGES = %i[
-        loading rate_mode carrier services zones unit weights package_type
+        loading rate_mode carrier rural services zones unit weights package_type
         rate_keys confirm fetching
       ].freeze
 
@@ -177,6 +177,7 @@ module RateCard
         case stage
         when :rate_mode    then rate_mode_field
         when :carrier      then carrier_field
+        when :rural        then rural_field
         when :services     then services_field
         when :zones        then zones_field
         when :unit         then unit_field
@@ -238,8 +239,43 @@ module RateCard
         )
       end
 
+      # Only USPS and UPS have a rural/DAS chart (Addresses::USPS_RURAL_DAS,
+      # Addresses::UPS_RURAL); every other carrier is decided :normal (nil)
+      # and skips this stage, same as any other single-answer stage.
+      def rural_field
+        return nil unless Constants::Carriers.rural_aware?(carrier)
+
+        choices = carrier == 'USPS' ? usps_rural_choices : ups_rural_choices
+        Fields::Select.new(label: 'Rural / DAS test mode', choices: choices,
+                           selected: choices.index { |_, v| v == @answers[:rural] } || 0)
+      end
+
+      def usps_rural_choices
+        [['Normal', false], ['Rural (DAS)', true]]
+      end
+
+      def ups_rural_choices
+        [['Normal', nil], ['EDAS', :edas], ['RDAS', :rdas], ['Both', :both]]
+      end
+
+      # UPS rural mode has no real zone choice - each surcharge type is a
+      # single fixed address - so it's decided here as the chosen surcharge
+      # symbol(s) and the zones stage is skipped rather than asked.
+      def ups_rural_zones
+        case @answers[:rural]
+        when :edas then [:edas]
+        when :rdas then [:rdas]
+        when :both then %i[edas rdas]
+        end
+      end
+
       def zones_field
-        available = Constants::Addresses.available_zones(carrier)
+        if carrier == 'UPS' && (decided = ups_rural_zones)
+          @answers[:zones] = decided
+          return nil
+        end
+
+        available = usps_rural? ? Constants::Addresses::USPS_RURAL_DAS.keys.sort : Constants::Addresses.available_zones(carrier)
         full = "#{available.first}-#{available.last}"
         answered = @answers[:zones]
 
@@ -255,6 +291,10 @@ module RateCard
         )
       end
 
+      def usps_rural?
+        carrier == 'USPS' && @answers[:rural] == true
+      end
+
       # Weight is fixed per cubic tier, so asking for a display unit is
       # meaningless in cubic mode — decided as :oz (unused) and skipped.
       def unit_field
@@ -431,6 +471,7 @@ module RateCard
           weights: cubic ? [] : @answers[:weights],
           cubic_tiers: cubic ? @answers[:weights] : [],
           rate_mode: @answers[:rate_mode] || :weight,
+          rural: @answers[:rural],
           package_type: @answers[:package_type],
           rate_keys: @answers[:rate_keys],
           output_base: @output_base,
@@ -458,14 +499,21 @@ module RateCard
       # in the transcript above, but they arrived one at a time over eight
       # screens; this is the only place they can be read against each other.
       def recap_view
+        carrier_line = "  #{Theme.bold(carrier)}#{rural_recap} · #{@answers[:services].map(&:name).join(', ')}"
         [
-          "  #{Theme.bold(carrier)} · #{@answers[:services].map(&:name).join(', ')}",
+          carrier_line,
           "  zones #{RunSpec.compact_range(@answers[:zones])} · #{rows_recap} · #{@answers[:package_type]}",
           "  columns: #{@answers[:rate_keys].map { |k| RunSpec::RATE_KEY_LABELS.fetch(k) }.join(', ')}",
           "  #{Theme.bold(call_count.to_s)} rate calls against #{Theme.danger('production')}"
         ].join("\n")
       end
 
+      def rural_recap
+        return '' if !@answers[:rural] || @answers[:rural].nil?
+
+        " (#{rural_label(@answers[:rural])})"
+      end
+
       def rows_recap
         if @answers[:rate_mode] == :cubic
           "cubic tiers #{RunSpec.compact_range(@answers[:weights])}"
@@ -500,8 +548,8 @@ module RateCard
       # transcript of the run stays on screen — the recap is then a summary of
       # what is already visible rather than the first chance to check it.
       def answered_line(stage, value)
-        label = { rate_mode: 'rate by', carrier: 'carrier', services: 'services', zones: 'zones',
-                  unit: 'unit', weights: 'weights', package_type: 'package',
+        label = { rate_mode: 'rate by', carrier: 'carrier', rural: 'rural / DAS', services: 'services',
+                  zones: 'zones', unit: 'unit', weights: 'weights', package_type: 'package',
                   rate_keys: 'columns' }[stage]
         label = 'cubic tiers' if stage == :weights && @answers[:rate_mode] == :cubic
         return nil if label.nil?
@@ -514,10 +562,20 @@ module RateCard
         when :services  then value.map(&:name).join(', ')
         when :zones     then RunSpec.compact_range(value)
         when :weights   then RunSpec.compact_range(value)
+        when :rural     then rural_label(value)
         when :rate_keys then value.map { |k| RunSpec::RATE_KEY_LABELS.fetch(k) }.join(', ')
         else value.to_s
         end
       end
+
+      def rural_label(value)
+        case value
+        when false, nil then 'normal'
+        when true       then 'rural (DAS)'
+        when :edas, :rdas then value.to_s.upcase
+        when :both      then 'EDAS + RDAS'
+        end
+      end
     end
   end
 end

data/lib/rate_card/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RateCard
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rate-card
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - eHub