RubyGems - active_shipping - Versions diffs - 1.0.1 → 1.1.0 - Mend

active_shipping 1.0.1 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data.tar.gz.sig +0 -0
data/CHANGELOG.md +4 -0
data/lib/active_shipping/carriers/usps.rb +41 -29
data/lib/active_shipping/shipment_event.rb +3 -3
data/lib/active_shipping/version.rb +1 -1
data/repodb.yml +3 -0
data/test/fixtures/xml/usps/tracking_request.xml +10 -3
data/test/fixtures/xml/usps/tracking_response.xml +158 -9
data/test/fixtures/xml/usps/tracking_response_alt.xml +44 -0
data/test/fixtures/xml/usps/tracking_response_failure.xml +10 -1
data/test/unit/carriers/usps_test.rb +58 -43
metadata +6 -7
metadata.gz.sig +0 -0
data/test/fixtures/xml/usps/delivered_extended_tracking_response.xml +0 -11
data/test/fixtures/xml/usps/delivered_tracking_response.xml +0 -11

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ab305f494f8f8dcce83d1e6fe8d4bb564040a3
-  data.tar.gz: af1c599bb5301f5837f0f770d0554cec064f19f7
+  metadata.gz: 5f255b6e48e25f1a22656abd5424216bea74ef80
+  data.tar.gz: 7bafa8bea0f1a247ebb9aef8668c663b1b3eab44
 SHA512:
-  metadata.gz: e6d5272f9e661af04ac7c31a22c0ee667cdc755a626373058e54f37593f0e4403282375261af1cd3bd9c47ed1bb4075242309f24f5b39be598a596a8325121af
-  data.tar.gz: 21851000dd9aee050f2cbc9d6e8daf1180bf941a0f19ebd8e1bb27260bbcb148eb136d639a697235313514c97a9dfedb6f0752817aee9714df8151089b17b0e7
+  metadata.gz: f79e434be0cb714e9edfdb8d9e72bdfc5d1411de34593a373e914031b1c92f3890a937f8e8741cc6cc8218d434910c89cfd1dfbc1479aaf244dbfbad929a5dbe
+  data.tar.gz: 3a316e22f8772503f7e807d7ca4ffc057bbe8e88412cf32bcd697cc195b8ab0632a7508ea901e7d31ddcd7c7f145a390da6ffdd06bda2ea34598cd6dcf3170b9

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data.tar.gz.sig CHANGED Viewed

Binary file

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 # ActiveShipping CHANGELOG
+### v1.1.0
+- USPS: Allows package tracking disambiguation and exposes predicted arrival date and event codes.
 ### v1.0.0
 - **BREAKING CHANGE:** Change namespace from `ActiveMerchant::Shipping` to `ActiveShipping`

data/lib/active_shipping/carriers/usps.rb CHANGED Viewed

@@ -10,11 +10,8 @@ module ActiveShipping
   # This will send a test request to the USPS test servers, which they ask you
   # to do before they put your API key in production mode.
   class USPS < Carrier
-    EventDetails = Struct.new(:description, :time, :zoneless_time, :location)
-    EVENT_MESSAGE_PATTERNS = [
-      /^(.*), (\w+ \d{1,2}, \d{4}, \d{1,2}:\d\d [ap]m), (.*), (\w\w) (\d{5})$/i,
-      /^Your item \w{2,3} (out for delivery|delivered).* at (\d{1,2}:\d\d [ap]m on \w+ \d{1,2}, \d{4}) in (.*), (\w\w) (\d{5})\.$/i
-    ]
+    EventDetails = Struct.new(:description, :time, :zoneless_time, :location, :event_code)
+    ONLY_PREFIX_EVENTS = ['DELIVERED','OUT FOR DELIVERY']
     self.retry_safe = true
     cattr_reader :name
@@ -232,26 +229,44 @@ module ActiveShipping
       Mass.new(70, :pounds)
     end
-    def extract_event_details(message)
-      return EventDetails.new unless EVENT_MESSAGE_PATTERNS.any? { |pattern| message =~ pattern }
-      description = $1.upcase
-      timestamp = $2
-      city = $3
-      state = $4
-      zip_code = $5
+    def extract_event_details(node)
+      description = node.at('Event').text.upcase
+      if prefix = ONLY_PREFIX_EVENTS.find { |p| description.starts_with?(p) }
+        description = prefix
+      end
+      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
+      country_node = node.at('EventCountry')
+      country = country_node ? country_node.text : ''
+      country = 'USA' if country.empty?
       time = Time.parse(timestamp)
       zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
-      location = Location.new(city: city, state: state, postal_code: zip_code, country: 'USA')
-      EventDetails.new(description, time, zoneless_time, location)
+      location = Location.new(city: city, state: state, postal_code: zip_code, country: country)
+      EventDetails.new(description, time, zoneless_time, location, event_code)
     end
     protected
     def build_tracking_request(tracking_number, options = {})
       xml_builder = Nokogiri::XML::Builder.new do |xml|
-        xml.TrackRequest('USERID' => @options[:login]) do
-          xml.TrackID('ID' => tracking_number)
+        xml.TrackFieldRequest('USERID' => @options[:login]) do
+          xml.Revision { xml.text('1') }
+          xml.ClientIp { xml.text(@options[:client_ip] || '127.0.0.1') }
+          xml.SourceId { xml.text(@options[:source_id] || 'active_shipping') }
+          xml.TrackID('ID' => tracking_number) do
+            xml.DestinationZipCode { xml.text(@options[:destination_zip])} if @options[:destination_zip]
+            if @options[:mailing_date]
+              formatted_date = @options[:mailing_date].strftime('%Y-%m-%d')
+              xml.MailingDate { xml.text(formatted_date)}
+            end
+          end
         end
       end
       xml_builder.to_xml
@@ -529,7 +544,6 @@ module ActiveShipping
     def parse_tracking_response(response, options)
       actual_delivery_date, status = nil
       xml = Nokogiri.XML(response)
-      root_node = xml.root
       success = response_success?(xml)
       message = response_message(xml)
@@ -538,20 +552,17 @@ module ActiveShipping
         destination = nil
         shipment_events = []
         tracking_details = xml.root.xpath('TrackInfo/TrackDetail')
-        tracking_summary = xml.root.at('TrackInfo/TrackSummary')
-        if tracking_details.length > 0
-          tracking_details << tracking_summary
-        else
-          success = false
-          message = tracking_summary.text
-        end
+        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)
         tracking_details.each do |event|
-          details = extract_event_details(event.text)
-          shipment_events << ShipmentEvent.new(details.description, details.zoneless_time, details.location) if details.location
+          details = extract_event_details(event)
+          if details.location
+            shipment_events << ShipmentEvent.new(details.description, details.zoneless_time,
+              details.location, details.description, details.event_code)
+          end
         end
         shipment_events = shipment_events.sort_by(&:time)
@@ -570,12 +581,13 @@ module ActiveShipping
                            :destination => destination,
                            :tracking_number => tracking_number,
                            :status => status,
-                           :actual_delivery_date => actual_delivery_date
+                           :actual_delivery_date => actual_delivery_date,
+                           :scheduled_delivery_date => scheduled_delivery
       )
     end
     def track_summary_node(document)
-      document.root.xpath('TrackInfo/TrackSummary')
+      document.root.xpath('TrackInfo/StatusSummary')
     end
     def error_description_node(document)

data/lib/active_shipping/shipment_event.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 module ActiveShipping
   class ShipmentEvent
-    attr_reader :name, :time, :location, :message
+    attr_reader :name, :time, :location, :message, :type_code
-    def initialize(name, time, location, message = nil)
-      @name, @time, @location, @message = name, time, location, message
+    def initialize(name, time, location, message = nil, type_code = nil)
+      @name, @time, @location, @message, @type_code = name, time, location, message, type_code
     end
     def delivered?

data/lib/active_shipping/version.rb CHANGED Viewed

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

data/repodb.yml ADDED Viewed

@@ -0,0 +1,3 @@
+assification: library
+ci_urls:
+  - https://travis-ci.org/Shopify/active_shipping

data/test/fixtures/xml/usps/tracking_request.xml CHANGED Viewed

@@ -1,3 +1,10 @@
-<TrackRequest USERID="xxxxxxxx">
-<TrackID ID="EJ958083578US"></TrackID>
-</TrackRequest>
+<?xml version="1.0"?>
+<TrackFieldRequest USERID="login">
+  <Revision>1</Revision>
+  <ClientIp>127.0.0.1</ClientIp>
+  <SourceId>active_shipping</SourceId>
+  <TrackID ID="9102901000462189604217">
+    <DestinationZipCode>12345</DestinationZipCode>
+    <MailingDate>2010-01-30</MailingDate>
+  </TrackID>
+</TrackFieldRequest>

data/test/fixtures/xml/usps/tracking_response.xml CHANGED Viewed

@@ -1,13 +1,162 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TrackResponse>
+  <!-- other than this comment and an altered tracking number this is a real API response -->
   <TrackInfo ID="9102901000462189604217">
-    <TrackSummary>Your item is out for delivery at 8:13 am on January 27, 2012 in DES MOINES, IA 50311.</TrackSummary>
-    <TrackDetail>Sorting Complete, January 27, 2012, 8:03 am, DES MOINES, IA 50311</TrackDetail>
-    <TrackDetail>Electronic Shipping Info Received, January 27, 2012</TrackDetail>
-    <TrackDetail>Arrival at Post Office, January 26, 2012, 11:21 am, DES MOINES, IA 50311</TrackDetail>
-    <TrackDetail>Departed Shipping Partner Facility, January 24, 2012, 7:45 am, GRAND PRAIRIE, TX 75050</TrackDetail>
-    <TrackDetail>Departed Shipping Partner Facility, January 23, 2012, 2:49 am, PHOENIX, AZ 85043</TrackDetail>
-    <TrackDetail>Arrived Shipping Partner Facility, January 22, 2012, 5:00 pm, PHOENIX, AZ 85043</TrackDetail>
-    <TrackDetail>Picked Up by Shipping Partner, January 22, 2012, 4:30 pm, PHOENIX, AZ 85043</TrackDetail>
+    <Class>First-Class Package Service</Class>
+    <ClassOfMailCode>FC</ClassOfMailCode>
+    <DestinationCity>HANNA CITY</DestinationCity>
+    <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>
+    <MPSUFFIX>495865558</MPSUFFIX>
+    <OriginCity>ARGYLE</OriginCity>
+    <OriginState>TX</OriginState>
+    <OriginZip>76226</OriginZip>
+    <PodEnabled>false</PodEnabled>
+    <PredictedDeliveryDate>April 28, 2015</PredictedDeliveryDate>
+    <RestoreEnabled>false</RestoreEnabled>
+    <RramEnabled>false</RramEnabled>
+    <RreEnabled>false</RreEnabled>
+    <Service>USPS Tracking&lt;SUP&gt;&amp;#153;&lt;/SUP&gt;</Service>
+    <ServiceTypeCode>001</ServiceTypeCode>
+    <Status>Delivered, In/At Mailbox</Status>
+    <StatusCategory>Delivered</StatusCategory>
+    <StatusSummary>Your item was delivered in or at the mailbox at 9:01 am on April 28, 2015 in HANNA CITY, IL 61536.</StatusSummary>
+    <TABLECODE>T</TABLECODE>
+    <TrackSummary>
+      <EventTime>9:01 am</EventTime>
+      <EventDate>April 28, 2015</EventDate>
+      <Event>Delivered, In/At Mailbox</Event>
+      <EventCity>HANNA CITY</EventCity>
+      <EventState>IL</EventState>
+      <EventZIPCode>61536</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>01</EventCode>
+      <DeliveryAttributeCode>01</DeliveryAttributeCode>
+    </TrackSummary>
+    <TrackDetail>
+      <EventTime>8:29 am</EventTime>
+      <EventDate>April 28, 2015</EventDate>
+      <Event>Out for Delivery</Event>
+      <EventCity>HANNA CITY</EventCity>
+      <EventState>IL</EventState>
+      <EventZIPCode>61536</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>OF</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>8:19 am</EventTime>
+      <EventDate>April 28, 2015</EventDate>
+      <Event>Sorting Complete</Event>
+      <EventCity>HANNA CITY</EventCity>
+      <EventState>IL</EventState>
+      <EventZIPCode>61536</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>PC</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>7:03 am</EventTime>
+      <EventDate>April 28, 2015</EventDate>
+      <Event>Arrived at Post Office</Event>
+      <EventCity>HANNA CITY</EventCity>
+      <EventState>IL</EventState>
+      <EventZIPCode>61536</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>07</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>4:05 am</EventTime>
+      <EventDate>April 28, 2015</EventDate>
+      <Event>Departed USPS Facility</Event>
+      <EventCity>HAZELWOOD</EventCity>
+      <EventState>MO</EventState>
+      <EventZIPCode>63042</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>EF</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>4:04 pm</EventTime>
+      <EventDate>April 27, 2015</EventDate>
+      <Event>Arrived at USPS Facility</Event>
+      <EventCity>HAZELWOOD</EventCity>
+      <EventState>MO</EventState>
+      <EventZIPCode>63042</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>10</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>12:18 am</EventTime>
+      <EventDate>April 26, 2015</EventDate>
+      <Event>Departed USPS Facility</Event>
+      <EventCity>COPPELL</EventCity>
+      <EventState>TX</EventState>
+      <EventZIPCode>75099</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>EF</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>7:19 pm</EventTime>
+      <EventDate>April 25, 2015</EventDate>
+      <Event>Arrived at USPS Origin Facility</Event>
+      <EventCity>COPPELL</EventCity>
+      <EventState>TX</EventState>
+      <EventZIPCode>75099</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>10</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>6:04 pm</EventTime>
+      <EventDate>April 25, 2015</EventDate>
+      <Event>Accepted at USPS Origin Sort Facility</Event>
+      <EventCity>ARGYLE</EventCity>
+      <EventState>TX</EventState>
+      <EventZIPCode>76226</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>OA</EventCode>
+    </TrackDetail>
+    <TrackDetail>
+      <EventTime>11:36 pm</EventTime>
+      <EventDate>April 23, 2015</EventDate>
+      <Event>Shipping Label Created</Event>
+      <EventCity>ARGYLE</EventCity>
+      <EventState>TX</EventState>
+      <EventZIPCode>76226</EventZIPCode>
+      <EventCountry/>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>GX</EventCode>
+    </TrackDetail>
   </TrackInfo>
 </TrackResponse>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TrackResponse>
+  <!-- this is a manually altered response designed to test cases that might occur but have never been actually observed yet. -->
+  <TrackInfo ID="9102901000462189604217">
+    <Class>First-Class Package Service</Class>
+    <ClassOfMailCode>FC</ClassOfMailCode>
+    <DestinationCity>HANNA CITY</DestinationCity>
+    <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>
+    <MPSUFFIX>495865558</MPSUFFIX>
+    <OriginCity>ARGYLE</OriginCity>
+    <OriginState>TX</OriginState>
+    <OriginZip>76226</OriginZip>
+    <PodEnabled>false</PodEnabled>
+    <PredictedDeliveryDate>April 28, 2015</PredictedDeliveryDate>
+    <RestoreEnabled>false</RestoreEnabled>
+    <RramEnabled>false</RramEnabled>
+    <RreEnabled>false</RreEnabled>
+    <Service>USPS Tracking&lt;SUP&gt;&amp;#153;&lt;/SUP&gt;</Service>
+    <ServiceTypeCode>001</ServiceTypeCode>
+    <Status>Delivered, In/At Mailbox</Status>
+    <StatusCategory>Delivered</StatusCategory>
+    <StatusSummary>Your item was delivered in or at the mailbox at 9:01 am on April 28, 2015 in HANNA CITY, IL 61536.</StatusSummary>
+    <TABLECODE>T</TABLECODE>
+    <TrackSummary>
+      <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>
+      <FirmName/>
+      <Name/>
+      <AuthorizedAgent>false</AuthorizedAgent>
+      <EventCode>OF</EventCode>
+    </TrackSummary>
+  </TrackInfo>
+</TrackResponse>

data/test/fixtures/xml/usps/tracking_response_failure.xml CHANGED Viewed

@@ -1,2 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TrackResponse><TrackInfo ID="abc123xyz"><TrackSummary>The Postal Service could not locate the tracking information for your request. Please verify your tracking number and try again later.</TrackSummary></TrackInfo></TrackResponse>
+<TrackResponse>
+  <TrackInfo ID="9102901000462189604217">
+    <Error>
+      <Number>-2147219302</Number>
+      <Description>The Postal Service could not locate the tracking information for your request. Please verify your tracking number and try again later.</Description>
+      <HelpFile/>
+      <HelpContext/>
+    </Error>
+  </TrackInfo>
+</TrackResponse>

data/test/unit/carriers/usps_test.rb CHANGED Viewed

@@ -9,6 +9,11 @@ class USPSTest < Minitest::Test
     @tracking_response_failure = xml_fixture('usps/tracking_response_failure')
   end
+  def test_tracking_request_should_create_correct_xml
+    @carrier.expects(:commit).with(:track, xml_fixture('usps/tracking_request'),false).returns(@tracking_response)
+    @carrier.find_tracking_info('9102901000462189604217', :destination_zip => '12345', :mailing_date => Date.new(2010,1,30))
+  end
   def test_tracking_failure_should_raise_exception
     @carrier.expects(:commit).returns(@tracking_response_failure)
     assert_raises ResponseError do
@@ -44,10 +49,13 @@ class USPSTest < Minitest::Test
     assert_equal 'ActiveShipping::TrackingResponse', @carrier.find_tracking_info('EJ958083578US').class.name
   end
-  def test_find_tracking_info_should_parse_response_into_correct_number_of_shipment_events
+  def test_find_tracking_info_should_have_correct_fields
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217', :test => true)
-    assert_equal 7, response.shipment_events.size
+    assert_equal 10, response.shipment_events.size
+    assert_equal Time.parse('April 28, 2015'), response.scheduled_delivery_date
+    assert_equal Time.parse('2015-04-28 09:01:00 UTC'), response.actual_delivery_date
+    assert_equal '9102901000462189604217', response.tracking_number
   end
   def test_find_tracking_info_should_return_shipment_events_in_ascending_chronological_order
@@ -59,37 +67,62 @@ class USPSTest < Minitest::Test
   def test_find_tracking_info_should_have_correct_timestamps_for_shipment_events
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217', :test => true)
-    assert_equal ['2012-01-22 16:30:00 UTC',
-                  '2012-01-22 17:00:00 UTC',
-                  '2012-01-23 02:49:00 UTC',
-                  '2012-01-24 07:45:00 UTC',
-                  '2012-01-26 11:21:00 UTC',
-                  '2012-01-27 08:03:00 UTC',
-                  '2012-01-27 08:13:00 UTC'], response.shipment_events.map { |e| e.time.strftime('%Y-%m-%d %H:%M:00 %Z') }
+    assert_equal [
+      "2015-04-23 23:36:00 UTC",
+      "2015-04-25 18:04:00 UTC",
+      "2015-04-25 19:19:00 UTC",
+      "2015-04-26 00:18:00 UTC",
+      "2015-04-27 16:04:00 UTC",
+      "2015-04-28 04:05:00 UTC",
+      "2015-04-28 07:03:00 UTC",
+      "2015-04-28 08:19:00 UTC",
+      "2015-04-28 08:29:00 UTC",
+      "2015-04-28 09:01:00 UTC"], response.shipment_events.map { |e| e.time.strftime('%Y-%m-%d %H:%M:00 %Z') }
   end
   def test_find_tracking_info_should_have_correct_names_for_shipment_events
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217')
-    assert_equal ["PICKED UP BY SHIPPING PARTNER",
-                  "ARRIVED SHIPPING PARTNER FACILITY",
-                  "DEPARTED SHIPPING PARTNER FACILITY",
-                  "DEPARTED SHIPPING PARTNER FACILITY",
-                  "ARRIVAL AT POST OFFICE",
-                  "SORTING COMPLETE",
-                  "OUT FOR DELIVERY"], response.shipment_events.map(&:name)
+    assert_equal [
+      "SHIPPING LABEL CREATED",
+      "ACCEPTED AT USPS ORIGIN SORT FACILITY",
+      "ARRIVED AT USPS ORIGIN FACILITY",
+      "DEPARTED USPS FACILITY",
+      "ARRIVED AT USPS FACILITY",
+      "DEPARTED USPS FACILITY",
+      "ARRIVED AT POST OFFICE",
+      "SORTING COMPLETE",
+      "OUT FOR DELIVERY",
+      "DELIVERED"], response.shipment_events.map(&:name)
   end
   def test_find_tracking_info_should_have_correct_locations_for_shipment_events
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217', :test => true)
-    assert_equal ["PHOENIX, AZ, 85043",
-                  "PHOENIX, AZ, 85043",
-                  "PHOENIX, AZ, 85043",
-                  "GRAND PRAIRIE, TX, 75050",
-                  "DES MOINES, IA, 50311",
-                  "DES MOINES, IA, 50311",
-                  "DES MOINES, IA, 50311"], response.shipment_events.map(&:location).map { |l| "#{l.city}, #{l.state}, #{l.postal_code}" }
+    assert_equal [
+      "ARGYLE, TX, 76226",
+      "ARGYLE, TX, 76226",
+      "COPPELL, TX, 75099",
+      "COPPELL, TX, 75099",
+      "HAZELWOOD, MO, 63042",
+      "HAZELWOOD, MO, 63042",
+      "HANNA CITY, IL, 61536",
+      "HANNA CITY, IL, 61536",
+      "HANNA CITY, IL, 61536",
+      "HANNA CITY, IL, 61536"], response.shipment_events.map(&:location).map { |l| "#{l.city}, #{l.state}, #{l.postal_code}" }
+  end
+  def test_find_tracking_info_should_have_correct_event_codes_for_shipment_events
+    @carrier.expects(:commit).returns(@tracking_response)
+    response = @carrier.find_tracking_info('9102901000462189604217', :test => true)
+    assert_equal ["GX", "OA", "10", "EF", "10", "EF", "07", "PC", "OF", "01"], response.shipment_events.map(&:type_code)
+  end
+  def test_find_tracking_info_should_handle_special_cases
+    @carrier.expects(:commit).returns(xml_fixture('usps/tracking_response_alt'))
+    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
   end
   def test_find_tracking_info_destination
@@ -108,17 +141,11 @@ class USPSTest < Minitest::Test
   def test_find_tracking_info_should_have_correct_status
     @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217')
-    assert_equal :out_for_delivery, response.status
+    assert_equal :delivered, response.status
   end
   def test_find_tracking_info_should_have_correct_delivered
-    @carrier.expects(:commit).returns(xml_fixture('usps/delivered_tracking_response'))
-    response = @carrier.find_tracking_info('9102901000462189604217')
-    assert_equal true, response.delivered?
-  end
-  def test_find_tracking_info_with_extended_response_format_should_have_correct_delivered
-    @carrier.expects(:commit).returns(xml_fixture('usps/delivered_extended_tracking_response'))
+    @carrier.expects(:commit).returns(@tracking_response)
     response = @carrier.find_tracking_info('9102901000462189604217')
     assert_equal true, response.delivered?
   end
@@ -453,18 +480,6 @@ class USPSTest < Minitest::Test
     assert_equal [3767, 5526, 7231, 7231], response.rates.map(&:price)
   end
-  def test_extract_event_details_handles_single_digit_calendar_dates
-    assert details = @carrier.extract_event_details("Out for Delivery, October 9, 2013, 10:16 am, BROOKLYN, NY 11201")
-    assert_equal "OUT FOR DELIVERY", details.description
-    assert_equal 9, details.zoneless_time.mday
-  end
-  def test_extract_event_details_handles_double_digit_calendar_dates
-    assert details = @carrier.extract_event_details("Out for Delivery, October 12, 2013, 10:16 am, BROOKLYN, NY 11201")
-    assert_equal "OUT FOR DELIVERY", details.description
-    assert_equal 12, details.zoneless_time.mday
-  end
   private
   def build_service_node(options = {})

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James MacAulay
@@ -33,7 +33,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified
@@ -219,6 +219,7 @@ files:
 - lib/active_shipping/tracking_response.rb
 - lib/active_shipping/version.rb
 - lib/certs/eParcel.dtd
+- repodb.yml
 - shipit.rubygems.yml
 - test/credentials.yml
 - test/fixtures/files/label1.pdf
@@ -334,14 +335,13 @@ files:
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_commercial_base_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_commercial_plus_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_rate_response.xml
-- test/fixtures/xml/usps/delivered_extended_tracking_response.xml
-- test/fixtures/xml/usps/delivered_tracking_response.xml
 - test/fixtures/xml/usps/first_class_packages_with_invalid_mail_type_response.xml
 - test/fixtures/xml/usps/first_class_packages_with_mail_type_response.xml
 - test/fixtures/xml/usps/first_class_packages_without_mail_type_response.xml
 - test/fixtures/xml/usps/invalid_xml_tracking_response_error.xml
 - test/fixtures/xml/usps/tracking_request.xml
 - test/fixtures/xml/usps/tracking_response.xml
+- test/fixtures/xml/usps/tracking_response_alt.xml
 - test/fixtures/xml/usps/tracking_response_failure.xml
 - test/fixtures/xml/usps/tracking_response_not_available.xml
 - test/fixtures/xml/usps/tracking_response_test_error.xml
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key:
 specification_version: 4
 summary: Simple shipping abstraction library
@@ -520,14 +520,13 @@ test_files:
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_commercial_base_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_commercial_plus_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_american_wii_rate_response.xml
-- test/fixtures/xml/usps/delivered_extended_tracking_response.xml
-- test/fixtures/xml/usps/delivered_tracking_response.xml
 - test/fixtures/xml/usps/first_class_packages_with_invalid_mail_type_response.xml
 - test/fixtures/xml/usps/first_class_packages_with_mail_type_response.xml
 - test/fixtures/xml/usps/first_class_packages_without_mail_type_response.xml
 - test/fixtures/xml/usps/invalid_xml_tracking_response_error.xml
 - test/fixtures/xml/usps/tracking_request.xml
 - test/fixtures/xml/usps/tracking_response.xml
+- test/fixtures/xml/usps/tracking_response_alt.xml
 - test/fixtures/xml/usps/tracking_response_failure.xml
 - test/fixtures/xml/usps/tracking_response_not_available.xml
 - test/fixtures/xml/usps/tracking_response_test_error.xml

metadata.gz.sig CHANGED Viewed

Binary file

data/test/fixtures/xml/usps/delivered_extended_tracking_response.xml DELETED Viewed

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<TrackResponse>
-  <TrackInfo ID="9361289949034102283511">
-    <TrackSummary>Your item was delivered to the front desk or reception area at 2:16 pm on October 12, 2013 in BROOKLYN, NY 11201.</TrackSummary>
-    <TrackDetail>Out for Delivery, October 12, 2013, 10:16 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Sorting Complete, October 12, 2013, 10:06 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Arrival at Post Office, October 12, 2013, 6:32 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Acceptance, October 12, 2013, 6:26 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Electronic Shipping Info Received, October 12, 2013</TrackDetail>
-  </TrackInfo>
-</TrackResponse>

data/test/fixtures/xml/usps/delivered_tracking_response.xml DELETED Viewed

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<TrackResponse>
-  <TrackInfo ID="9361289949034102283511">
-    <TrackSummary>Your item was delivered at 2:16 pm on October 12, 2013 in BROOKLYN, NY 11201.</TrackSummary>
-    <TrackDetail>Out for Delivery, October 12, 2013, 10:16 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Sorting Complete, October 12, 2013, 10:06 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Arrival at Post Office, October 12, 2013, 6:32 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Acceptance, October 12, 2013, 6:26 am, BROOKLYN, NY 11201</TrackDetail>
-    <TrackDetail>Electronic Shipping Info Received, October 12, 2013</TrackDetail>
-  </TrackInfo>
-</TrackResponse>