active_shipping 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf492f5f78fa92510f0f17837a59225eca7a8230
-  data.tar.gz: d8609c76e64bb66b7ca522eab646f944b4684c90
+  metadata.gz: 67c1a999efbdf53ccf0184cb263ae02c952be3ad
+  data.tar.gz: a810e0262340b15fec6bafdf157197a3af7a4a7e
 SHA512:
-  metadata.gz: 9e31884ad4afb2e2948f6f1558f174b7ca4c09b6428818ad555e3798b02e61321ea9a1de6664d4acc6969f4756c3e5c79e932773ef603b5b412a53e91fe776d5
-  data.tar.gz: ebe8569df5061fa69e3a4fd36f281ce83c907dd5f8bc5c76a9b06c60c2d07050d21c2e925fd69d7637360edf8de80ee1b931a8df7ebcc9b1ccfbcd18b20e7a1c
+  metadata.gz: ff22888d9dcdfaa98693bda3b993a83bb1c2404f7b217e359ba5f97e35bf21b283a8b6bf483b82a9f743aa10c43940de3ba5ae29e86abb905997297103016592
+  data.tar.gz: 9d827efa63c84851a042498c57c2ab184807ac34d89deb2d7e822358d977fff9a5c0ac88c0bd97fa5c95f2454af966210ec1c35fb6ef4deb47059510ac070364

data/lib/active_shipping/carriers/usps.rb

@@ -630,6 +630,9 @@ module ActiveShipping
 
         shipment_events = shipment_events.sort_by(&:time)
 
+        # USPS defines a delivery attempt with code 55
+        attempted_delivery_date = shipment_events.detect{ |shipment_event| shipment_event.type_code=="55" }.try(:time)
+
         if last_shipment = shipment_events.last
           status = last_shipment.status
           actual_delivery_date = last_shipment.time if last_shipment.delivered?
@@ -645,6 +648,7 @@ module ActiveShipping
                            :tracking_number => tracking_number,
                            :status => status,
                            :actual_delivery_date => actual_delivery_date,
+                           :attempted_delivery_date => attempted_delivery_date,
                            :scheduled_delivery_date => scheduled_delivery
       )
     end

data/lib/active_shipping/tracking_response.rb

@@ -29,6 +29,9 @@ module ActiveShipping
   # @!attribute actual_delivery_date
   #   @return [Date, Time]
   #
+  # @!attribute attempted_delivery_date
+  #   @return [Date, Time]
+  #  
   # @!attribute delivery_signature
   #   @return [String]
   #
@@ -49,7 +52,7 @@ module ActiveShipping
   class TrackingResponse < Response
     attr_reader :carrier,:carrier_name,
                 :status,:status_code, :status_description,
-                :ship_time, :scheduled_delivery_date, :actual_delivery_date,
+                :ship_time, :scheduled_delivery_date, :actual_delivery_date, :attempted_delivery_date,
                 :delivery_signature, :tracking_number, :shipment_events,
                 :shipper_address, :origin, :destination
 
@@ -63,6 +66,7 @@ module ActiveShipping
       @ship_time = options[:ship_time]
       @scheduled_delivery_date = options[:scheduled_delivery_date]
       @actual_delivery_date = options[:actual_delivery_date]
+      @attempted_delivery_date = options[:attempted_delivery_date]
       @delivery_signature = options[:delivery_signature]
       @tracking_number = options[:tracking_number]
       @shipment_events = Array(options[:shipment_events])
@@ -96,5 +100,6 @@ module ActiveShipping
     alias_method :exception?, :has_exception?
     alias_method :scheduled_delivery_time, :scheduled_delivery_date
     alias_method :actual_delivery_time, :actual_delivery_date
+    alias_method :attempted_delivery_time, :attempted_delivery_date
   end
 end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end

data/test/remote/usps_test.rb

@@ -19,6 +19,15 @@ class RemoteUSPSTest < Minitest::Test
     assert_equal Time.parse('2015-11-30 13:02:00 UTC'), response.actual_delivery_date
   end
 
+   def test_tracking_with_attempted_delivery
+    response = @carrier.find_tracking_info('9405515901606017103876', test: false)
+    assert response.success?, response.message
+    assert_equal 9,response.shipment_events.size
+    assert_equal 'DELIVERED', response.shipment_events.last.message
+    assert_equal Time.parse('2015-12-10 14:42:00 UTC'), response.attempted_delivery_date
+    assert_equal Time.parse('2015-12-24 10:51:00 UTC'), response.actual_delivery_date
+  end 
+
   def test_tracking_with_bad_number
     assert_raises(ResponseError) do
       @carrier.find_tracking_info('abc123xyz', test: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified