friendly_shipping 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a74d755729d634f9a26b89c9cf7fe9de4f0f9c6f
-  data.tar.gz: d55595a012e01a25af70df3f0c7d6d20e1107b6c
+SHA256:
+  metadata.gz: 040c918f1349ab0ca0eac9a810082c9b5e751f78ce3f8ccc60af7f5dcc7f81b2
+  data.tar.gz: '07479b91f4e7ad7bf983eec39da3b286d4959117f95f7e9caa062d95d2883785'
 SHA512:
-  metadata.gz: 43ad0e0432113fcd26fb0f3472bc2ebf8c64a0d9a4b9b25b0618831a6ecb2a66a97d55f9764d11387c0ce68f6923a3c190d087ea2f40ee39004df4c0c336890a
-  data.tar.gz: 6c86ce696207eeb0bc1274485769f53070806a11314df7981d684bd2d0cb9eddb1699c22592f2ff90c4484c3b9a9caf398eb7deb597d4c15136e0148ed231375
+  metadata.gz: 15b651d1056fee2933438df10c36fcae9c85deacaf0807e9745b8ccdcc04aa07be53f05e5d6f0737402d0c94591b267546b3878d2bbd8c27ccd499737745cd25
+  data.tar.gz: 0e683464058b2bf4881d4f9b10b3c887bf39d45b13f19fca170b40d3074573130b7e238422aefe27710c74fc7802633f30361f2ebbac73899b8424e6f64caad6

data/.rubocop-relaxed.yml

@@ -156,7 +156,7 @@ Metrics/ModuleLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.8] - 2020-01-06
+
+### Changed
+- USPS Service: Only transmit weights up to 150 pounds to timing API (#64)
+- UPS Service: Transmit City and State when asking for timing information (#62)
+- USPS Service: Gracefully handle missing expedited timing nodes (#60)
+
 ## [0.4.7] - 2019-11-28
 
 ### Changed

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

@@ -4,6 +4,8 @@ module FriendlyShipping
   module Services
     class Ups
       class SerializeTimeInTransitRequest
+        MAX_SHIPMENT_WEIGHT = Measured::Weight.new(150, :pounds)
+
         def self.call(shipment:, options:)
           xml_builder = Nokogiri::XML::Builder.new do |xml|
             xml.TimeInTransitRequest do
@@ -25,8 +27,8 @@ module FriendlyShipping
               end
               xml.TransitTo do
                 xml.AddressArtifactFormat do
-                  # We no longer include the destination city since it doesn't seem to change the timing
-                  # result and can prevent the time in transit request from succeeding when invalid.
+                  xml.PoliticalDivision2(shipment.destination.city)
+                  xml.PoliticalDivision1(shipment.destination.region.code)
                   xml.CountryCode(shipment.destination.country.code)
                   xml.PostcodePrimaryLow(shipment.destination.zip)
                 end
@@ -36,7 +38,8 @@ module FriendlyShipping
                   xml.Code('LBS')
                 end
                 shipment_weight = shipment.packages.map(&:weight).inject(Measured::Weight(0, :pounds), :+)
-                xml.Weight(shipment_weight.convert_to(:pounds).value.to_f.round(3))
+                weight_for_ups = [shipment_weight, MAX_SHIPMENT_WEIGHT].min
+                xml.Weight(weight_for_ups.convert_to(:pounds).value.to_f.round(3))
               end
               xml.InvoiceLineTotal do
                 xml.CurrencyCode(options.invoice_total.currency.iso_code)

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

@@ -34,6 +34,8 @@ module FriendlyShipping
           private
 
           def parse_expedited_commitment_nodes(expedited_commitment_nodes)
+            return [] if expedited_commitment_nodes.empty?
+
             # All Expedited Commitments have the same acceptance date
             effective_acceptance_date = Time.parse(expedited_commitment_nodes.at('EAD').text)
             expedited_commitment_nodes.xpath('Commitment').map do |commitment_node|

data/lib/friendly_shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -260,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An integration layer for shipping services