friendly_shipping 0.5.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb403d6836f79ac9aa2640acde019549c1bad34f811b83a89200fc42d2988d0
-  data.tar.gz: cafc834f0f658fcbb642b05a63b0ae7a5199c4cb931a763d0fbe818e6120b507
+  metadata.gz: c625d1ee6c38d9d51bbcadd7280f6b0b415cecb5256d5d884c1da53b6a2afd38
+  data.tar.gz: 4ce888754298c7a7b5bddb724bb518fb2a0e8993f497188756a70cf72965f5cb
 SHA512:
-  metadata.gz: d57c7d63efe4b830468831b40dd0f983fd4c500da0a0a7bb27d75b0f789041fdf39f22ce737d4bbf9c5c8853fc0207133df1188b64a73e5389d6898dfc15add0
-  data.tar.gz: d582a29e16a2d99bd397bb955ade4b0d220a93e749b0f0cbb96d645aa71c7ece47197b74fd5a65c2d2cd95988612b6f71c3599220aea4a97b3ae73606be4cb72
+  metadata.gz: c20df19636bdc7ace8658ada396f7d094da5f7ea776e6b555af0aa875e893a0d5d6bb5143e1ee9ac89922c8924478caf08afd6527859d539318d7971c054112a
+  data.tar.gz: b5ba5a4fc4b5c66861c4d04743f30ce0a3d5ad3452dad0646bc9a8683a666d76ef41b4eec9bb583713d9a500ae5632341cc92e331acdd71c89d42c21c221b190

data/.rubocop-relaxed.yml

@@ -133,6 +133,9 @@ Style/WordArray:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#stylewordarray
 
+Layout/LineLength:
+  Enabled: false
+
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#lintambiguousregexpliteral
@@ -156,9 +159,6 @@ Metrics/ModuleLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -167,4 +167,3 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Enabled: false
-

data/.rubocop.yml

@@ -6,3 +6,12 @@ inherit_from:
 
 Metrics/BlockLength:
   Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/CHANGELOG.md

@@ -4,11 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.2] - 2020-08-12
+
+- UPS Service: Be more resilient when UPS does not send a PickupTime element
+
+## [0.6.1] - 2020-03-11
+
+- Add Content-Type header to UPS Freight API requests, fixing "Name too long" 500 error responses
+
+## [0.6.0] - 2020-03-11
+
+- Changelog additions missed in previous release
+
+## [0.5.3] - 2020-03-11
+
+- UPS Service: Add support for shipping labels / bills of lading (#92)
+- UPS/USPS Services: Return ApiFailure instead of a string for failed API responses (#95)
+- UPS/USPS Services: Refactor ApiFailure to subclass ApiResponse (#96)
+
+## [0.5.2] - 2020-01-31
+
+### Added
+- USPS Service: Added rectangular boolean to rate options class (#89)
+- USPS Service: Added readable body to request class (#88)
+
+### Removed
+- USPS Service: Drop deprecated rectangular container (#89)
+
 ## [0.5.1] - 2020-01-28
 
 ### Changed
 - USPS Service: Rename "Package Services" shipping method (#85)
-- Documentation updates (#86) 
+- Documentation updates (#86)
 
 ## [0.5] - 2020-01-24
 

data/friendly_shipping.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "An integration layer for shipping services"
   spec.description   = "Allows you to quote or ship a Physical::Shipment object"
-  spec.homepage      = "https://github.com/friendly_cart/friendly_shipping"
+  spec.homepage      = "https://github.com/friendlycart/friendly_shipping"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -24,21 +24,21 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "data_uri", "~> 0.0.3"
   spec.add_runtime_dependency "dry-monads", "~> 1.0"
-  spec.add_runtime_dependency "money", ">= 6.0.0"
-  spec.add_runtime_dependency "nokogiri", ">= 1.6"
-  spec.add_runtime_dependency "physical", ">= 0.4.4"
+  spec.add_runtime_dependency "money", "~> 6.0"
+  spec.add_runtime_dependency "nokogiri", "~> 1.6"
+  spec.add_runtime_dependency "physical", "~> 0.4", ">= 0.4.4"
   spec.add_runtime_dependency "rest-client", "~> 2.0"
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "dotenv"
+  spec.add_development_dependency "bundler", ">= 1.17", "< 3"
+  spec.add_development_dependency "dotenv", "~> 2.7"
   spec.add_development_dependency "factory_bot", "~> 5.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry", "~> 0.12"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rubocop", ">= 0.80", "< 1"
+  spec.add_development_dependency "simplecov", "~> 0.17"
+  spec.add_development_dependency "vcr", "~> 5.0"
+  spec.add_development_dependency "webmock", "~> 3.6"
 end

data/lib/friendly_shipping/api_failure.rb

@@ -1,21 +1,8 @@
 # frozen_string_literal: true
 
 module FriendlyShipping
-  class ApiFailure
-    attr_reader :failure, :original_request, :original_response
-
-    # @param [Object] failure The API failure
-    # @param [FriendlyShipping::Request] original_request The HTTP request (when debugging is enabled)
-    # @param [FriendlyShipping::Response] original_response The HTTP response (when debugging is enabled)
-    def initialize(failure, original_request:, original_response:)
-      @failure = failure
-
-      # We do not want to attach debugging information in every single response to save memory in production
-      return unless original_request&.debug
-
-      @original_request = original_request
-      @original_response = original_response
-    end
+  class ApiFailure < ApiResult
+    alias_method :failure, :data
 
     def to_s
       failure.to_s

data/lib/friendly_shipping/http_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/monads/result'
+require 'friendly_shipping/api_failure'
 require 'rest-client'
 
 module FriendlyShipping
@@ -21,19 +22,19 @@ module FriendlyShipping
 
       Success(convert_to_friendly_response(http_response))
     rescue ::RestClient::Exception => e
-      error_handler.call(e)
+      error_handler.call(e, original_request: request, original_response: e.response)
     end
 
-    def post(friendly_shipping_request)
+    def post(request)
       http_response = ::RestClient.post(
-        friendly_shipping_request.url,
-        friendly_shipping_request.body,
-        friendly_shipping_request.headers
+        request.url,
+        request.body,
+        request.headers
       )
 
       Success(convert_to_friendly_response(http_response))
     rescue ::RestClient::Exception => e
-      error_handler.call(e)
+      error_handler.call(e, original_request: request, original_response: e.response)
     end
 
     def put(request)
@@ -45,13 +46,19 @@ module FriendlyShipping
 
       Success(convert_to_friendly_response(http_response))
     rescue ::RestClient::Exception => e
-      error_handler.call(e)
+      error_handler.call(e, original_request: request, original_response: e.response)
     end
 
     private
 
-    def wrap_in_failure(error)
-      Failure(error)
+    def wrap_in_failure(error, original_request: nil, original_response: nil)
+      Failure(
+        ApiFailure.new(
+          error,
+          original_request: original_request,
+          original_response: original_response
+        )
+      )
     end
 
     def convert_to_friendly_response(http_response)

data/lib/friendly_shipping/request.rb

@@ -6,13 +6,19 @@ module FriendlyShipping
 
     # @param [String] url The HTTP request URL
     # @param [String] body The HTTP request body
+    # # @param [String] readable_body Human-readable HTTP request body
     # @param [Hash] headers The HTTP request headers
     # @param [Boolean] debug Whether to debug the request
-    def initialize(url:, body: nil, headers: {}, debug: false)
+    def initialize(url:, body: nil, readable_body: nil, headers: {}, debug: false)
       @url = url
       @body = body
+      @readable_body = readable_body
       @headers = headers
       @debug = debug
     end
+
+    def readable_body
+      @readable_body.presence || @body
+    end
   end
 end

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

@@ -8,11 +8,23 @@ module FriendlyShipping
       class BadRequestHandler
         extend Dry::Monads::Result::Mixin
 
-        def self.call(error)
+        def self.call(error, original_request: nil, original_response: nil)
           if error.http_code == 400
-            Failure(BadRequest.new(error))
+            Failure(
+              ApiFailure.new(
+                BadRequest.new(error),
+                original_request: original_request,
+                original_response: original_response
+              )
+            )
           else
-            Failure(error)
+            Failure(
+              ApiFailure.new(
+                error,
+                original_request: original_request,
+                original_response: original_response
+              )
+            )
           end
         end
       end

data/lib/friendly_shipping/services/ups.rb

@@ -74,6 +74,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + rate_request_xml,
+          readable_body: rate_request_xml,
           debug: debug
         )
 
@@ -95,6 +96,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: time_in_transit_url,
           body: access_request_xml + time_in_transit_request_xml,
+          readable_body: time_in_transit_request_xml,
           debug: debug
         )
 
@@ -114,6 +116,7 @@ module FriendlyShipping
         ship_confirm_request = FriendlyShipping::Request.new(
           url: ship_confirm_url,
           body: access_request_xml + ship_confirm_request_xml,
+          readable_body: ship_confirm_request_xml,
           debug: debug
         )
 
@@ -132,6 +135,7 @@ module FriendlyShipping
           ship_accept_request = FriendlyShipping::Request.new(
             url: ship_accept_url,
             body: access_request_xml + ship_accept_request_xml,
+            readable_body: ship_accept_request_xml,
             debug: debug
           )
 
@@ -153,6 +157,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + address_validation_request_xml,
+          readable_body: address_validation_request_xml,
           debug: debug
         )
 
@@ -170,6 +175,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + address_validation_request_xml,
+          readable_body: address_validation_request_xml,
           debug: debug
         )
 
@@ -188,6 +194,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + city_state_lookup_request_xml,
+          readable_body: city_state_lookup_request_xml,
           debug: debug
         )
 
@@ -202,6 +209,7 @@ module FriendlyShipping
         request = FriendlyShipping::Request.new(
           url: url,
           body: access_request_xml + void_request_xml,
+          readable_body: void_request_xml,
           debug: debug
         )
         client.post(request).bind do |response|

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

@@ -7,8 +7,11 @@ module FriendlyShipping
         extend Dry::Monads::Result::Mixin
 
         def self.call(request:, response:)
-          parsing_result = ParseXMLResponse.call(response.body, 'AddressValidationResponse')
-
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'AddressValidationResponse'
+          )
           parsing_result.bind do |xml|
             address_type = xml.at('AddressClassification/Description')&.text&.downcase
             Success(

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

@@ -7,8 +7,11 @@ module FriendlyShipping
         extend Dry::Monads::Result::Mixin
 
         def self.call(request:, response:)
-          parsing_result = ParseXMLResponse.call(response.body, 'AddressValidationResponse')
-
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'AddressValidationResponse'
+          )
           parsing_result.bind do |xml|
             if xml.at('NoCandidatesIndicator')
               Failure(

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

@@ -7,8 +7,11 @@ module FriendlyShipping
         extend Dry::Monads::Result::Mixin
 
         def self.call(request:, response:, location:)
-          parsing_result = ParseXMLResponse.call(response.body, 'AddressValidationResponse')
-
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'AddressValidationResponse'
+          )
           parsing_result.fmap do |xml|
             FriendlyShipping::ApiResult.new(
               [

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

@@ -9,7 +9,11 @@ module FriendlyShipping
       class ParseRateResponse
         class << self
           def call(request:, response:, shipment:)
-            parsing_result = ParseXMLResponse.call(response.body, 'RatingServiceSelectionResponse')
+            parsing_result = ParseXMLResponse.call(
+              request: request,
+              response: response,
+              expected_root_tag: 'RatingServiceSelectionResponse'
+            )
             parsing_result.fmap do |xml|
               FriendlyShipping::ApiResult.new(
                 build_rates(xml, shipment),

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

@@ -11,7 +11,11 @@ module FriendlyShipping
 
         class << self
           def call(request:, response:)
-            parsing_result = ParseXMLResponse.call(response.body, 'ShipmentAcceptResponse')
+            parsing_result = ParseXMLResponse.call(
+              request: request,
+              response: response,
+              expected_root_tag: 'ShipmentAcceptResponse'
+            )
             parsing_result.fmap do |xml|
               FriendlyShipping::ApiResult.new(
                 build_labels(xml),

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

@@ -7,7 +7,11 @@ module FriendlyShipping
     class Ups
       class ParseShipmentConfirmResponse
         def self.call(request:, response:)
-          parsing_result = ParseXMLResponse.call(response.body, 'ShipmentConfirmResponse')
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'ShipmentConfirmResponse'
+          )
           parsing_result.fmap do |xml|
             FriendlyShipping::ApiResult.new(
               xml.root.at('ShipmentDigest').text,

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

@@ -5,7 +5,11 @@ module FriendlyShipping
     class Ups
       class ParseTimeInTransitResponse
         def self.call(request:, response:)
-          parsing_result = ParseXMLResponse.call(response.body, 'TimeInTransitResponse')
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'TimeInTransitResponse'
+          )
           parsing_result.fmap do |xml|
             origin_country_code = xml.at('TransitResponse/TransitFrom/AddressArtifactFormat/CountryCode').text
             timings = xml.root.xpath('//TransitResponse/ServiceSummary').map do |service_summary|
@@ -21,7 +25,7 @@ module FriendlyShipping
               delivery_time = service_summary.at('EstimatedArrival/Time').text
               delivery = Time.parse("#{delivery_date} #{delivery_time}")
               pickup_date = service_summary.at('EstimatedArrival/PickupDate').text
-              pickup_time = service_summary.at('EstimatedArrival/PickupTime').text
+              pickup_time = service_summary.at('EstimatedArrival/PickupTime')&.text
               pickup = Time.parse("#{pickup_date} #{pickup_time}")
 
               # Some additional data

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

@@ -7,7 +7,11 @@ module FriendlyShipping
     class Ups
       class ParseVoidShipmentResponse
         def self.call(request:, response:)
-          parsing_result = ParseXMLResponse.call(response.body, 'VoidShipmentResponse')
+          parsing_result = ParseXMLResponse.call(
+            request: request,
+            response: response,
+            expected_root_tag: 'VoidShipmentResponse'
+          )
           parsing_result.fmap do |xml|
             FriendlyShipping::ApiResult.new(
               xml.root.at('ResponseStatusDescription').text,