friendly_shipping 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 821bec044ee86ff1e468dd392ae55c475510af6c
-  data.tar.gz: 153b7226c2e01afe5b6d7fdc260e39b712986ae5
+  metadata.gz: 2eff4626b4d3f7d779b8837725bd6c585fc3bd47
+  data.tar.gz: 3818a4de3a68cb8f9a7cf5d62650e7da66604250
 SHA512:
-  metadata.gz: a1ad8abee5b1a56f33cc8c5b8a4d55d4bce1f056e74a0719ea237ab577587921b43ada0ca50f35ab52bba261b2fc18598e612a82185a9d172c3d45918cf07f8e
-  data.tar.gz: 29a07b0165a570d6cbf5c008e2ff1a67aa6ce2e245be10357cbaaeb13b88c888e74419dec65ca9df7ce147e38524eb1b42a55393dba6f17c8cf2d2e4cef61338
+  metadata.gz: d8a23d14f73876ca9f47b6e5f6272df7d958c0c9f7a754438c9208d8c654e7ba5ca79ee01bdc9d06ed105045335f6a75016007dbdf9166a27fd55b6096c63d8f
+  data.tar.gz: 54458eb117ed1d541af4208979e73f2d1f5ce7e7b8afcbaea702e024165da7c6320e67ffc4d8f82913a8e1e6efb08d29ef1ca44114bef3b09c3f2d1d7d734893

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+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).
+
+## [Unreleased]
+
+## [0.3.3] - 2017-10-25
+
+### Changed
+- Fix: ShipEngine#labels test mode works again.
+
+## [0.3.2] - 2017-10-25
+
+### Changed
+- Fix: ShipEngine#labels now works as expected.
+
+## [0.3.1] - 2017-06-20
+### Added
+- Endpoint for UPS address classification
+
+### Changed
+- `ShipEngine#labels` now needs a second argument, the shipping method.

data/README.md

@@ -48,7 +48,7 @@ The following methods are supported:
 
 - `#carriers` - List all configured carriers
 - `#rate_estimates(physical_shipment, carriers: [friendly_shipping_carrier])` - Get rate estimates for a shipment
-- `#labels(physical_shipment)` - Get labels for a shipments. Currently only supports USPS labels, other services are untested. The API of this method is still subject to change.
+- `#labels(physical_shipment, shipping_method:)` - Get labels for a shipments. Currently only supports USPS labels, other services are untested.
 - `#void(physical_label)` - Void a label and get the cost refunded
 
 #### UPS (United Parcel Service)
@@ -68,6 +68,7 @@ The following methods are supported:
 
 - `#carriers` - List all configured carriers (always returns UPS)
 - `#rate_estimates(physical_shipment)` - Get rate estimates 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.
 

data/lib/friendly_shipping/http_client.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'dry/monads/result'
+require 'rest-client'
+
+module FriendlyShipping
+  class HttpClient
+    include Dry::Monads::Result::Mixin
+
+    attr_reader :error_handler
+
+    def initialize(error_handler: method(:wrap_in_failure))
+      @error_handler = error_handler
+    end
+
+    def get(request)
+      http_response = ::RestClient.get(
+        request.url, request.headers
+      )
+
+      Success(convert_to_friendly_response(http_response))
+    rescue ::RestClient::Exception => e
+      error_handler.call(e)
+    end
+
+    def post(friendly_shipping_request)
+      http_response = ::RestClient.post(
+        friendly_shipping_request.url,
+        friendly_shipping_request.body,
+        friendly_shipping_request.headers
+      )
+
+      Success(convert_to_friendly_response(http_response))
+    rescue ::RestClient::Exception => e
+      error_handler.call(e)
+    end
+
+    def put(request)
+      http_response = ::RestClient.put(
+        request.url,
+        request.body,
+        request.headers
+      )
+
+      Success(convert_to_friendly_response(http_response))
+    rescue ::RestClient::Exception => e
+      error_handler.call(e)
+    end
+
+    private
+
+    def wrap_in_failure(error)
+      Failure(error)
+    end
+
+    def convert_to_friendly_response(http_response)
+      FriendlyShipping::Response.new(
+        status: http_response.code,
+        body: http_response.body,
+        headers: http_response.headers
+      )
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'dry/monads/result'
-require 'friendly_shipping/services/ship_engine/client'
+require 'friendly_shipping/http_client'
+require 'friendly_shipping/services/ship_engine/bad_request_handler'
 require 'friendly_shipping/services/ship_engine/parse_carrier_response'
 require 'friendly_shipping/services/ship_engine/serialize_label_shipment'
 require 'friendly_shipping/services/ship_engine/serialize_rate_estimate_request'
@@ -18,7 +19,7 @@ module FriendlyShipping
         labels: "labels"
       }.freeze
 
-      def initialize(token:, test: true, client: Client)
+      def initialize(token:, test: true, client: FriendlyShipping::HttpClient.new(error_handler: BadRequestHandler))
         @token = token
         @test = test
         @client = client
@@ -27,10 +28,11 @@ module FriendlyShipping
       # Get configured carriers from USPS
       #
       # @return [Result<ApiResult<Array<Carrier>>>] Carriers configured in your shipstation account
-      def carriers
+      def carriers(debug: false)
         request = FriendlyShipping::Request.new(
           url: API_BASE + API_PATHS[:carriers],
-          headers: request_headers
+          headers: request_headers,
+          debug: debug
         )
         client.get(request).fmap do |response|
           ParseCarrierResponse.call(request: request, response: response)
@@ -47,12 +49,13 @@ module FriendlyShipping
       # @return [Result<ApiResult<Array<FriendlyShipping::Rate>>>] When successfully parsing, an array of rates in a Success Monad.
       #   When the parsing is not successful or ShipEngine can't give us rates, a Failure monad containing something that
       #   can be serialized into an error message using `to_s`.
-      def rate_estimates(shipment, options = {})
-        selected_carriers = options[:carriers] || carriers.value!.data
+      def rate_estimates(shipment, selected_carriers: nil, debug: false)
+        selected_carriers ||= carriers.value!.data
         request = FriendlyShipping::Request.new(
           url: API_BASE + 'rates/estimate',
           body: SerializeRateEstimateRequest.call(shipment: shipment, carriers: selected_carriers).to_json,
-          headers: request_headers
+          headers: request_headers,
+          debug: debug
         )
         client.post(request).bind do |response|
           ParseRateEstimateResponse.call(response: response, request: request, carriers: selected_carriers)
@@ -64,13 +67,16 @@ module FriendlyShipping
       # @param [Physical::Shipment] shipment The shipment object we're trying to get labels for
       #   Note: Some ShipEngine carriers, notably USPS, only support one package per shipment, and that's
       #   all that the integration supports at this point.
+      # @param [FriendlyShipping::ShippingMethod] shipping_method The shipping method we want to use.
+      #   Specifically, the "#service_code" will be serialized. If a carrier is set, it's `#id` will
+      #   also be sent to ShipEngine.
       #
       # @return [Result<ApiResult<Array<FriendlyShipping::Label>>>] The label returned.
       #
-      def labels(shipment)
+      def labels(shipment, shipping_method:)
         request = FriendlyShipping::Request.new(
           url: API_BASE + API_PATHS[:labels],
-          body: SerializeLabelShipment.new(shipment: shipment).call.merge(test_label: test).to_json,
+          body: SerializeLabelShipment.call(shipment: shipment, shipping_method: shipping_method, test: test).to_json,
           headers: request_headers
         )
         client.post(request).fmap do |response|
@@ -78,11 +84,12 @@ module FriendlyShipping
         end
       end
 
-      def void(label)
+      def void(label, debug: false)
         request = FriendlyShipping::Request.new(
           url: "#{API_BASE}labels/#{label.id}/void",
           body: '',
-          headers: request_headers
+          headers: request_headers,
+          debug: debug
         )
         client.put(request).bind do |response|
           ParseVoidResponse.call(request: request, response: response)

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module FriendlyShipping
+  module Services
+    class ShipEngine
+      class BadRequest < StandardError
+        attr_reader :rest_error, :response
+
+        def initialize(rest_error)
+          @rest_error = rest_error
+          @response = rest_error.response
+          super parse_json_errors || rest_error
+        end
+
+        private
+
+        def parse_json_errors
+          parsed_body = JSON.parse(response.body)
+          messages = parsed_body.fetch('errors')&.map { |e| e.fetch('message') }
+          messages&.join(', ')
+        rescue JSON::ParserError, KeyError => _e
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'friendly_shipping/services/ship_engine/bad_request'
+
+module FriendlyShipping
+  module Services
+    class ShipEngine
+      class BadRequestHandler
+        extend Dry::Monads::Result::Mixin
+
+        def self.call(error)
+          if error.http_code == 400
+            Failure(BadRequest.new(error))
+          else
+            Failure(error)
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -4,76 +4,78 @@ module FriendlyShipping
   module Services
     class ShipEngine
       class SerializeLabelShipment
-        attr_reader :shipment
+        class << self
+          def call(shipment:, shipping_method:, test:)
+            shipment_hash = {
+              label_format: shipment.options[:label_format].presence || "pdf",
+              label_download_type: shipment.options[:label_download_type].presence || "url",
+              shipment: {
+                service_code: shipping_method.service_code,
+                ship_to: serialize_address(shipment.destination),
+                ship_from: serialize_address(shipment.origin),
+                packages: serialize_packages(shipment.packages)
+              }
+            }
+            # A carrier might not be necessary if the service code is unique within ShipEngine.
+            if shipping_method.carrier
+              shipment_hash[:shipment][:carrier_id] = shipping_method.carrier.id
+            end
 
-        def initialize(shipment:)
-          @shipment = shipment
-        end
+            if test
+              shipment_hash[:test_label] = true
+            end
 
-        def call
-          shipment_hash = {
-            label_format: shipment.options[:label_format].presence || "pdf",
-            label_download_type: shipment.options[:label_download_type].presence || "url",
-            shipment: {
-              service_code: shipment.service_code,
-              ship_to: serialize_address(shipment.destination),
-              ship_from: serialize_address(shipment.origin),
-              packages: serialize_packages(shipment.packages)
-            }
-          }
-          if shipment.options[:carrier_id]
-            shipment_hash[:shipment][:carrier_id] = shipment.options[:carrier_id]
+            shipment_hash
           end
-          shipment_hash
-        end
 
-        private
+          private
 
-        def serialize_address(address)
-          {
-            name: address.name,
-            phone: address.phone,
-            company_name: address.company_name,
-            address_line1: address.address1,
-            address_line2: address.address2,
-            city_locality: address.city,
-            state_province: address.region.code,
-            postal_code: address.zip,
-            country_code: address.country.code,
-            address_residential_indicator: "No"
-          }
-        end
+          def serialize_address(address)
+            {
+              name: address.name,
+              phone: address.phone,
+              company_name: address.company_name,
+              address_line1: address.address1,
+              address_line2: address.address2,
+              city_locality: address.city,
+              state_province: address.region.code,
+              postal_code: address.zip,
+              country_code: address.country.code,
+              address_residential_indicator: "No"
+            }
+          end
 
-        def serialize_packages(packages)
-          packages.map do |package|
-            package_hash = serialize_weight(package.weight)
-            if package.container.properties[:usps_label_messages]
-              package_hash[:label_messages] = package.container.properties[:usps_label_messages]
-            end
-            package_code = package.container.properties[:usps_package_code]
-            if package_code
-              package_hash[:package_code] = package_code
-            else
-              package_hash[:dimensions] = {
-                unit: 'inch',
-                width: package.container.width.convert_to(:inches).value.to_f.round(2),
-                length: package.container.length.convert_to(:inches).value.to_f.round(2),
-                height: package.container.height.convert_to(:inches).value.to_f.round(2)
-              }
+          def serialize_packages(packages)
+            packages.map do |package|
+              package_hash = serialize_weight(package.weight)
+              if package.container.properties[:usps_label_messages]
+                package_hash[:label_messages] = package.container.properties[:usps_label_messages]
+              end
+              package_code = package.container.properties[:usps_package_code]
+              if package_code
+                package_hash[:package_code] = package_code
+              else
+                package_hash[:dimensions] = {
+                  unit: 'inch',
+                  width: package.container.width.convert_to(:inches).value.to_f.round(2),
+                  length: package.container.length.convert_to(:inches).value.to_f.round(2),
+                  height: package.container.height.convert_to(:inches).value.to_f.round(2)
+                }
+              end
+              package_hash
             end
-            package_hash
           end
-        end
 
-        def serialize_weight(weight)
-          ounces = weight.convert_to(:ounce).value.to_f
-          {
-            weight: {
-              # Max weight for USPS First Class is 15.9 oz, not 16 oz
-              value: ounces.between?(15.9, 16) ? 15.9 : ounces,
-              unit: "ounce"
+          def serialize_weight(weight)
+            ounces = weight.convert_to(:ounce).value.to_f
+            {
+              weight: {
+                # Max weight for USPS First Class is 15.9 oz, not 16 oz
+                value: ounces.between?(15.9, 16) ? 15.9 : ounces,
+                unit: "ounce"
+              }
             }
-          }
+          end
         end
       end
     end

data/lib/friendly_shipping/services/ups.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'dry/monads/result'
-require 'friendly_shipping/services/ups/client'
+require 'friendly_shipping/http_client'
 require 'friendly_shipping/services/ups/serialize_access_request'
 require 'friendly_shipping/services/ups/serialize_city_state_lookup_request'
 require 'friendly_shipping/services/ups/serialize_address_validation_request'
 require 'friendly_shipping/services/ups/serialize_rating_service_selection_request'
+require 'friendly_shipping/services/ups/parse_address_classification_response'
 require 'friendly_shipping/services/ups/parse_address_validation_response'
 require 'friendly_shipping/services/ups/parse_city_state_lookup_response'
 require 'friendly_shipping/services/ups/parse_rate_response'
@@ -34,7 +35,7 @@ module FriendlyShipping
         rates: '/ups.app/xml/Rate'
       }.freeze
 
-      def initialize(key:, login:, password:, test: true, client: Client)
+      def initialize(key:, login:, password:, test: true, client: HttpClient.new)
         @key = key
         @login = login
         @password = password
@@ -50,12 +51,13 @@ module FriendlyShipping
       # @param [Physical::Shipment] location The shipment we want to get rates for
       # @return [Result<ApiResult<Array<Rate>>>] The rates returned from UPS encoded in a
       #   `FriendlyShipping::ApiResult` object.
-      def rate_estimates(shipment, _options = {})
+      def rate_estimates(shipment, debug: false)
         rate_request_xml = SerializeRatingServiceSelectionRequest.call(shipment: shipment)
         url = base_url + RESOURCES[:rates]
         request = FriendlyShipping::Request.new(
           url: url,
-          body: access_request_xml + rate_request_xml
+          body: access_request_xml + rate_request_xml,
+          debug: debug
         )
 
         client.post(request).bind do |response|
@@ -69,12 +71,13 @@ module FriendlyShipping
       #   `Physical::Location` object. Name and Company name are always nil, the
       #   address lines will be made conformant to what UPS considers right. The returned location will
       #   have the address_type set if possible.
-      def address_validation(location)
+      def address_validation(location, debug: false)
         address_validation_request_xml = SerializeAddressValidationRequest.call(location: location)
         url = base_url + RESOURCES[:address_validation]
         request = FriendlyShipping::Request.new(
           url: url,
-          body: access_request_xml + address_validation_request_xml
+          body: access_request_xml + address_validation_request_xml,
+          debug: debug
         )
 
         client.post(request).bind do |response|
@@ -82,16 +85,34 @@ module FriendlyShipping
         end
       end
 
+      # Classify an address.
+      # @param [Physical::Location] location The address we want to classify
+      # @return [Result<ApiResult<String>>] Either `"commercial"`, `"residential"`, or `"unknown"`
+      def address_classification(location, debug: false)
+        address_validation_request_xml = SerializeAddressValidationRequest.call(location: location)
+        url = base_url + RESOURCES[:address_validation]
+        request = FriendlyShipping::Request.new(
+          url: url,
+          body: access_request_xml + address_validation_request_xml,
+          debug: debug
+        )
+
+        client.post(request).bind do |response|
+          ParseAddressClassificationResponse.call(response: response, request: request)
+        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)
+      def city_state_lookup(location, debug: false)
         city_state_lookup_request_xml = SerializeCityStateLookupRequest.call(location: location)
         url = base_url + RESOURCES[:city_state_lookup]
         request = FriendlyShipping::Request.new(
           url: url,
-          body: access_request_xml + city_state_lookup_request_xml
+          body: access_request_xml + city_state_lookup_request_xml,
+          debug: debug
         )
 
         client.post(request).bind do |response|

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module FriendlyShipping
+  module Services
+    class Ups
+      class ParseAddressClassificationResponse
+        extend Dry::Monads::Result::Mixin
+
+        def self.call(request:, response:)
+          parsing_result = ParseXMLResponse.call(response.body, 'AddressValidationResponse')
+
+          parsing_result.bind do |xml|
+            address_type = xml.at('AddressClassification/Description')&.text&.downcase
+            Success(
+              FriendlyShipping::ApiResult.new(
+                address_type,
+                original_request: request,
+                original_response: response
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -40,9 +40,9 @@ module FriendlyShipping
 
               # Quote residential rates by default. If UPS doesn't know if the address is residential or
               # commercial, it will quote a residential rate by default. Even with this flag being set,
-              # if UPS knows the address is commercial it will quote a commercial rate.
+              # if UPS knows the address is commercial it will often quote a commercial rate.
               #
-              xml.ResidentialAddressIndicator
+              xml.ResidentialAddressIndicator unless location.commercial?
             end
           end
         end

data/lib/friendly_shipping/services/usps.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'friendly_shipping/services/usps/client'
+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'
@@ -32,7 +32,7 @@ module FriendlyShipping
         rates: 'RateV4'
       }.freeze
 
-      def initialize(login:, test: true, client: Client)
+      def initialize(login:, test: true, client: HttpClient.new)
         @login = login
         @test = test
         @client = client
@@ -57,9 +57,9 @@ module FriendlyShipping
       # @return [Result<Array<FriendlyShipping::Rate>>] When successfully parsing, an array of rates in a Success Monad.
       #   When the parsing is not successful or USPS can't give us rates, a Failure monad containing something that
       #   can be serialized into an error message using `to_s`.
-      def rate_estimates(shipment, options = {})
-        rate_request_xml = SerializeRateRequest.call(shipment: shipment, login: login, shipping_method: options[:shipping_method])
-        request = FriendlyShipping::Request.new(url: base_url, body: "API=#{RESOURCES[:rates]}&XML=#{CGI.escape rate_request_xml}")
+      def rate_estimates(shipment, shipping_method: nil, debug: false)
+        rate_request_xml = SerializeRateRequest.call(shipment: shipment, login: login, shipping_method: shipping_method)
+        request = build_request(api: :rates_request, xml: rate_request_xml, debug: debug)
 
         client.post(request).bind do |response|
           ParseRateResponse.call(response: response, request: request, shipment: shipment)
@@ -72,12 +72,9 @@ module FriendlyShipping
       #   `Physical::Location` object. Name and Company name are always nil, the
       #   address lines will be made conformant to what USPS considers right. The returned location will
       #   have the address_type set if possible.
-      def address_validation(location)
+      def address_validation(location, debug: false)
         address_validation_request_xml = SerializeAddressValidationRequest.call(location: location, login: login)
-        request = FriendlyShipping::Request.new(
-          url: base_url,
-          body: "API=#{RESOURCES[:address_validation]}&XML=#{CGI.escape address_validation_request_xml}"
-        )
+        request = build_request(api: :address_validation, xml: address_validation_request_xml, debug: debug)
 
         client.post(request).bind do |response|
           ParseAddressValidationResponse.call(response: response, request: request)
@@ -88,12 +85,9 @@ module FriendlyShipping
       # @param [Physical::Location] location A location object with country and ZIP code set
       # @return [Result<ApiResult<Array<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_lookup(location)
+      def city_state_lookup(location, debug: false)
         city_state_lookup_request_xml = SerializeCityStateLookupRequest.call(location: location, login: login)
-        request = FriendlyShipping::Request.new(
-          url: base_url,
-          body: "API=#{RESOURCES[:city_state_lookup]}&XML=#{CGI.escape city_state_lookup_request_xml}"
-        )
+        request = build_request(api: :city_state_lookup, xml: city_state_lookup_request_xml, debug: debug)
 
         client.post(request).bind do |response|
           ParseCityStateLookupResponse.call(response: response, request: request)
@@ -102,6 +96,14 @@ module FriendlyShipping
 
       private
 
+      def build_request(api:, xml:, debug:)
+        FriendlyShipping::Request.new(
+          url: base_url,
+          body: "API=#{RESOURCES[api]}&XML=#{CGI.escape xml}",
+          debug: debug
+        )
+      end
+
       def base_url
         test ? TEST_URL : LIVE_URL
       end

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -149,6 +149,7 @@ files:
 - ".rubocop-relaxed.yml"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -160,14 +161,15 @@ files:
 - lib/friendly_shipping.rb
 - lib/friendly_shipping/api_failure.rb
 - lib/friendly_shipping/api_result.rb
-- lib/friendly_shipping/bad_request.rb
 - lib/friendly_shipping/carrier.rb
+- lib/friendly_shipping/http_client.rb
 - lib/friendly_shipping/label.rb
 - lib/friendly_shipping/rate.rb
 - lib/friendly_shipping/request.rb
 - lib/friendly_shipping/response.rb
 - lib/friendly_shipping/services/ship_engine.rb
-- lib/friendly_shipping/services/ship_engine/client.rb
+- lib/friendly_shipping/services/ship_engine/bad_request.rb
+- lib/friendly_shipping/services/ship_engine/bad_request_handler.rb
 - lib/friendly_shipping/services/ship_engine/parse_carrier_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_label_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_rate_estimate_response.rb
@@ -175,7 +177,7 @@ files:
 - lib/friendly_shipping/services/ship_engine/serialize_label_shipment.rb
 - lib/friendly_shipping/services/ship_engine/serialize_rate_estimate_request.rb
 - lib/friendly_shipping/services/ups.rb
-- lib/friendly_shipping/services/ups/client.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_rate_response.rb
@@ -189,7 +191,6 @@ files:
 - lib/friendly_shipping/services/ups/shipping_methods.rb
 - lib/friendly_shipping/services/usps.rb
 - lib/friendly_shipping/services/usps/choose_package_rate.rb
-- lib/friendly_shipping/services/usps/client.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

data/lib/friendly_shipping/bad_request.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module FriendlyShipping
-  class BadRequest < StandardError
-    attr_reader :rest_error, :response
-
-    def initialize(rest_error)
-      @rest_error = rest_error
-      @response = rest_error.response
-      super parse_json_errors || rest_error
-    end
-
-    private
-
-    def parse_json_errors
-      parsed_body = JSON.parse(response.body)
-      messages = parsed_body.fetch('errors')&.map { |e| e.fetch('message') }
-      messages&.join(', ')
-    rescue JSON::ParserError, KeyError => _e
-      nil
-    end
-  end
-end

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

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/monads/result'
-require 'friendly_shipping/bad_request'
-require 'rest-client'
-
-module FriendlyShipping
-  module Services
-    class ShipEngine
-      class Client
-        extend Dry::Monads::Result::Mixin
-        class <<self
-          def get(request)
-            http_response = ::RestClient.get(
-              request.url, request.headers
-            )
-
-            Success(convert_to_friendly_response(http_response))
-          rescue ::RestClient::Exception => e
-            Failure(e)
-          end
-
-          def post(friendly_shipping_request)
-            http_response = ::RestClient.post(
-              friendly_shipping_request.url,
-              friendly_shipping_request.body,
-              friendly_shipping_request.headers
-            )
-
-            Success(convert_to_friendly_response(http_response))
-          rescue ::RestClient::Exception => e
-            if e.http_code == 400
-              Failure(BadRequest.new(e))
-            else
-              Failure(e)
-            end
-          end
-
-          def put(request)
-            http_response = ::RestClient.put(
-              request.url,
-              request.body,
-              request.headers
-            )
-
-            Success(convert_to_friendly_response(http_response))
-          rescue ::RestClient::Exception => e
-            if e.http_code == 400
-              Failure(BadRequest.new(e))
-            else
-              Failure(e)
-            end
-          end
-
-          private
-
-          def convert_to_friendly_response(http_response)
-            FriendlyShipping::Response.new(
-              status: http_response.code,
-              body: http_response.body,
-              headers: http_response.headers
-            )
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/monads/result'
-require 'friendly_shipping/bad_request'
-require 'rest-client'
-
-module FriendlyShipping
-  module Services
-    class Ups
-      class Client
-        extend Dry::Monads::Result::Mixin
-        class << self
-          def post(friendly_shipping_request)
-            http_response = ::RestClient.post(
-              friendly_shipping_request.url,
-              friendly_shipping_request.body,
-              friendly_shipping_request.headers
-            )
-
-            Success(convert_to_friendly_response(http_response))
-          rescue ::RestClient::Exception => e
-            Failure(e)
-          end
-
-          private
-
-          def convert_to_friendly_response(http_response)
-            FriendlyShipping::Response.new(
-              status: http_response.code,
-              body: http_response.body,
-              headers: http_response.headers
-            )
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/monads/result'
-require 'friendly_shipping/bad_request'
-require 'rest-client'
-
-module FriendlyShipping
-  module Services
-    class Usps
-      class Client
-        extend Dry::Monads::Result::Mixin
-        class <<self
-          # USPS allows both GET and POST request. We're using POST here as those request
-          # are less limited in size.
-          def post(request)
-            http_response = ::RestClient.post(request.url, request.body)
-
-            Success(convert_to_friendly_response(http_response))
-          rescue ::RestClient::Exception => e
-            Failure(e)
-          end
-
-          private
-
-          def convert_to_friendly_response(http_response)
-            FriendlyShipping::Response.new(
-              status: http_response.code,
-              body: http_response.body,
-              headers: http_response.headers
-            )
-          end
-        end
-      end
-    end
-  end
-end