friendly_shipping 0.9.0 → 0.10.1

data/lib/friendly_shipping/services/ups_freight/generate_freight_ship_request_hash.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/generate_location_hash'
-require 'friendly_shipping/services/ups_freight/generate_reference_hash'
-require 'friendly_shipping/services/ups_freight/generate_document_options_hash'
-require 'friendly_shipping/services/ups_freight/generate_email_options_hash'
-require 'friendly_shipping/services/ups_freight/generate_pickup_options_hash'
-require 'friendly_shipping/services/ups_freight/generate_delivery_options_hash'
-require 'friendly_shipping/services/ups_freight/generate_handling_units_hash'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/parse_freight_label_response.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/parse_shipment_document'
-require 'friendly_shipping/services/ups_freight/shipment_information'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/parse_freight_rate_response.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/rate'
-require 'friendly_shipping/api_result'
-require 'friendly_shipping/services/ups_freight/shipping_methods'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/parse_shipment_document.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/shipment_document'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/rates_options.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/shipment_options'
-require 'friendly_shipping/services/ups_freight/rates_package_options'
-require 'friendly_shipping/services/ups_freight/generate_commodity_information'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/rates_package_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/rates_item_options'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/rates_structure_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_freight/rates_package_options'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight/shipment_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/shipment_options'
-
 module FriendlyShipping
   module Services
     class UpsFreight

data/lib/friendly_shipping/services/ups_freight.rb

@@ -1,26 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads'
-require 'friendly_shipping/http_client'
-require 'friendly_shipping/services/ups_freight/shipping_methods'
-require 'friendly_shipping/services/ups_freight/rates_options'
-require 'friendly_shipping/services/ups_freight/label_options'
-require 'friendly_shipping/services/ups_freight/rates_structure_options'
-require 'friendly_shipping/services/ups_freight/rates_package_options'
-require 'friendly_shipping/services/ups_freight/rates_item_options'
-require 'friendly_shipping/services/ups_freight/label_structure_options'
-require 'friendly_shipping/services/ups_freight/label_package_options'
-require 'friendly_shipping/services/ups_freight/label_item_options'
-require 'friendly_shipping/services/ups_freight/label_document_options'
-require 'friendly_shipping/services/ups_freight/label_email_options'
-require 'friendly_shipping/services/ups_freight/label_pickup_options'
-require 'friendly_shipping/services/ups_freight/label_delivery_options'
-require 'friendly_shipping/services/ups_freight/pickup_request_options'
-require 'friendly_shipping/services/ups_freight/parse_freight_label_response'
-require 'friendly_shipping/services/ups_freight/parse_freight_rate_response'
-require 'friendly_shipping/services/ups_freight/generate_freight_rate_request_hash'
-require 'friendly_shipping/services/ups_freight/generate_freight_ship_request_hash'
-require 'friendly_shipping/services/ups_freight/api_error'
+require "json"
 
 module FriendlyShipping
   module Services

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

@@ -5,23 +5,14 @@ module FriendlyShipping
     class UpsJson
       # Represents an access token returned by UPS. The access token can be used to make API requests.
       # Once it expires, a new token must be created.
-      class AccessToken
-        # @return [Integer] the token's expiration
-        attr_reader :expires_in
-
+      class AccessToken < FriendlyShipping::AccessToken
         # @return [Integer] the epoch time in ms when the token was issued
         attr_reader :issued_at
 
-        # @return [String] the raw JWT token
-        attr_reader :raw_token
-
-        # @param expires_in [Integer] the token's expiration
         # @param issued_at [Integer] the time the token was issued at
-        # @param raw_token [String] the raw JWT token
-        def initialize(expires_in:, issued_at:, raw_token:)
-          @expires_in = expires_in
+        def initialize(issued_at:, **other_kwargs)
           @issued_at = issued_at
-          @raw_token = raw_token
+          super(**other_kwargs)
         end
       end
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/api_error'
-
 module FriendlyShipping
   module Services
     class UpsJson

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class UpsJson
+      class GenerateCityStateLookupPayload
+        def self.call(location:)
+          {
+            XAVRequest: {
+              RegionalRequestIndicator: "1",
+              AddressKeyFormat: [
+                {
+                  PostcodePrimaryLow: location.zip,
+                  CountryCode: location.country.code
+                }
+              ]
+            }
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_json/generate_address_hash'
-require 'friendly_shipping/services/ups_json/generate_package_hash'
-
 module FriendlyShipping
   module Services
     class UpsJson

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_json/generate_address_hash'
-require 'friendly_shipping/services/ups_json/generate_package_hash'
-
 module FriendlyShipping
   module Services
     class UpsJson
@@ -71,7 +68,8 @@ module FriendlyShipping
           }.compact
 
           if options.negotiated_rates
-            payload[:RateRequest][:Shipment][:NegotiatedRatesIndicator] = options.negotiated_rates
+            payload[:RateRequest][:Shipment][:ShipmentRatingOptions] ||= {}
+            payload[:RateRequest][:Shipment][:ShipmentRatingOptions][:NegotiatedRatesIndicator] = "X"
           end
 
           payload

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/item_options'
-
 module FriendlyShipping
   module Services
     class UpsJson

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_json/label_package_options'
-require 'friendly_shipping/services/ups_json/label_billing_options'
-
 module FriendlyShipping
   module Services
     # Option container for a generating UPS labels for a shipment

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_json/label_item_options'
-
 module FriendlyShipping
   module Services
     class UpsJson

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class UpsJson
+      class ParseCityStateLookupResponse
+        extend Dry::Monads::Result::Mixin
+
+        def self.call(request:, response:)
+          parsed_response = ParseJsonResponse.call(
+            request: request,
+            response: response,
+            expected_root_key: 'XAVResponse'
+          )
+          parsed_response.bind do |city_state_lookup_response|
+            if city_state_lookup_response['XAVResponse'].keys.include?('NoCandidatesIndicator')
+              Failure(
+                FriendlyShipping::ApiResult.new(
+                  "No candidates found.",
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            else
+              candidate = city_state_lookup_response.dig('XAVResponse', 'Candidate').first
+              Success(
+                FriendlyShipping::ApiResult.new(
+                  Physical::Location.new(
+                    city: candidate.dig('AddressKeyFormat', 'PoliticalDivision2'),
+                    region: candidate.dig('AddressKeyFormat', 'PoliticalDivision1'),
+                    country: candidate.dig('AddressKeyFormat', 'CountryCode'),
+                    zip: candidate.dig('AddressKeyFormat', 'PostcodePrimaryLow')
+                  ),
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module FriendlyShipping
       class ParseJsonResponse
         extend Dry::Monads::Result::Mixin
         SUCCESSFUL_RESPONSE_STATUS_CODE = '1'
+        UNEXPECTED_ROOT_KEY_STRING = 'Empty or unexpected root key'
 
         class << self
           def call(request:, response:, expected_root_key:)
@@ -15,23 +16,29 @@ module FriendlyShipping
             # UPS may return a 2xx status code on an unsuccessful request and include the error description in
             # the response headers, which we will consider a failure
             if api_error_message.present?
-              wrap_failure(api_error_message, request, response)
+              wrap_failure(api_error(api_error_message), request, response)
             elsif response_body.nil? || response_body.keys.first != expected_root_key
-              wrap_failure('Empty or unexpected root key', request, response)
+              wrap_failure(api_error(UNEXPECTED_ROOT_KEY_STRING), request, response)
             else
               Success(response_body)
             end
           rescue JSON::ParserError => e
             # when the response is not valid JSON(?!), the error description in the header is more descriptive
-            wrap_failure(api_error_message || e, request, response)
+            return wrap_failure(api_error(api_error_message), request, response) if api_error_message
+
+            wrap_failure(e, request, response)
           end
 
           private
 
-          def wrap_failure(failure, request, response)
+          def api_error(message)
+            FriendlyShipping::ApiError.new(nil, message)
+          end
+
+          def wrap_failure(error, request, response)
             Failure(
-              FriendlyShipping::ApiFailure.new(
-                failure,
+              FriendlyShipping::ApiResult.new(
+                error,
                 original_request: request,
                 original_response: response
               )

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

@@ -33,7 +33,7 @@ module FriendlyShipping
                 usps_tracking_number: package["USPSPICNumber"],
                 label_data: Base64.decode64(package["ShippingLabel"]["GraphicImage"]),
                 label_format: package["ShippingLabel"]["ImageFormat"]["Code"],
-                label_href: package["LabelURL"],
+                label_href: package["LabelURL"] || shipment_result["LabelURL"],
                 cost: package_cost,
                 shipment_cost: get_shipment_cost(shipment_result),
                 data: {
@@ -47,9 +47,9 @@ module FriendlyShipping
 
           def build_cost_breakdown(package)
             costs = [
-              package["BaseServiceCharge"],
-              Array.wrap(package["ServiceOptionsCharges"]),
-              Array.wrap(package["ItemizedCharges"])
+              package["BaseServiceCharge"]&.merge("Code" => "BaseServiceCharge"),
+              package["ServiceOptionsCharges"],
+              package["ItemizedCharges"]
             ].flatten
 
             costs.map { |cost| ParseMoneyHash.call(cost, "UnknownSurcharge") }.compact.to_h

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

@@ -15,7 +15,7 @@ module FriendlyShipping
           amount = Money.new(monetary_value * currency.subunit_to_unit, currency)
 
           surcharge_code = money_hash['Code']
-          label = surcharge_code ? UPS_SURCHARGE_CODES[surcharge_code] : key_name
+          label = UPS_SURCHARGE_CODES[surcharge_code] || surcharge_code || key_name
 
           [label, amount]
         end

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

@@ -6,7 +6,7 @@ module FriendlyShipping
       class ParseRateModifierHash
         # @param [Hash] hash the RateModifier hash from the source JSON
         # @param [String] currency_code The currency code for this modifier's amount (i.e. 'USD')
-        # @return [Hash]
+        # @return [Array] The label and the amount of the rate modifier
         def self.call(rate_modifier, currency_code:)
           return unless rate_modifier
 
@@ -20,7 +20,7 @@ module FriendlyShipping
           modifier_description = rate_modifier['ModifierDesc']
           label = "#{modifier_type} (#{modifier_description})"
 
-          { label => amount }
+          [label, amount]
         end
       end
     end

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

@@ -32,13 +32,9 @@ module FriendlyShipping
               days_to_delivery = rated_shipment.dig('GuaranteedDelivery', 'BusinessDaysInTransit').to_i
               total_cost = ParseMoneyHash.call(rated_shipment['TotalCharges'], 'TotalCharges').last
               insurance_price = ParseMoneyHash.call(rated_shipment['ServiceOptionsCharges'], 'ServiceOptionsCharges')&.last
-              negotiated_rate = ParseMoneyHash.call(rated_shipment.dig('NegotiatedRates', 'NetSummaryCharges', 'GrandTotal'), 'GrandTotal')&.last
-              negotiated_charges = ParseMoneyHash.call(rated_shipment.dig('NegotiatedRates', 'ItemizedCharges'), 'ItemizedCharges')&.last
-
-              itemized_charges = Array.wrap(rated_shipment['ItemizedCharges'])
-              itemized_charges = itemized_charges.map do |charge|
-                ParseMoneyHash.call(charge, 'MonetaryValue')
-              end
+              negotiated_rate = ParseMoneyHash.call(rated_shipment.dig('NegotiatedRateCharges', 'TotalCharge'), 'TotalCharge')&.last
+              negotiated_charges = extract_charges(rated_shipment.dig('NegotiatedRateCharges', 'ItemizedCharges'), 'ItemizedCharges')
+              itemized_charges = extract_charges(rated_shipment['ItemizedCharges'], 'ItemizedCharges')
 
               rated_shipment_warnings = Array.wrap(rated_shipment['RatedShipmentAlert'])
               rated_shipment_warnings = rated_shipment_warnings.map { |alert| alert["Description"] }
@@ -74,13 +70,13 @@ module FriendlyShipping
             package_array.map do |rated_package|
               currency_code = rated_package.dig('TotalCharges', 'CurrencyCode')
               {
-                transportation_charges: ParseMoneyHash.call(rated_package['TransportationCharges'], 'TransportationCharges'),
-                base_service_charge: ParseMoneyHash.call(rated_package['BaseServiceCharge'], 'BaseServiceCharge'),
-                service_options_charges: ParseMoneyHash.call(rated_package['ServiceOptionsCharges'], 'ServiceOptionsCharges'),
+                transportation_charges: ParseMoneyHash.call(rated_package['TransportationCharges'], 'TransportationCharges')&.last,
+                base_service_charge: ParseMoneyHash.call(rated_package['BaseServiceCharge'], 'BaseServiceCharge')&.last,
+                service_options_charges: ParseMoneyHash.call(rated_package['ServiceOptionsCharges'], 'ServiceOptionsCharges')&.last,
                 itemized_charges: extract_charges(rated_package['ItemizedCharges'], 'ItemizedCharges'),
-                total_charges: ParseMoneyHash.call(rated_package['TotalCharges'], 'TotalCharges'),
-                negotiated_charges: extract_charges(rated_package.dig('NegotiatedRateCharges', 'ItemizedCharges'), 'ItemizedCharges'),
-                rate_modifiers: extract_modifiers(rated_package['RateModifier'], currency_code: currency_code).inject(:merge),
+                total_charges: ParseMoneyHash.call(rated_package['TotalCharges'], 'TotalCharges')&.last,
+                negotiated_charges: extract_charges(rated_package.dig('NegotiatedCharges', 'ItemizedCharges'), 'ItemizedCharges'),
+                rate_modifiers: extract_modifiers(rated_package['RateModifier'], currency_code: currency_code),
                 weight: BigDecimal(rated_package['Weight']),
                 billing_weight: BigDecimal(rated_package.dig('BillingWeight', 'Weight'))
               }.compact
@@ -88,15 +84,21 @@ module FriendlyShipping
           end
 
           def extract_charges(charges, key_name)
+            non_zero_charges = {}
             Array.wrap(charges).map do |charge|
-              ParseMoneyHash.call(charge, key_name)
-            end.compact
+              parsed_charge = ParseMoneyHash.call(charge, key_name)
+              non_zero_charges[parsed_charge[0]] = parsed_charge[1] if parsed_charge.present?
+            end
+            non_zero_charges
           end
 
           def extract_modifiers(modifiers, currency_code:)
+            rate_modifiers = {}
             Array.wrap(modifiers).map do |modifier|
-              ParseRateModifierHash.call(modifier, currency_code: currency_code)
-            end.compact
+              parsed_modifier = ParseRateModifierHash.call(modifier, currency_code: currency_code)
+              rate_modifiers[parsed_modifier[0]] = parsed_modifier[1] if parsed_modifier.present?
+            end
+            rate_modifiers
           end
         end
       end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/item_options'
-
 module FriendlyShipping
   module Services
     class UpsJson

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups_json/rates_package_options'
-
 module FriendlyShipping
   module Services
     # Option container for rating a shipment via UPS

data/lib/friendly_shipping/services/ups_json.rb

@@ -1,28 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads'
-require 'friendly_shipping/http_client'
-require 'friendly_shipping/services/ups_json/access_token'
-require 'friendly_shipping/services/ups_json/api_error'
-require 'friendly_shipping/services/ups_json/generate_address_classification_payload'
-require 'friendly_shipping/services/ups_json/generate_labels_payload'
-require 'friendly_shipping/services/ups_json/generate_rates_payload'
-require 'friendly_shipping/services/ups_json/generate_timings_payload'
-require 'friendly_shipping/services/ups_json/label'
-require 'friendly_shipping/services/ups_json/label_options'
-require 'friendly_shipping/services/ups_json/parse_address_classification_response'
-require 'friendly_shipping/services/ups_json/parse_json_response'
-require 'friendly_shipping/services/ups_json/parse_labels_response'
-require 'friendly_shipping/services/ups_json/parse_money_hash'
-require 'friendly_shipping/services/ups_json/parse_rate_modifier_hash'
-require 'friendly_shipping/services/ups_json/parse_rates_response'
-require 'friendly_shipping/services/ups_json/parse_timings_response'
-require 'friendly_shipping/services/ups_json/parse_void_response'
-require 'friendly_shipping/services/ups_json/rates_item_options'
-require 'friendly_shipping/services/ups_json/rates_package_options'
-require 'friendly_shipping/services/ups_json/rates_options'
-require 'friendly_shipping/services/ups_json/shipping_methods'
-require 'friendly_shipping/services/ups_json/timings_options'
+require "json"
 
 module FriendlyShipping
   module Services
@@ -182,6 +160,28 @@ module FriendlyShipping
         end
       end
 
+      # Find city and state for a given ZIP code
+      # @param [Physical::Location] location A location object with country and ZIP code set
+      # @return [Result<ApiResult<Array<Physical::Location>>>] The response data from UPS encoded in a
+      #   `Physical::Location` object. Country, City and ZIP code will be set, everything else nil.
+      def city_state_lookup(location, debug: false)
+        url = "#{base_url}/api/addressvalidation/v2/1"
+        headers = required_headers(access_token)
+        body = GenerateCityStateLookupPayload.call(location: location).to_json
+
+        request = FriendlyShipping::Request.new(
+          url: url,
+          http_method: "POST",
+          headers: headers,
+          body: body,
+          debug: debug
+        )
+
+        client.post(request).bind do |response|
+          ParseCityStateLookupResponse.call(response: response, request: request)
+        end
+      end
+
       # Void a label, aka by UPS as the Shipping Void Shipment api:
       #   https://developer.ups.com/api/reference?loc=en_US#tag/Shipping_other
       # @param [Label] label The label to be voided

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/parse_xml_response'
-require 'friendly_shipping/services/usps/parse_package_rate'
-require 'friendly_shipping/services/usps/choose_package_rate'
-
 module FriendlyShipping
   module Services
     class Usps

data/lib/friendly_shipping/services/usps/parse_time_in_transit_response.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/parse_xml_response'
-require 'friendly_shipping/timing'
-
 module FriendlyShipping
   module Services
     class Usps

data/lib/friendly_shipping/services/usps/parse_xml_response.rb

@@ -36,7 +36,7 @@ module FriendlyShipping
 
           def wrap_failure(failure, request, response)
             Failure(
-              FriendlyShipping::ApiFailure.new(
+              FriendlyShipping::ApiResult.new(
                 failure,
                 original_request: request,
                 original_response: response

data/lib/friendly_shipping/services/usps/rate_estimate_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/rate_estimate_package_options'
-
 module FriendlyShipping
   module Services
     # Option container for rating a shipment via USPS

data/lib/friendly_shipping/services/usps/rate_estimate_package_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups/rate_estimate_package_options'
-
 module FriendlyShipping
   module Services
     # Options for one package when rating

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/machinable_package'
-
 module FriendlyShipping
   module Services
     class Usps

data/lib/friendly_shipping/services/usps.rb

@@ -1,17 +1,6 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/http_client'
-require 'friendly_shipping/services/usps/shipping_methods'
-require 'friendly_shipping/services/usps/serialize_address_validation_request'
-require 'friendly_shipping/services/usps/serialize_city_state_lookup_request'
-require 'friendly_shipping/services/usps/serialize_rate_request'
-require 'friendly_shipping/services/usps/serialize_time_in_transit_request'
-require 'friendly_shipping/services/usps/parse_address_validation_response'
-require 'friendly_shipping/services/usps/parse_city_state_lookup_response'
-require 'friendly_shipping/services/usps/parse_rate_response'
-require 'friendly_shipping/services/usps/parse_time_in_transit_response'
-require 'friendly_shipping/services/usps/timing_options'
-require 'friendly_shipping/services/usps/rate_estimate_options'
+require 'nokogiri'
 
 module FriendlyShipping
   module Services

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/parse_xml_response'
-require 'friendly_shipping/services/usps_international/parse_package_rate'
-
 module FriendlyShipping
   module Services
     class UspsInternational

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps_international/rate_estimate_package_options'
-
 module FriendlyShipping
   module Services
     # Option container for rating a shipment via USPS

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/ups/rate_estimate_package_options'
-
 module FriendlyShipping
   module Services
     # Options for one package when rating

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/machinable_package'
-
 module FriendlyShipping
   module Services
     class UspsInternational

data/lib/friendly_shipping/services/usps_international.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/http_client'
-require 'friendly_shipping/services/usps_international/shipping_methods'
-require 'friendly_shipping/services/usps_international/serialize_rate_request'
-require 'friendly_shipping/services/usps_international/parse_rate_response'
-require 'friendly_shipping/services/usps_international/rate_estimate_options'
+require 'nokogiri'
 
 module FriendlyShipping
   module Services