active_shipping 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f255b6e48e25f1a22656abd5424216bea74ef80
-  data.tar.gz: 7bafa8bea0f1a247ebb9aef8668c663b1b3eab44
+  metadata.gz: 592608c29fbeaad3bfc7f21fa36ed5099d903a9a
+  data.tar.gz: 4bf3a6fb28099af32c2f18d734ae79a4e6ba4463
 SHA512:
-  metadata.gz: f79e434be0cb714e9edfdb8d9e72bdfc5d1411de34593a373e914031b1c92f3890a937f8e8741cc6cc8218d434910c89cfd1dfbc1479aaf244dbfbad929a5dbe
-  data.tar.gz: 3a316e22f8772503f7e807d7ca4ffc057bbe8e88412cf32bcd697cc195b8ab0632a7508ea901e7d31ddcd7c7f145a390da6ffdd06bda2ea34598cd6dcf3170b9
+  metadata.gz: 56aa07c21b4a2fc856e0c4fe98fa4a10a196fd7bb4b708551434f45e61e5707d62bcc11425791ec07d3d5c86e4db7c40a7b67dfeeec01f870c2e7266e986d6a8
+  data.tar.gz: bf184014cff572470b44061be4d873a614f9ba4ef3b1e908afe8885066f15cc360b78f24ba6bf00e44da1ffa8600bd938051f5a548b13833f240938606213e95

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ActiveShipping CHANGELOG
 
+### v1.1.1
+
+- Fix bug with USPS tracking not handling optional fields being absent.
+
 ### v1.1.0
 
 - USPS: Allows package tracking disambiguation and exposes predicted arrival date and event codes.

data/lib/active_shipping/carriers/usps.rb

@@ -238,9 +238,9 @@ module ActiveShipping
       
       timestamp = "#{node.at('EventDate').text}, #{node.at('EventTime').text}"
       event_code = node.at('EventCode').text
-      city = node.at('EventCity').text
-      state = node.at('EventState').text
-      zip_code = node.at('EventZIPCode').text
+      city = node.at('EventCity').try(:text)
+      state = node.at('EventState').try(:text)
+      zip_code = node.at('EventZIPCode').try(:text)
 
       country_node = node.at('EventCountry')
       country = country_node ? country_node.text : ''
@@ -555,7 +555,8 @@ module ActiveShipping
         tracking_details << xml.root.at('TrackInfo/TrackSummary')
 
         tracking_number = xml.root.at('TrackInfo').attributes['ID'].value
-        scheduled_delivery = Time.parse(xml.root.at('PredictedDeliveryDate').text)
+        prediction_node = xml.root.at('PredictedDeliveryDate') || xml.root.at('ExpectedDeliveryDate')
+        scheduled_delivery = prediction_node ? Time.parse(prediction_node.text) : nil
 
         tracking_details.each do |event|
           details = extract_event_details(event)

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/fixtures/xml/usps/tracking_response_alt.xml

@@ -8,7 +8,6 @@
     <DestinationState>IL</DestinationState>
     <DestinationZip>61536</DestinationZip>
     <EmailEnabled>true</EmailEnabled>
-    <ExpectedDeliveryDate>April 28, 2015</ExpectedDeliveryDate>
     <KahalaIndicator>false</KahalaIndicator>
     <MailTypeCode>DM</MailTypeCode>
     <MPDATE>2015-04-24 02:08:04.000000</MPDATE>
@@ -17,7 +16,6 @@
     <OriginState>TX</OriginState>
     <OriginZip>76226</OriginZip>
     <PodEnabled>false</PodEnabled>
-    <PredictedDeliveryDate>April 28, 2015</PredictedDeliveryDate>
     <RestoreEnabled>false</RestoreEnabled>
     <RramEnabled>false</RramEnabled>
     <RreEnabled>false</RreEnabled>
@@ -31,7 +29,6 @@
       <EventTime>8:29 am</EventTime>
       <EventDate>April 28, 2015</EventDate>
       <Event>Out for Delivery, in truck</Event>
-      <EventCity>OTTAWA</EventCity>
       <EventState>ON</EventState>
       <EventZIPCode>61536</EventZIPCode>
       <EventCountry>Canada</EventCountry>

data/test/unit/carriers/usps_test.rb

@@ -123,6 +123,8 @@ class USPSTest < Minitest::Test
     response = @carrier.find_tracking_info('9102901000462189604217', :test => true)
     assert_equal 'Canada', response.shipment_events.last.location.country.name
     assert_equal :out_for_delivery, response.status
+    assert_nil response.scheduled_delivery_date
+    assert_nil response.shipment_events.last.location.city
   end
 
   def test_find_tracking_info_destination

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - James MacAulay
@@ -33,7 +33,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified