friendly_shipping 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe62f43bc8306cc3541524c1be0a3746ce29e460c14903ae57e1f9ee16b3b69
-  data.tar.gz: 4750fdcb3fd536ca2b37ab6c70d0dd289172337cd1b2a430148b8beb2ac47b47
+  metadata.gz: b2dc4925fb6a2975dc8e0bdee5699d442d0812639f888277666920ea521afda0
+  data.tar.gz: e6a08197f058379eb9c487badf3cfceea0a6b89be15ca6cb9e11c8cafcf0c39d
 SHA512:
-  metadata.gz: 348556eb9f2e12e2bdbf66ddb48bbb6ef9c97500ddfea4b9530294be1faf255d95248856a6d83bd5a9b533b878a5e277e1e1d62ca5a575859caec7e38ef77f7e
-  data.tar.gz: 84e0a0cd96e0535a881225a17dfa0d443a52411495b410c5a02719327dc665a77f0109d562024908810d81ab324cc4ec67ae94e0d2dfbfadd9f8a9d3c0060503
+  metadata.gz: 73bfbaa0235441beb5d84564b7297308e531fc33ac04f45eb0dbe1fc3526ca1aa0fdd44a88232b2f695649dcfa05adc3cc199a53dab392f061b60e591b9cb4a5
+  data.tar.gz: 5cd65e2f58074223cf4c87c18054362dfb533d31095e5d6cc46fc4b55f344335c6d4ae4e6cc98afcfb0837fda6caedaed3816f5a98817974aeaf477bd04efab6

data/.circleci/config.yml

@@ -72,4 +72,4 @@ workflows:
             parameters:
               # https://github.com/CircleCI-Public/cimg-ruby
               # only supports the last three ruby versions
-              ruby-version: ["3.2", "3.1", "3.0"]
+              ruby-version: ["3.3", "3.2", "3.1"]

data/.rubocop.yml

@@ -13,6 +13,9 @@ Metrics/BlockLength:
 Style/AccessorGrouping:
   Enabled: false
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: true
 
@@ -25,5 +28,8 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
+Style/SuperArguments:
+  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false

data/README.md

@@ -33,7 +33,7 @@ The individual API endpoints can be reached through the public methods of the re
 
 ### Return values
 
-All calls to `FriendlyShipping` will return a `Dry::Monads::Result` instance, so either a `Success` or `Failure`. Wrapped inside this monad is a `FriendlyShipping::ApiResult` (in the success case) or a `FriendlyShipping::ApiFailure` object that contains the desired data under `#data` `ApiResult` and `ApiFailure` also contain the original request generated by this gem and the response returned by the respective service.
+All calls to `FriendlyShipping` will return a `Dry::Monads::Result` instance, so either a `Success` or `Failure`. Wrapped inside this monad is a `FriendlyShipping::ApiResult` object that contains the desired data under `#data`. `ApiResult` also contains the original request generated by this gem and the response returned by the respective service.
 
 ### Supported Services
 

data/friendly_shipping.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "dry-monads", "~> 1.0"
-  spec.add_runtime_dependency "jwt", "~> 2.7"
-  spec.add_runtime_dependency "money", "~> 6.0"
-  spec.add_runtime_dependency "nokogiri", "~> 1.6"
-  spec.add_runtime_dependency "physical", "~> 0.5", ">= 0.5.1"
-  spec.add_runtime_dependency "rest-client", "~> 2.0"
+  spec.add_dependency "dry-monads", "~> 1.0"
+  spec.add_dependency "jwt", "~> 2.7"
+  spec.add_dependency "money", "~> 6.0"
+  spec.add_dependency "nokogiri", "~> 1.6"
+  spec.add_dependency "physical", "~> 0.5", ">= 0.5.1"
+  spec.add_dependency "rest-client", "~> 2.0"
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/friendly_shipping/access_token.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  # Represents an access token returned by a carrier.
+  class AccessToken
+    # @return [Integer] the token's expiration
+    attr_reader :expires_in
+
+    # @return [String] the raw token
+    attr_reader :raw_token
+
+    # @param expires_in [Integer] the token's expiration
+    def initialize(expires_in:, raw_token:)
+      @expires_in = expires_in
+      @raw_token = raw_token
+    end
+
+    # Decodes and returns the raw token (only applicable to JWT tokens).
+    # @return [Array<Hash>] the decoded token
+    def decoded_token
+      @_decoded_token = JWT.decode(raw_token, nil, false)
+    end
+  end
+end

data/lib/friendly_shipping/api_error.rb

@@ -6,11 +6,13 @@ module FriendlyShipping
     # @return [RestClient::Exception] the cause of the error
     attr_reader :cause
 
-    # @param cause [RestClient::Exception] the cause of the error
+    # @param cause [RestClient::Exception, nil] the cause of the error
     # @param message [String] optional descriptive message
     def initialize(cause, message = nil)
+      raise ArgumentError, "Must provide either a cause or a message" if cause.nil? && message.nil?
+
       @cause = cause
-      super(message || cause.message)
+      super(message || cause&.message)
     end
   end
 end

data/lib/friendly_shipping/api_error_handler.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/api_error'
-
 module FriendlyShipping
   # Handles API errors by wrapping them in an API error class ({ApiError} by default) which
-  # is then wrapped in an {ApiFailure} (along with the original API request and response).
-  # Finally, the {ApiFailure} is then wrapped in a `Dry::Monads::Failure`.
+  # is then wrapped in an {ApiResult} (along with the original API request and response).
+  # Finally, the {ApiResult} is then wrapped in a `Dry::Monads::Failure`.
   class ApiErrorHandler
     include Dry::Monads::Result::Mixin
 
@@ -20,10 +18,10 @@ module FriendlyShipping
     # @param error [StandardError] the error to handle
     # @param original_request [Request] the API request which triggered the error
     # @param original_response [RestClient::Response] the API response containing the error
-    # @return [Failure<ApiFailure>]
+    # @return [Failure<ApiResult>]
     def call(error, original_request: nil, original_response: nil)
       Failure(
-        ApiFailure.new(
+        ApiResult.new(
           api_error_class.new(error),
           original_request: original_request,
           original_response: Response.new_from_rest_client_response(original_response)

data/lib/friendly_shipping/api_failure.rb

@@ -1,15 +1,6 @@
 # frozen_string_literal: true
 
 module FriendlyShipping
-  # Wraps an API result from a request that failed.
-  class ApiFailure < ApiResult
-    # @!attribute [r] data
-    #   The API failure (typically an exception)
-    alias_method :failure, :data
-
-    # @return [#to_s] a string representation of the failure
-    def to_s
-      failure.to_s
-    end
-  end
+  # @deprecated Use {ApiResult} instead
+  ApiFailure = ApiResult
 end

data/lib/friendly_shipping/api_result.rb

@@ -7,6 +7,11 @@ module FriendlyShipping
     # @return [Object] the API result (typically the response body)
     attr_reader :data
 
+    # @!attribute [r] data
+    #   The API failure (typically an exception). This is here to maintain
+    #   backwards compatibility with the deprecated {ApiResult} class.
+    alias_method :failure, :data
+
     # @return [Request] the original API request (if debugging is enabled)
     attr_reader :original_request
 
@@ -28,5 +33,10 @@ module FriendlyShipping
       @original_request = original_request
       @original_response = original_response
     end
+
+    # @return [#to_s] a string representation of the data
+    def to_s
+      data.to_s
+    end
   end
 end

data/lib/friendly_shipping/http_client.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/monads'
-require 'rest-client'
-
-require 'friendly_shipping/api_failure'
-require 'friendly_shipping/api_error_handler'
-
 module FriendlyShipping
   # A façade for `RestClient` which constructs requests, wraps responses in `Dry::Monad`
   # results, and calls the API error handler with failures.
@@ -22,7 +16,7 @@ module FriendlyShipping
 
     # Makes a GET request and handles the response.
     # @param request [Request] the request to GET
-    # @return [Success<Response>, Failure<ApiFailure>]
+    # @return [Success<Response>, Failure<ApiResult>]
     def get(request)
       http_response = ::RestClient.get(
         request.url, request.headers
@@ -35,7 +29,7 @@ module FriendlyShipping
 
     # Makes a DELETE request and handles the response.
     # @param request [Request] the request to DELETE
-    # @return [Success<Response>, Failure<ApiFailure>]
+    # @return [Success<Response>, Failure<ApiResult>]
     def delete(request)
       http_response = ::RestClient.delete(request.url, request.headers)
 
@@ -46,7 +40,7 @@ module FriendlyShipping
 
     # Makes a POST request and handles the response.
     # @param request [Request] the request to POST
-    # @return [Success<Response>, Failure<ApiFailure>]
+    # @return [Success<Response>, Failure<ApiResult>]
     def post(request)
       http_response = ::RestClient.post(
         request.url,
@@ -61,7 +55,7 @@ module FriendlyShipping
 
     # Makes a PUT request and handles the response.
     # @param request [Request] the request to PUT
-    # @return [Success<Response>, Failure<ApiFailure>]
+    # @return [Success<Response>, Failure<ApiResult>]
     def put(request)
       http_response = ::RestClient.put(
         request.url,

data/lib/friendly_shipping/label.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/types'
-
 module FriendlyShipping
   # Base class for a shipping label returned by a carrier API.
   class Label

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

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

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/rl/shipment_options'
-require 'friendly_shipping/services/rl/bol_structures_serializer'
-require 'friendly_shipping/services/rl/bol_packages_serializer'
-
 module FriendlyShipping
   module Services
     class RL

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

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

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

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

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipment_information'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipment_document'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipment_document'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipment_document'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipping_methods'
-
 module FriendlyShipping
   module Services
     class RL
@@ -53,12 +50,42 @@ module FriendlyShipping
             service_levels.map do |service_level|
               shipping_method = SHIPPING_METHODS.detect { |sm| sm.service_code == service_level['Code'] }
               total = Money.new(service_level['NetCharge'].delete('$,.'), CURRENCY)
+
+              charges = parsed_json.dig('RateQuote', 'Charges')
+              cost_breakdown = build_cost_breakdown(charges, service_level)
+
               FriendlyShipping::Rate.new(
                 shipping_method: shipping_method,
-                amounts: { total: total }
+                amounts: { total: total },
+                data: {
+                  cost_breakdown: cost_breakdown
+                }
               )
             end
           end
+
+          # @param [Array<Hash>] charges
+          # @param [Hash] service_level
+          # @return [Array<Hash>]
+          def build_cost_breakdown(charges, service_level)
+            result = charges.map do |charge|
+              {
+                "Type" => charge['Type'].presence,
+                "Description" => charge['Title'],
+                "Weight" => charge['Weight'].presence,
+                "Rate" => charge['Rate'].presence,
+                "Amount" => charge['Amount'].presence
+              }.compact
+            end
+            if service_level['Code'] != 'STD'
+              result << {
+                "Type" => service_level['Code'],
+                "Description" => service_level['Name'],
+                "Amount" => service_level['Charge']
+              }
+            end
+            result
+          end
         end
       end
     end

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'friendly_shipping/services/rl/shipping_methods'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/rl/shipment_options'
-require 'friendly_shipping/services/rl/rate_quote_structures_serializer'
-require 'friendly_shipping/services/rl/rate_quote_packages_serializer'
-
 module FriendlyShipping
   module Services
     class RL

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

@@ -11,8 +11,8 @@ module FriendlyShipping
           def call(location)
             {
               CompanyName: location.company_name.presence || location.name,
-              AddressLine1: location.address1,
-              AddressLine2: location.address2,
+              AddressLine1: truncate(location.address1),
+              AddressLine2: truncate(location.address2),
               City: clean_city(location.city),
               StateOrProvince: location.region.code,
               ZipOrPostalCode: location.zip,
@@ -39,6 +39,13 @@ module FriendlyShipping
           def clean_phone(phone)
             phone.gsub(/^1-/, "").strip
           end
+
+          # @param value [String]
+          # @param length [Integer]
+          # @return [String]
+          def truncate(value, length: 30)
+            value && value[0..(length - 1)].strip
+          end
         end
       end
     end

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

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

data/lib/friendly_shipping/services/rl.rb

@@ -1,23 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads'
-require 'friendly_shipping/http_client'
-require 'friendly_shipping/services/rl/api_error'
-require 'friendly_shipping/services/rl/parse_create_bol_response'
-require 'friendly_shipping/services/rl/parse_invoice_response'
-require 'friendly_shipping/services/rl/parse_print_bol_response'
-require 'friendly_shipping/services/rl/parse_print_shipping_labels_response'
-require 'friendly_shipping/services/rl/parse_rate_quote_response'
-require 'friendly_shipping/services/rl/parse_transit_times_response'
-require 'friendly_shipping/services/rl/serialize_create_bol_request'
-require 'friendly_shipping/services/rl/serialize_location'
-require 'friendly_shipping/services/rl/serialize_rate_quote_request'
-require 'friendly_shipping/services/rl/serialize_transit_times_request'
-require 'friendly_shipping/services/rl/rate_quote_options'
-require 'friendly_shipping/services/rl/bol_options'
-require 'friendly_shipping/services/rl/structure_options'
-require 'friendly_shipping/services/rl/package_options'
-require 'friendly_shipping/services/rl/item_options'
+require "json"
 
 module FriendlyShipping
   module Services
@@ -66,7 +49,7 @@ module FriendlyShipping
       #
       # @param shipment [Physical::Shipment] the shipment for the BOL
       # @param options [BOLOptions] the options for the BOL
-      # @return [Success<ApiResult<ShipmentInformation>>, Failure<ApiFailure>] the BOL from R+L Carriers
+      # @return [Success<ApiResult<ShipmentInformation>>, Failure<ApiResult>] the BOL from R+L Carriers
       def create_bill_of_lading(shipment, options:, debug: false)
         request = FriendlyShipping::Request.new(
           url: api_base + API_PATHS[:bill_of_lading],
@@ -84,7 +67,7 @@ module FriendlyShipping
       # to the {ShipmentInformation} object's documents array.
       #
       # @param shipment_info [ShipmentInformation] the shipment for the BOL
-      # @return [Success<ApiResult<ShipmentDocument>>, Failure<ApiFailure>] the binary BOL document from R+L Carriers
+      # @return [Success<ApiResult<ShipmentDocument>>, Failure<ApiResult>] the binary BOL document from R+L Carriers
       def print_bill_of_lading(shipment_info, debug: false)
         request = FriendlyShipping::Request.new(
           url: api_base + API_PATHS[:print_bol] + "?ProNumber=#{shipment_info.pro_number}",
@@ -108,7 +91,7 @@ module FriendlyShipping
       # @see https://rl-cdn.com/docs/rlc/shipping-forms/shipping-label-select.pdf Shipping label styles
       # @param start_position [Integer] the R+L Carriers start position for the first label (between 1 and 10)
       # @param num_labels [Integer] number of labels to print (between 1 and 100)
-      # @return [Success<ApiResult<ShipmentDocument>>, Failure<ApiFailure>] the binary shipping labels from R+L Carriers
+      # @return [Success<ApiResult<ShipmentDocument>>, Failure<ApiResult>] the binary shipping labels from R+L Carriers
       def print_shipping_labels(shipment_info, style: 1, start_position: 1, num_labels: 4, debug: false)
         request = FriendlyShipping::Request.new(
           url: api_base + API_PATHS[:print_shipping_labels] +

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

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

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

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

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/shipment_options'
-require 'friendly_shipping/services/ship_engine/label_customs_options'
-require 'friendly_shipping/services/ship_engine/customs_items_serializer'
-
 module FriendlyShipping
   module Services
     class ShipEngine

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/package_options'
-require 'friendly_shipping/services/ship_engine/label_item_options'
-
 module FriendlyShipping
   module Services
     class ShipEngine

data/lib/friendly_shipping/services/ship_engine/parse_address_validation_response.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module FriendlyShipping
   module Services
     class ShipEngine
@@ -11,13 +9,13 @@ module FriendlyShipping
         class << self
           # @param [FriendlyShipping::Request] request
           # @param [FriendlyShipping::Response] response
-          # @return [Success<ApiResult<Array<Physical::Location>>>, Failure<ApiFailure>]
+          # @return [Success<ApiResult<Array<Physical::Location>>>, Failure<ApiResult>]
           def call(request:, response:)
             parsed_json = JSON.parse(response.body)
             if parsed_json.first['status'] == "error"
               errors = parsed_json.first['messages'].map { |message| message['message'] }.join(", ")
               Failure(
-                ApiFailure.new(
+                ApiResult.new(
                   errors,
                   original_request: request,
                   original_response: response
@@ -51,7 +49,7 @@ module FriendlyShipping
             end
           rescue JSON::ParserError => e
             Failure(
-              FriendlyShipping::ApiFailure.new(
+              FriendlyShipping::ApiResult.new(
                 e,
                 original_request: request,
                 original_response: response

data/lib/friendly_shipping/services/ship_engine/parse_carrier_response.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module FriendlyShipping
   module Services
     class ShipEngine

data/lib/friendly_shipping/services/ship_engine/parse_label_response.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module FriendlyShipping
   module Services
     class ShipEngine

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module FriendlyShipping
   module Services
     class ShipEngine
@@ -13,7 +11,7 @@ module FriendlyShipping
           # @param request [Request] the request to attach to the API result
           # @param response [Response] the response to parse
           # @param options [RateEstimatesOptions] the options to use when parsing
-          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiFailure<Array<String>>>] the parsed rate estimates or errors
+          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiResult<Array<String>>>] the parsed rate estimates or errors
           def call(response:, request:, options:)
             error_messages = []
             parsed_json = JSON.parse(response.body)
@@ -63,7 +61,7 @@ module FriendlyShipping
               )
             else
               Failure(
-                ApiFailure.new(
+                ApiResult.new(
                   error_messages,
                   original_request: request,
                   original_response: response

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module FriendlyShipping
   module Services
     class ShipEngine
@@ -13,7 +11,7 @@ module FriendlyShipping
           # @param request [Request] the request to attach to the API result
           # @param response [Response] the response to parse
           # @param options [RatesOptions] the options to use when parsing
-          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiFailure<String>>] the parsed rates or error
+          # @return [Success<ApiResult<Array<Rate>>>, Failure<ApiResult<String>>] the parsed rates or error
           def call(request:, response:, options:)
             parsed_json = JSON.parse(response.body)
             rates = build_rates(parsed_json, options)
@@ -28,7 +26,7 @@ module FriendlyShipping
             else
               error = parsed_json.dig("rate_response", "errors", 0, "message") || "Unknown error"
               Failure(
-                ApiFailure.new(
+                ApiResult.new(
                   error,
                   original_request: request,
                   original_response: response

data/lib/friendly_shipping/services/ship_engine/parse_void_response.rb

@@ -9,7 +9,7 @@ module FriendlyShipping
 
         # @param request [Request] the request to attach to the API result
         # @param response [Response] the response to parse
-        # @return [Success<ApiResult<String>>, Failure<ApiFailure<String>>] the success or failure message
+        # @return [Success<ApiResult<String>>, Failure<ApiResult<String>>] the success or failure message
         def self.call(request:, response:)
           parsed_json = JSON.parse(response.body)
           approved, message = parsed_json["approved"], parsed_json["message"]
@@ -19,7 +19,7 @@ module FriendlyShipping
             )
           else
             Failure(
-              ApiFailure.new(message, original_request: request, original_response: response)
+              ApiResult.new(message, original_request: request, original_response: response)
             )
           end
         end

data/lib/friendly_shipping/services/ship_engine/rate_estimates_options.rb

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