friendly_shipping 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aa01bc03e05cfdd6fa53432ea9d4692e53f9e71580432d15d485a8ad6213bfc
-  data.tar.gz: 4917749e1c8a5955eceb4459af1dfa212a833840cfcec022bd89423554fb94d3
+  metadata.gz: 1ea046468f58d0fcb1b73a5a412d1196ba22b5196772bdc09167f085bdad718e
+  data.tar.gz: cdb2ae78f0a244358795e3a695cbb837c5199b16e1b1ea62d35fc3c2db7593ed
 SHA512:
-  metadata.gz: 3ad0ecca24a8fe1ce5017f5b17b16d1332fc80d89ab7ed1ea025bcb6a25ab59dcb175e4abbac6d676ff8224c437fc67fa18b1d29aeb9b120c32308d54551b9c9
-  data.tar.gz: 8d662295fece385bf10bd2bcbb50ffcd18b1819b2c44e93625dfb42023af4fe4d0445ce84dd6110e49ca1c2c9152f83ff86c6aa7301399dd3d7b9479ff284944
+  metadata.gz: ab58d07654f00ad218e80582bf9ebdc242074e9e10d062d6d89dea04125b71785c05e496800da635805be221b61b544dad233258e78cfe2b633590788b401930
+  data.tar.gz: ccfae1ca937d3f1c93223a40d8a0193943720be569403565795a70cf7457cd010950d4dfef271bfa5e52145c05cffd004f307566485874baa30c864189fc7e4e

data/.env.test.local.template

@@ -1,6 +1,6 @@
 # .env.test.local.template
 
-# When recording VCR cassettes for TForce and UPS JSON service classes, this env var
-# should be set to a valid token for either service.
+# When recording VCR cassettes for TForce, UPS, and USPS Ship service classes, this env var
+# should be set to a valid token for the service being tested.
 
 ACCESS_TOKEN=secret_token

data/CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.3] - 2025
+- Add USPS Ship city/state lookup request (#279)
+
+## [0.10.2] - 2025
+- Remove legacy UPS integration (#275)
+- Add observer gem to Gemfile (#276)
+- Remove legacy USPS integration (#277)
+- Add UPS surcharge code 495 to money hash parser (#278)
+
+## [0.10.1] - 2025-01-03
+- Remove Inflections file (#274)
+
+## [0.10.0] - 2025-01-03
+- Bump version to 0.9.0 and log changes (#257)
+- USPS Ship: Fix machinable criteria (#258)
+- Add debug param to ShipEngine labels method (#259)
+- Truncate R+L BOL address lines to 30 chars (#260)
+- Fix UPS json rate details, add specs (#261)
+- Fix ups label cost breakdown (#262)
+- Remove TForce company name sanitization (#263)
+- Update payload location of NegotiatedRatesIndicator within UPS JSON (#264)
+- Attach cost breakdown to R+L rates data (#265)
+- Expand TForce cost breakdown detail (#266)
+- Never send empty UPS ShipmentRatingOptions (#267)
+- Bump required Ruby version to 3.1 or greater (#269)
+- Add city/state lookup endpoint for UPS JSON API (#268)
+- Extract AccessToken parent class (#270)
+- Return errors in ApiFailures for USPS timings, UPS json parsing (#271)
+- Deprecate ApiFailure class (#272)
+- Use Zeitwerk to load FriendlyShipping (#273)
+
 ## [0.9.0] - 2024-05-02
 - Implement R&L service with rates and timings (#177)
 - Add R&L Freight API call to create BOL and schedule pickup (#178)

data/Gemfile

@@ -11,6 +11,7 @@ group :development do
   gem "bundler", ">= 2.1.4", "< 3"
   gem "dotenv", "~> 3.0"
   gem "factory_bot", "~> 6.2"
+  gem "observer", "~> 0.1.2"
   gem "pry", "~> 0.12"
   gem "rack"
   gem "rake", ">= 12.3.3"

data/README.md

@@ -22,8 +22,8 @@ Or install it yourself as:
 
 The entry point for using FriendlyShipping are the `service` objects that each represent an API provider. Currently, there are three services:
 
-1. `FriendlyShipping::Services::Ups`
-2. `FriendlyShipping::Services::Usps`
+1. `FriendlyShipping::Services::UpsJson`
+2. `FriendlyShipping::Services::USPSShip`
 3. `FriendlyShipping::Services::ShipEngine`
 4. `FriendlyShipping::Services::UpsFreight`
 
@@ -54,13 +54,11 @@ The following methods are supported:
 
 #### UPS (United Parcel Service)
 
-The service class for UPS is `FriendlyShipping::Services::Ups`. Initialize like so:
+The service class for UPS is `FriendlyShipping::Services::UpsJson`. Initialize like so:
 
 ```rb
-service = FriendlyShipping::Services::Ups.new(
-  key: ENV['UPS_API_KEY'],
-  login: ENV['UPS_API_LOGIN'],
-  password: ENV['UPS_API_PASSWORD'],
+service = FriendlyShipping::Services::UpsJson.new(
+  access_token: ENV['UPS_ACCESS_TOKEN'],
   test: true
 )
 ```
@@ -68,19 +66,21 @@ service = FriendlyShipping::Services::Ups.new(
 The following methods are supported:
 
 - `#carriers` - List all configured carriers (always returns UPS)
-- `#rate_estimates(physical_shipment)` - Get rate estimates for a shipment
-- `#labels(physical_shipment, options: options)` - Get labels for a shipment
+- `#create_access_token(client_id:, client_secret:, merchant_id:)` - Create a new API access token
+- `#rates(physical_shipment, options:)` - Get rate estimates for a shipment
+- `#timings(physical_shipment, options:)` - Get transit timings for a shipment
+- `#labels(physical_shipment, options:)` - Get labels for a shipment
 - `#address_classification(physical_location)` - Determine whether an address is commercial or residential.
-- `#address_validation(physical_location)` - Perform a detailed address validation and determine whether an address is commercial or residential.
 - `#city_state_lookup(physical_location)` - Lookup City and State for a given ZIP code.
+- `#void(label)` - Void a previously created label.
 
 #### USPS (United States Postal Service)
 
-The service class for USPS is `FriendlyShipping::Services::Usps`. Initialize like so:
+The service class for USPS is `FriendlyShipping::Services::USPSShip`. Initialize like so:
 
 ```rb
-service = FriendlyShipping::Services::Usps.new(
-  login: ENV['USPS_API_LOGIN'],
+service = FriendlyShipping::Services::USPSShip.new(
+  access_token: ENV['USPS_ACCESS_TOKEN'],
   test: true
 )
 ```
@@ -88,9 +88,9 @@ service = FriendlyShipping::Services::Usps.new(
 The following methods are supported:
 
 - `#carriers` - List all configured carriers (always returns USPS)
-- `#rate_estimates(physical_shipment)` - Get rate estimates for a shipment
-- `#address_validation(physical_location)` - Perform a detailed address validation and determine whether an address is commercial or residential.
-- `#city_state_lookup(physical_location)` - Lookup City and State for a given ZIP code.
+- `#create_access_token(client_id:, client_secret:)` - Create a new API access token
+- `#rate_estimates(physical_shipment, options:)` - Get rate estimates for a shipment
+- `#timings(physical_location, options:)` - Get transit timings for a shipment
 
 #### UPS Freight
 

data/lib/friendly_shipping/services/rl/parse_rate_quote_response.rb

@@ -34,10 +34,10 @@ module FriendlyShipping
             end
           end
 
-          private
-
           # The currency to use when parsing the rate quotes.
-          CURRENCY = Money::Currency.new('USD').freeze
+          CURRENCY = Money::Currency.new('USD')
+
+          private
 
           # Builds {Rate} instances from the parsed JSON.
           #

data/lib/friendly_shipping/services/ups_json/parse_money_hash.rb

@@ -105,6 +105,7 @@ module FriendlyShipping
           "470" => "COMMITTED DELIVERY WINDOW",
           "480" => "SECURITY SURCHARGE",
           "492" => "CUSTOMER TRANSACTION FEE",
+          "495" => "EXTENDED AREA SURCHARGE",
           "500" => "SHIPMENT COD",
           "510" => "LIFT GATE FOR PICKUP",
           "511" => "LIFT GATE FOR DELIVERY",

data/lib/friendly_shipping/services/usps_international/parse_rate_response.rb

@@ -16,7 +16,7 @@ module FriendlyShipping
           # @return [Result<ApiResult<Array<FriendlyShipping::Rate>>>] When successfully parsing, an array of rates in a Success Monad.
           def call(request:, response:, shipment:, options:)
             # Filter out error responses and directly return a failure
-            parsing_result = FriendlyShipping::Services::Usps::ParseXMLResponse.call(
+            parsing_result = ParseXMLResponse.call(
               request: request,
               response: response,
               expected_root_tag: 'IntlRateV2Response'
@@ -51,11 +51,11 @@ module FriendlyShipping
             end
           end
 
-          private
-
           PACKAGE_NODE_XPATH = '//Package'
           SERVICE_NODE_NAME = 'Service'
 
+          private
+
           # Iterate over all packages and parse the rates for each package
           #
           # @param [Nokogiri::XML::Node] xml The XML document containing packages and rates

data/lib/friendly_shipping/services/{usps → usps_international}/parse_xml_response.rb

@@ -2,7 +2,7 @@
 
 module FriendlyShipping
   module Services
-    class Usps
+    class UspsInternational
       class ParseXMLResponse
         extend Dry::Monads::Result::Mixin
         ERROR_TAG = 'Error'

data/lib/friendly_shipping/services/usps_international/serialize_rate_request.rb

@@ -50,7 +50,7 @@ module FriendlyShipping
           private
 
           def machinable(package)
-            FriendlyShipping::Services::Usps::MachinablePackage.new(package).machinable? ? 'true' : 'false'
+            FriendlyShipping::Services::USPSShip::MachinablePackage.new(package).machinable? ? 'true' : 'false'
           end
 
           def ounces_for(package)

data/lib/friendly_shipping/services/usps_ship/machinable_package.rb

@@ -29,13 +29,13 @@ module FriendlyShipping
 
         # @return [Boolean]
         def machinable?
-          at_least_minimum && at_most_maximum
+          at_least_minimum? && at_most_maximum?
         end
 
         private
 
         # @return [Boolean]
-        def at_least_minimum
+        def at_least_minimum?
           package.length >= MIN_LENGTH &&
             package.width >= MIN_WIDTH &&
             package.height >= MIN_HEIGHT &&
@@ -43,7 +43,7 @@ module FriendlyShipping
         end
 
         # @return [Boolean]
-        def at_most_maximum
+        def at_most_maximum?
           package.length <= MAX_LENGTH &&
             package.width <= MAX_WIDTH &&
             package.height <= MAX_HEIGHT &&

data/lib/friendly_shipping/services/usps_ship/parse_city_state_response.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class USPSShip
+      class ParseCityStateResponse
+        extend Dry::Monads::Result::Mixin
+        USA = Carmen::Country.coded("USA")
+
+        class << self
+          # Parse a city/state response.
+          #
+          # @param request [Request] the request that was used to obtain this response
+          # @param response [Response] the response that USPS returned
+          # @return [Success<ApiResult<Physical::Location>>, Failure<ApiResult<String>>]
+          def call(request:, response:)
+            city_state = JSON.parse(response.body)
+
+            if city_state['error']
+              failure(
+                api_error("Error: #{city_state.dig('error', 'message')}"),
+                request,
+                response
+              )
+            else
+              success(
+                Physical::Location.new(
+                  city: city_state['city'],
+                  region: city_state['state'],
+                  zip: city_state['ZIPCode'],
+                  country: USA
+                ),
+                request,
+                response
+              )
+            end
+          rescue JSON::ParserError => e
+            failure(e, request, response)
+          end
+
+          # @param location [Physical::Location]
+          # @param request [Request]
+          # @param response [Response]
+          # @return [Success<ApiResult<Physical::Location>>]
+          def success(location, request, response)
+            Success(
+              ApiResult.new(
+                location,
+                original_request: request,
+                original_response: response
+              )
+            )
+          end
+
+          # @param error [JSON::ParserError, FriendlyShipping::ApiError]
+          # @param request [Request]
+          # @param response [Response]
+          # @return [Failure<ApiResult>]
+          def failure(error, request, response)
+            Failure(
+              ApiResult.new(
+                error,
+                original_request: request,
+                original_response: response
+              )
+            )
+          end
+
+          private
+
+          def api_error(message)
+            FriendlyShipping::ApiError.new(nil, message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/usps_ship/parse_rate_estimates_response.rb

@@ -35,7 +35,7 @@ module FriendlyShipping
 
             success(rates, request, response)
           rescue JSON::ParserError, KeyError => e
-            failure(e.message, request, response)
+            failure(e, request, response)
           end
 
           private

data/lib/friendly_shipping/services/usps_ship.rb

@@ -32,7 +32,8 @@ module FriendlyShipping
       RESOURCES = {
         token: 'oauth2/v3/token',
         rates: 'prices/v3/base-rates/search',
-        timings: 'service-standards/v3/estimates'
+        timings: 'service-standards/v3/estimates',
+        city_state: 'addresses/v3/city-state'
       }.freeze
 
       # @param access_token [AccessToken] the access token
@@ -161,6 +162,31 @@ module FriendlyShipping
         end
       end
 
+      # Get city and state for given ZIP code.
+      # @see https://developer.usps.com/addressesv3#tag/Resources/operation/get-city-state API documentation
+      #
+      # @param location [Physical::Location] the location with ZIP code we want to complete
+      # @return [Result<ApiResult<Array<Timing>>>] the {Timing}s wrapped in an {ApiResult} object
+      # @return [Result<ApiResult<Physical::Location>>] The response data from USPS encoded in a
+      #   `Physical::Location` object. Country, City and ZIP code will be set, everything else nil.
+      def city_state(location, debug: false)
+        request = FriendlyShipping::Request.new(
+          url: "#{BASE_URL}/#{RESOURCES[:city_state]}?ZIPCode=#{location.zip}",
+          http_method: "GET",
+          debug: debug,
+          headers: {
+            Accept: "application/json",
+            Authorization: "Bearer #{access_token.raw_token}"
+          }
+        )
+
+        client.get(request).bind do |response|
+          ParseCityStateResponse.call(response: response, request: request)
+        end
+      end
+
+      alias_method :city_state_lookup, :city_state
+
       private
 
       # @param api [Symbol]

data/lib/friendly_shipping/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FriendlyShipping
-  VERSION = "0.10.1"
+  VERSION = "0.10.3"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Martin Meyerhoff
 - Matthew Bass
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -230,38 +229,6 @@ files:
 - lib/friendly_shipping/services/tforce_freight/shipment_options.rb
 - lib/friendly_shipping/services/tforce_freight/shipping_methods.rb
 - lib/friendly_shipping/services/tforce_freight/structure_options.rb
-- lib/friendly_shipping/services/ups.rb
-- lib/friendly_shipping/services/ups/label.rb
-- lib/friendly_shipping/services/ups/label_billing_options.rb
-- lib/friendly_shipping/services/ups/label_item_options.rb
-- lib/friendly_shipping/services/ups/label_options.rb
-- lib/friendly_shipping/services/ups/label_package_options.rb
-- lib/friendly_shipping/services/ups/parse_address_classification_response.rb
-- lib/friendly_shipping/services/ups/parse_address_validation_response.rb
-- lib/friendly_shipping/services/ups/parse_city_state_lookup_response.rb
-- lib/friendly_shipping/services/ups/parse_modifier_element.rb
-- lib/friendly_shipping/services/ups/parse_money_element.rb
-- lib/friendly_shipping/services/ups/parse_rate_response.rb
-- lib/friendly_shipping/services/ups/parse_shipment_accept_response.rb
-- lib/friendly_shipping/services/ups/parse_shipment_confirm_response.rb
-- lib/friendly_shipping/services/ups/parse_time_in_transit_response.rb
-- lib/friendly_shipping/services/ups/parse_void_shipment_response.rb
-- lib/friendly_shipping/services/ups/parse_xml_response.rb
-- lib/friendly_shipping/services/ups/rate_estimate_options.rb
-- lib/friendly_shipping/services/ups/rate_estimate_package_options.rb
-- lib/friendly_shipping/services/ups/serialize_access_request.rb
-- lib/friendly_shipping/services/ups/serialize_address_snippet.rb
-- lib/friendly_shipping/services/ups/serialize_address_validation_request.rb
-- lib/friendly_shipping/services/ups/serialize_city_state_lookup_request.rb
-- lib/friendly_shipping/services/ups/serialize_package_node.rb
-- lib/friendly_shipping/services/ups/serialize_rating_service_selection_request.rb
-- lib/friendly_shipping/services/ups/serialize_shipment_accept_request.rb
-- lib/friendly_shipping/services/ups/serialize_shipment_address_snippet.rb
-- lib/friendly_shipping/services/ups/serialize_shipment_confirm_request.rb
-- lib/friendly_shipping/services/ups/serialize_time_in_transit_request.rb
-- lib/friendly_shipping/services/ups/serialize_void_shipment_request.rb
-- lib/friendly_shipping/services/ups/shipping_methods.rb
-- lib/friendly_shipping/services/ups/timing_options.rb
 - lib/friendly_shipping/services/ups_freight.rb
 - lib/friendly_shipping/services/ups_freight/api_error.rb
 - lib/friendly_shipping/services/ups_freight/generate_commodity_information.rb
@@ -324,26 +291,10 @@ files:
 - lib/friendly_shipping/services/ups_json/rates_package_options.rb
 - lib/friendly_shipping/services/ups_json/shipping_methods.rb
 - lib/friendly_shipping/services/ups_json/timings_options.rb
-- lib/friendly_shipping/services/usps.rb
-- lib/friendly_shipping/services/usps/choose_package_rate.rb
-- lib/friendly_shipping/services/usps/machinable_package.rb
-- lib/friendly_shipping/services/usps/parse_address_validation_response.rb
-- lib/friendly_shipping/services/usps/parse_city_state_lookup_response.rb
-- lib/friendly_shipping/services/usps/parse_package_rate.rb
-- lib/friendly_shipping/services/usps/parse_rate_response.rb
-- lib/friendly_shipping/services/usps/parse_time_in_transit_response.rb
-- lib/friendly_shipping/services/usps/parse_xml_response.rb
-- lib/friendly_shipping/services/usps/rate_estimate_options.rb
-- lib/friendly_shipping/services/usps/rate_estimate_package_options.rb
-- lib/friendly_shipping/services/usps/serialize_address_validation_request.rb
-- lib/friendly_shipping/services/usps/serialize_city_state_lookup_request.rb
-- lib/friendly_shipping/services/usps/serialize_rate_request.rb
-- lib/friendly_shipping/services/usps/serialize_time_in_transit_request.rb
-- lib/friendly_shipping/services/usps/shipping_methods.rb
-- lib/friendly_shipping/services/usps/timing_options.rb
 - lib/friendly_shipping/services/usps_international.rb
 - lib/friendly_shipping/services/usps_international/parse_package_rate.rb
 - lib/friendly_shipping/services/usps_international/parse_rate_response.rb
+- lib/friendly_shipping/services/usps_international/parse_xml_response.rb
 - lib/friendly_shipping/services/usps_international/rate_estimate_options.rb
 - lib/friendly_shipping/services/usps_international/rate_estimate_package_options.rb
 - lib/friendly_shipping/services/usps_international/serialize_rate_request.rb
@@ -352,6 +303,7 @@ files:
 - lib/friendly_shipping/services/usps_ship/access_token.rb
 - lib/friendly_shipping/services/usps_ship/api_error.rb
 - lib/friendly_shipping/services/usps_ship/machinable_package.rb
+- lib/friendly_shipping/services/usps_ship/parse_city_state_response.rb
 - lib/friendly_shipping/services/usps_ship/parse_rate_estimates_response.rb
 - lib/friendly_shipping/services/usps_ship/parse_timings_response.rb
 - lib/friendly_shipping/services/usps_ship/rate_estimate_options.rb
@@ -370,7 +322,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -385,8 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An integration layer for shipping services
 test_files: []

data/lib/friendly_shipping/services/ups/label.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module FriendlyShipping
-  module Services
-    class Ups
-      class Label < FriendlyShipping::Label
-        attr_reader :usps_tracking_number
-
-        # @param [String] usps_tracking_number The label's usps tracking number. Limited to SUREPOST
-        def initialize(
-          usps_tracking_number: nil,
-          **params
-        )
-          @usps_tracking_number = usps_tracking_number
-          super(**params)
-        end
-      end
-    end
-  end
-end

data/lib/friendly_shipping/services/ups/label_billing_options.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module FriendlyShipping
-  module Services
-    class Ups
-      # Represents billing-related options for obtaining shipment labels.
-      # @option bill_third_party [Boolean] When truthy, bill an account other than the shipper's.
-      #  Specified by billing_(account, zip and country)
-      # @option bill_to_consignee [Boolean] If billing a third party, bill the consignee instead of the 3rd party shipper
-      # @option prepay [Boolean] If truthy the shipper will be bill immediately. Otherwise the shipper is billed
-      #   when the label is used. Default: false
-      class LabelBillingOptions
-        attr_reader :bill_third_party,
-                    :bill_to_consignee,
-                    :prepay,
-                    :billing_account,
-                    :billing_zip,
-                    :billing_country,
-                    :currency
-
-        def initialize(
-          bill_third_party: false,
-          bill_to_consignee: false,
-          prepay: false,
-          billing_account: nil,
-          billing_zip: nil,
-          billing_country: nil,
-          currency: nil
-        )
-          @bill_third_party = bill_third_party
-          @bill_to_consignee = bill_to_consignee
-          @prepay = prepay
-          @billing_account = billing_account
-          @billing_zip = billing_zip
-          @billing_country = billing_country
-          @currency = currency
-        end
-      end
-    end
-  end
-end

data/lib/friendly_shipping/services/ups/label_item_options.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module FriendlyShipping
-  module Services
-    class Ups
-      class LabelItemOptions < FriendlyShipping::ItemOptions
-        PRODUCT_UNIT_OF_MEASURE_CODES = {
-          barrel: 'BA',
-          bundle: 'BE',
-          bag: 'BG',
-          bunch: 'BH',
-          box: 'BOX',
-          bolt: 'BT',
-          butt: 'BU',
-          canister: 'CI',
-          centimeter: 'CM',
-          container: 'CON',
-          crate: 'CR',
-          case: 'CS',
-          carton: 'CT',
-          cylinder: 'CY',
-          dozen: 'DOZ',
-          each: 'EA',
-          envelope: 'EN',
-          feet: 'FT',
-          kilogram: 'KG',
-          kilograms: 'KGS',
-          pound: 'LB',
-          pounds: 'LBS',
-          liter: 'L',
-          meter: 'M',
-          number: 'NMB',
-          packet: 'PA',
-          pallet: 'PAL',
-          piece: 'PC',
-          pieces: 'PCS',
-          proof_liters: 'PF',
-          package: 'PKG',
-          pair: 'PR',
-          pairs: 'PRS',
-          roll: 'RL',
-          set: 'SET',
-          square_meters: 'SME',
-          square_yards: 'SYD',
-          tube: 'TU',
-          yard: 'YD',
-          other: 'OTH'
-        }.freeze
-
-        attr_reader :commodity_code,
-                    :country_of_origin
-
-        def initialize(
-          commodity_code: nil,
-          country_of_origin: nil,
-          product_unit_of_measure: :number,
-          **kwargs
-        )
-          @commodity_code = commodity_code
-          @country_of_origin = country_of_origin
-          @product_unit_of_measure = product_unit_of_measure
-          super(**kwargs)
-        end
-
-        def product_unit_of_measure_code
-          PRODUCT_UNIT_OF_MEASURE_CODES[product_unit_of_measure]
-        end
-
-        private
-
-        attr_reader :product_unit_of_measure
-      end
-    end
-  end
-end