friendly_shipping 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c75e81bbcef45d76dadd8e02683a43797c06f88712adb09fd5f185219364c83
-  data.tar.gz: 6c0aa8348d4468c564a35026afed777041f42ffc905f21a6559df363d5784ea5
+  metadata.gz: ad0bd0ca10d1e4d781445eae63c71f67361da4f1dc7d8f1fe86c5372371ede0a
+  data.tar.gz: 3a327d0fc73633dc59c7e669db85d649d3d8daa8ae2a08d15ebde792d1a19679
 SHA512:
-  metadata.gz: a46dae2ab3fb93a90e0d2d8d97a70a0fa0147b700662de40d3e31ce84856634e744d8531b3d75ff4559b8a5eb759a419af41165172440b4eb8238a7935a075c1
-  data.tar.gz: b2316af744ca94fae7db521cf7dc52899acb726e3b4803440928b9ba516fc53e3284043d9e7114893d09ff58fa24b786ab99896ab7b67a169fc14212e6dc0d41
+  metadata.gz: 6db80ebea75835a2d100b46250e18e43231051e895c57ca6dc71bf63a16e6d3ca06396dba9b865b62cb6580e1bad54ed64b9e2785c23df5edbb18c5e37f5d2d4
+  data.tar.gz: d3d1d930b11db4dc22e052ed7ce49b5a9be371a0d384cfdb38830383660de60532db044e252a9e2219203cab4fb1759f62391d6296de7fbc8a03d184ecd9d31b

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.4.11] - 2020-01-14
+
+### Changed
+- USPS Service: Identify packages within a shipment by index rather than by ID (#72)
+- USPS Service: Do not raise if multiple rates for a package and shipping method are present (#72)
+
 ## [0.4.10] - 2020-01-10
 
 ### Changed

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

@@ -31,13 +31,8 @@ module FriendlyShipping
             r.data[:hold_for_pickup] == !!package.properties[:hold_for_pickup]
           end
 
-          # At this point we should be left with a single rate. If we are not, raise an error,
-          # as that means we're missing some code.
-          if rates_with_this_hold_for_pickup_option.length > 1
-            raise CannotDetermineRate
-          end
-
-          # As we only have one rate left, return that without the array.
+          # At this point, we have one or two rates left, and they're similar enough.
+          # Once this poses an actual problem, we'll fix it.
           rates_with_this_hold_for_pickup_option.first
         end
       end

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

@@ -65,7 +65,7 @@ module FriendlyShipping
           def rates_from_response_node(xml, shipment)
             xml.xpath(PACKAGE_NODE_XPATH).each_with_object({}) do |package_node, result|
               package_id = package_node['ID']
-              corresponding_package = shipment.packages.detect { |p| p.id == package_id }
+              corresponding_package = shipment.packages[package_id.to_i]
 
               # There should always be a package in the original shipment that corresponds to the package ID
               # in the USPS response.

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

@@ -19,8 +19,8 @@ module FriendlyShipping
           def call(shipment:, login:, shipping_method: nil)
             xml_builder = Nokogiri::XML::Builder.new do |xml|
               xml.RateV4Request('USERID' => login) do
-                shipment.packages.each do |package|
-                  xml.Package('ID' => package.id) do
+                shipment.packages.each_with_index do |package, index|
+                  xml.Package('ID' => index) do
                     xml.Service(service_code_by(shipping_method, package))
                     if package.properties[:first_class_mail_type]
                       xml.FirstClassMailType(FIRST_CLASS_MAIL_TYPES[package.properties[:first_class_mail_type]])

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri