friendly_shipping 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 107fa27ec95b49342549dbf24c53cc483cd05bdfbb64871940036aaac6567eb6
-  data.tar.gz: 7dd9c281178e513482ae0cb93787eb551b09e5f697f10d4db50dc2aef21dd4a8
+  metadata.gz: 921ae3f517c9fcf14e7932e110b6468d7bf2b78e46864bb50a3272b6257e2bea
+  data.tar.gz: d7cf64cc30bedd17adca882b9365f647498f8c4430f59e0a4fe1a00efe1ac017
 SHA512:
-  metadata.gz: 30c37297f77dc6be490cf9719211780b81b0d91cdc49311b349fc3844a6cbcb5755265e663b80e24a67cda9847e19d328808cec786cf7172d6986ccb75bbf6eb
-  data.tar.gz: 022c69680c07d9fed0b2b9afa8093e40b20bb7b441b332acd743078f74db70f3de03227953952de8b08048aa40eb902895529c781b6332036cf4e38ba653804e
+  metadata.gz: 9080b93ddde6399677499cb65e6b1a184985af772067548b45c977fd6d8744c9c6a08899c2b27426e3fcd795b13950141d017183c40aa25026d7cb3bf2eeb120
+  data.tar.gz: 413036408bfc7852a141c1b19e557b7533ca3288b371e6f5e09d78da279ef470bd764c9c46de145fbc6a079de9b18b858cb5bff75b972d3bed76ce4a946a2626

data/CHANGELOG.md

@@ -4,22 +4,29 @@ 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.4] - 2021-01-27
+## [0.6.5] - 2022-04-25
 
 ### Added
+- USPS Service: Add support for returned dimensional weight (#128)
+- USPS Service: Add support for returned fees (#127)
+
+### Changed
+- ShipEngine Service: Prevent exceptions when no rates are returned (#125)
+- Misc dependency updates (#116, #120, #121, #124)
+
+## [0.6.4] - 2021-01-27
 
+### Added
 - UPS Service: Include negotiated charges for UPS (#119)
 - UPS Service: Include shipment-level itemized charges (#117)
 
 ## [0.6.3] - 2020-10-30
 
 ### Added
-
 - USPS Service: Append HFP (Hold For Pickup) to service code when necessary (#110)
 - USPS Service: Add Priority Cubic shipping method (#113)
 
 ### Changed
-
 - USPS Service: Refactor to use explicit service codes (#111)
 - USPS Service: Match Priority Express by CLASSID instead of service name (#112)
 - UPS Service: Rename peak surcharge keys to match UPS docs (#114)

data/friendly_shipping.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "data_uri", "~> 0.0.3"
+  spec.add_runtime_dependency "data_uri", ">= 0.0.3", "< 0.2.0"
   spec.add_runtime_dependency "dry-monads", "~> 1.0"
   spec.add_runtime_dependency "money", "~> 6.0"
   spec.add_runtime_dependency "nokogiri", "~> 1.6"
@@ -30,15 +30,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client", "~> 2.0"
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_development_dependency "bundler", ">= 1.17", "< 3"
+  spec.add_development_dependency "bundler", ">= 2.1.4", "< 3"
   spec.add_development_dependency "dotenv", "~> 2.7"
-  spec.add_development_dependency "factory_bot", "~> 5.0"
+  spec.add_development_dependency "factory_bot", "~> 6.2"
   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", ">= 0.80", "< 1"
   spec.add_development_dependency "simplecov", "~> 0.17"
-  spec.add_development_dependency "vcr", "~> 5.0"
+  spec.add_development_dependency "vcr", "~> 6.0"
   spec.add_development_dependency "webmock", "~> 3.6"
 end

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

@@ -10,8 +10,14 @@ module FriendlyShipping
 
         class << self
           def call(response:, request:, options:)
+            error_messages = []
             parsed_json = JSON.parse(response.body)
             rates = parsed_json.map do |rate|
+              if rate['validation_status'] == 'invalid'
+                error_messages.concat rate['error_messages']
+                next
+              end
+
               carrier = options.carriers.detect { |c| c.id == rate['carrier_id'] }
               next unless carrier
 
@@ -31,17 +37,33 @@ module FriendlyShipping
               )
             end.compact
 
-            Success(
-              ApiResult.new(
-                rates,
-                original_request: request,
-                original_response: response
+            if valid_rates(parsed_json)
+              Success(
+                ApiResult.new(
+                  rates,
+                  original_request: request,
+                  original_response: response
+                )
+              )
+            else
+              Failure(
+                ApiFailure.new(
+                  error_messages,
+                  original_request: request,
+                  original_response: response
+                )
               )
-            )
+            end
           end
 
           private
 
+          def valid_rates(parsed_json)
+            parsed_json.map do |rate|
+              ["valid", "has_warnings", "unknown"].include? rate['validation_status']
+            end.any?
+          end
+
           def get_amounts(rate_hash)
             [:shipping, :other, :insurance, :confirmation].map do |name|
               currency = Money::Currency.new(rate_hash["#{name}_amount"]["currency"])

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

@@ -55,6 +55,8 @@ module FriendlyShipping
         RATE_TAG = 'Rate'
         COMMERCIAL_RATE_TAG = 'CommercialRate'
         COMMERCIAL_PLUS_RATE_TAG = 'CommercialPlusRate'
+        DIMENSIONAL_WEIGHT_RATE = 'DimensionalWeightRate'
+        FEES = './/Fees/Fee'
         CURRENCY = Money::Currency.new('USD').freeze
 
         class << self
@@ -119,6 +121,17 @@ module FriendlyShipping
             box_name_match = service_name.match(/#{BOX_REGEX}/)
             box_name = box_name_match ? box_name_match.named_captures.compact.keys.last.to_sym : :variable
 
+            dimensional_weight_rate = rate_node.at(DIMENSIONAL_WEIGHT_RATE)&.text&.to_i
+
+            fees = rate_node.xpath(FEES).map do |fee_node|
+              type = fee_node.at('FeeType').text
+              price = fee_node.at('FeePrice').text.to_d
+              {
+                type: type,
+                price: Money.new(price * CURRENCY.subunit_to_unit, CURRENCY)
+              }
+            end
+
             # Combine all the gathered information in a FriendlyShipping::Rate object.
             # Careful: This rate is only for one package within the shipment, and we get multiple
             # rates per package for the different shipping method/box/hold for pickup combinations.
@@ -132,7 +145,9 @@ module FriendlyShipping
                 days_to_delivery: days_to_delivery,
                 military: military,
                 full_mail_service: service_name,
-                service_code: service_code
+                service_code: service_code,
+                dimensional_weight_rate: dimensional_weight_rate,
+                fees: fees
               }
             )
           end

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

@@ -8,6 +8,8 @@ module FriendlyShipping
     #
     # @param [Symbol] box_name The type of box we want to get rates for. Has to be one of the keys
     #  of FriendlyShipping::Services::Usps::CONTAINERS.
+    # @param [Symbol] return_dimensional_weight Boolean indicating whether the response should include dimensional weight.
+    # @param [Symbol] return_fees Boolean indicating whether the response should include fees.
     class Usps
       class RateEstimatePackageOptions < FriendlyShipping::PackageOptions
         attr_reader :box_name,
@@ -16,7 +18,9 @@ module FriendlyShipping
                     :hold_for_pickup,
                     :shipping_method,
                     :transmit_dimensions,
-                    :rectangular
+                    :rectangular,
+                    :return_dimensional_weight,
+                    :return_fees
 
         def initialize(
           box_name: :variable,
@@ -26,6 +30,8 @@ module FriendlyShipping
           shipping_method: nil,
           transmit_dimensions: true,
           rectangular: true,
+          return_dimensional_weight: true,
+          return_fees: false,
           **kwargs
         )
           @box_name = CONTAINERS.key?(box_name) ? box_name : :variable
@@ -35,6 +41,8 @@ module FriendlyShipping
           @shipping_method = shipping_method
           @transmit_dimensions = transmit_dimensions
           @rectangular = rectangular
+          @return_dimensional_weight = return_dimensional_weight
+          @return_fees = return_fees
           super kwargs
         end
 

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

@@ -46,6 +46,8 @@ module FriendlyShipping
                       end
                     end
                     xml.Machinable(machinable(package))
+                    xml.ReturnDimensionalWeight(true) if package_options.return_dimensional_weight
+                    xml.ReturnFees(true) if package_options.return_fees
                   end
                 end
               end

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +112,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -116,7 +122,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -140,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -244,14 +250,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -412,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: An integration layer for shipping services