friendly_shipping 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2dc4925fb6a2975dc8e0bdee5699d442d0812639f888277666920ea521afda0
-  data.tar.gz: e6a08197f058379eb9c487badf3cfceea0a6b89be15ca6cb9e11c8cafcf0c39d
+  metadata.gz: d1947b72c921f913cd7e75eaf62c82e9453caa017eedd05f3bef555d202d28a9
+  data.tar.gz: 757e4ae6beaf55c89ad726ecf1c7b0609603b033908c7975ba47c436d059f306
 SHA512:
-  metadata.gz: 73bfbaa0235441beb5d84564b7297308e531fc33ac04f45eb0dbe1fc3526ca1aa0fdd44a88232b2f695649dcfa05adc3cc199a53dab392f061b60e591b9cb4a5
-  data.tar.gz: 5cd65e2f58074223cf4c87c18054362dfb533d31095e5d6cc46fc4b55f344335c6d4ae4e6cc98afcfb0837fda6caedaed3816f5a98817974aeaf477bd04efab6
+  metadata.gz: b0091e092439cb74e7d1f34d6342dedbcf15e8d6e451bea5782eda11129df3c94dcb224bb6a319ba859545f090899f0c51f8beb16dbd0de0a91078d57be5521d
+  data.tar.gz: 40d1c62b73125f662061e22c7100d9fa9aa0ec061b18b13066bc3f171e4b60c499ab57aecb77e1a79dc693849ba50fc3391e843bc7626dee6b5563f35039450c

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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -137,7 +137,6 @@ files:
 - lib/friendly_shipping/api_result.rb
 - lib/friendly_shipping/carrier.rb
 - lib/friendly_shipping/http_client.rb
-- lib/friendly_shipping/inflections.rb
 - lib/friendly_shipping/item_options.rb
 - lib/friendly_shipping/label.rb
 - lib/friendly_shipping/package_options.rb
@@ -231,38 +230,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
@@ -325,26 +292,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

data/lib/friendly_shipping/inflections.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# This is necessary for classes with acronyms to autoload in Rails
-if Object.const_defined?('ActiveSupport::Inflector')
-  ActiveSupport::Inflector.inflections(:en) do |inflect|
-    inflect.acronym 'BOL'
-    inflect.acronym 'RL'
-    inflect.acronym 'TForce'
-  end
-end

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

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

@@ -1,174 +0,0 @@
-# frozen_string_literal: true
-
-module FriendlyShipping
-  module Services
-    # Option container for a generating UPS labels for a shipment
-    #
-    # Required:
-    #
-    # @param shipping_method [FriendlyShipping::ShippingMethod] The shipping method to use. We only need the
-    #   service_code to be set.
-    # @param shipper_number [String] account number for the shipper
-    #
-    # Optional:
-    #
-    # @param shipper [Physical::Location] The company sending the shipment. Defaults to the shipment's origin.
-    # @param sub_version [String] The UPS API sub-version to use for requests. Default: 1707
-    # @param customer_context [String ] Optional element to identify transactions between client and server
-    # @param validate_address [Boolean] Validate the city field with ZIP code and state. If false, only ZIP code
-    #   and state are validated. Default: true
-    # @param negotiated_rates [Boolean] if truthy negotiated rates will be requested from ups. Only valid if
-    #   shipper account has negotiated rates. Default: false
-    # @option sold_to [Physical::Location] The person or company who imports and pays any duties due on the
-    #   current shipment. Default: The shipment's destination
-    # @option saturday_delivery [Boolean] should we request Saturday delivery?. Default: false
-    # @option label_format [String] GIF, EPL, ZPL, STARPL and SPL
-    # @option label_size [Array<Integer>] Dimensions of the label. Default: [4, 6]
-    # @option delivery_confirmation [Symbol] Can be set to any key from SHIPMENT_DELIVERY_CONFIRMATION_CODES.
-    #   Only possible for international shipments that are not between the US and Puerto Rico.
-    # @option carbon_neutral [Boolean] Ship with UPS' carbon neutral program
-    # @option return_service_code [Symbol] If present, marks this a return label. The kind
-    #   of return label is specified by the symbol, one of the keys in RETURN_SERVICE_CODES. Default: nil
-    #
-    # Shipment options for international shipping:
-    #
-    # @option paperless_invoice [Boolean] set to truthy if using paperless invoice to ship internationally. Default false
-    # @option terms_of_shipment [Symbol] used with paperless invoice to specify who pays duties and taxes.
-    #   See TERMS_OF_SHIPMENT constant for possible options.
-    # @option reason_for_export [String] A reason to export the current shipment. Possible values: 'SALE', 'GIFT', 'SAMPLE',
-    #   'RETURN', 'REPAIR', 'INTERCOMPANYDATA', Any other reason. Default: 'SALE'.
-    # @option invoice_date [Date] The invoice date for the shipment
-    # @param declaration_statement [String ] Optional element to add customs declaration text
-    #
-    class Ups
-      class LabelOptions < FriendlyShipping::ShipmentOptions
-        SHIPMENT_DELIVERY_CONFIRMATION_CODES = {
-          delivery_confirmation_signature_required: 1,
-          delivery_confirmation_adult_signature_required: 2
-        }.freeze
-
-        TERMS_OF_SHIPMENT_CODES = {
-          cost_and_freight: 'CFR',
-          cost_insurance_and_freight: 'CIF',
-          carriage_and_insurance_paid: 'CIP',
-          carriage_paid_to: 'CPT',
-          delivered_at_frontier: 'DAF',
-          delivery_duty_paid: 'DDP',
-          delivery_duty_unpaid: 'DDU',
-          delivered_ex_quay: 'DEQ',
-          delivered_ex_ship: 'DES',
-          ex_works: 'EXW',
-          free_alongside_ship: 'FAS',
-          free_carrier: 'FCA',
-          free_on_board: 'FOB'
-        }.freeze
-
-        RETURN_SERVICE_CODES = {
-          ups_print_and_mail: 2, # UPS Print and Mail (PNM)
-          ups_return_1_attempt: 3, # UPS Return Service 1-Attempt
-          ups_return_3_attempt: 5, # UPS Return Service 3-Attempt (RS3)
-          ups_electronic_return_label: 8, # UPS Electronic Return Label (ERL)
-          ups_print_return_label: 9, # UPS Print Return Label (PRL)
-          ups_exchange_print_return: 10, # UPS Exchange Print Return Label
-          ups_pack_collect_1_attemt_box_1: 11, # UPS Pack & Collect Service 1-Attempt Box 1
-          ups_pack_collect_1_attemt_box_2: 12, # UPS Pack & Collect Service 1-Attempt Box 2
-          ups_pack_collect_1_attemt_box_3: 13, # UPS Pack & Collect Service 1-Attempt Box 3
-          ups_pack_collect_1_attemt_box_4: 14, # UPS Pack & Collect Service 1-Attempt Box 4
-          ups_pack_collect_1_attemt_box_5: 15, # UPS Pack & Collect Service 1-Attempt Box 5
-          ups_pack_collect_3_attemt_box_1: 16, # UPS Pack & Collect Service 1-Attempt Box 1
-          ups_pack_collect_3_attemt_box_2: 17, # UPS Pack & Collect Service 1-Attempt Box 2
-          ups_pack_collect_3_attemt_box_3: 18, # UPS Pack & Collect Service 1-Attempt Box 3
-          ups_pack_collect_3_attemt_box_4: 19, # UPS Pack & Collect Service 1-Attempt Box 4
-          ups_pack_collect_3_attemt_box_5: 20 # UPS Pack & Collect Service 1-Attempt Box 5
-        }.freeze
-
-        SUB_VERSIONS = %w[1601 1607 1701 1707 1801 1807 2108 2205].freeze
-
-        attr_reader :shipping_method,
-                    :shipper_number,
-                    :shipper,
-                    :sub_version,
-                    :customer_context,
-                    :validate_address,
-                    :negotiated_rates,
-                    :billing_options,
-                    :sold_to,
-                    :saturday_delivery,
-                    :label_format,
-                    :label_size,
-                    :carbon_neutral,
-                    :paperless_invoice,
-                    :reason_for_export,
-                    :invoice_date,
-                    :declaration_statement
-
-        def initialize(
-          shipping_method:,
-          shipper_number:,
-          shipper: nil,
-          sub_version: '1707',
-          customer_context: nil,
-          validate_address: true,
-          negotiated_rates: false,
-          billing_options: LabelBillingOptions.new,
-          sold_to: nil,
-          saturday_delivery: false,
-          label_format: 'GIF',
-          label_size: [4, 6],
-          delivery_confirmation: nil,
-          carbon_neutral: true,
-          return_service: nil,
-          paperless_invoice: false,
-          terms_of_shipment: nil,
-          reason_for_export: 'SALE',
-          invoice_date: nil,
-          package_options_class: LabelPackageOptions,
-          declaration_statement: nil,
-          **kwargs
-        )
-          raise ArgumentError, "Invalid sub-version: #{sub_version}" unless sub_version.in?(SUB_VERSIONS)
-
-          @shipping_method = shipping_method
-          @shipper_number = shipper_number
-          @shipper = shipper
-          @sub_version = sub_version
-          @customer_context = customer_context
-          @validate_address = validate_address
-          @negotiated_rates = negotiated_rates
-          @billing_options = billing_options
-          @sold_to = sold_to
-          @saturday_delivery = saturday_delivery
-          @label_format = label_format
-          @label_size = label_size
-          @delivery_confirmation = delivery_confirmation
-          @carbon_neutral = carbon_neutral
-          @return_service = return_service
-          @paperless_invoice = paperless_invoice
-          @terms_of_shipment = terms_of_shipment
-          @reason_for_export = reason_for_export
-          @invoice_date = invoice_date
-          @declaration_statement = declaration_statement
-          super(**kwargs.reverse_merge(package_options_class: package_options_class))
-        end
-
-        def delivery_confirmation_code
-          SHIPMENT_DELIVERY_CONFIRMATION_CODES[delivery_confirmation]
-        end
-
-        def terms_of_shipment_code
-          TERMS_OF_SHIPMENT_CODES[terms_of_shipment]
-        end
-
-        def return_service_code
-          RETURN_SERVICE_CODES[return_service]
-        end
-
-        private
-
-        attr_reader :terms_of_shipment,
-                    :return_service,
-                    :delivery_confirmation
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module FriendlyShipping
-  module Services
-    class Ups
-      # Package properties relevant for generating a UPS shipping label
-      #
-      # @option reference_numbers [Hash] a Hash where keys are _reference number codes_ and
-      #   values are _reference number values_. Example: `{ reference_numbers: { xn: 'my_reference_1 }`
-      # @option delivery_confirmation [Symbol] Can be set to any key from PACKAGE_DELIVERY_CONFIRMATION_CODES.
-      #   Only possible for domestic shipments or shipments between the US and Puerto Rico.
-      # @option shipper_release [Boolean] Indicates that the package may be released by driver without a signature from
-      #   the consignee. Default: false
-      # @option declared_value [Boolean] When true, declared value (calculated as the sum of all items in the shipment)
-      #   will be included in the request. Default: false
-      class LabelPackageOptions < FriendlyShipping::PackageOptions
-        PACKAGE_DELIVERY_CONFIRMATION_CODES = {
-          delivery_confirmation: 1,
-          delivery_confirmation_signature_required: 2,
-          delivery_confirmation_adult_signature_required: 3
-        }.freeze
-
-        attr_reader :reference_numbers, :shipper_release, :declared_value
-
-        def initialize(
-          reference_numbers: {},
-          delivery_confirmation: nil,
-          shipper_release: false,
-          declared_value: false,
-          **kwargs
-        )
-          @reference_numbers = reference_numbers
-          @delivery_confirmation = delivery_confirmation
-          @shipper_release = shipper_release
-          @declared_value = declared_value
-          super(**kwargs.reverse_merge(item_options_class: LabelItemOptions))
-        end
-
-        def delivery_confirmation_code
-          PACKAGE_DELIVERY_CONFIRMATION_CODES[delivery_confirmation]
-        end
-
-        private
-
-        attr_reader :delivery_confirmation
-      end
-    end
-  end
-end