stalkr 0.9.2 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/stalkr/china_post.rb

@@ -39,7 +39,6 @@ class ChinaPost < Base
             rows.shift
 
             status = rows.first[2].strip.downcase
-            puts status
             if status =~ /delivered/ then
                 ret.status = DELIVERED
             elsif status =~ /arrival|departure/ then

data/lib/stalkr/fedex.rb

@@ -40,8 +40,13 @@ class FEDEX < Base
 
             info = info_scraper.scrape(html)
 
-            if info.status.strip.downcase == "delivered" then
+            status = info.status.strip.downcase
+            if status == "delivered" then
                 ret.status = DELIVERED
+            elsif status == "on schedule" then
+                ret.status = IN_TRANSIT
+            else
+                ret.status = UNKNOWN
             end
             ret.location = info.destination.strip
 
@@ -52,7 +57,9 @@ class FEDEX < Base
             delivery_date = info.dates[1].strip if info.dates.length == 2
             if shipped_date.empty? then
                 shipped_date = DateTime.strptime( $1, "%b %d, %Y" ).to_time if html =~ /var shipDate = "(.*?);$"/
-                delivery_date = DateTime.strptime( "#{$1} -5", "%b %d, %Y %I:%M %p %z" ).to_time if html =~ /var deliveryDateTime = "(.*?)";$/
+                if html =~ /var deliveryDateTime = "(.*?)";$/ and not ($1.nil? or $1.strip.empty?) then
+                    delivery_date = DateTime.strptime( "#{$1} -5", "%b %d, %Y %I:%M %p %z" ).to_time
+                end
             end
             ret.delivered_at = delivery_date
             ret.updated_at = delivery_date

data/test/stalkr/fedex_test.rb

@@ -10,6 +10,13 @@ class FEDEX_Test < Test::Unit::TestCase
         assert(info.delivered_at.kind_of? Time)
     end
 
+    def test_track_in_transit
+        id = "005794539515313"
+        info = Stalkr::FEDEX.new.track(id)
+        assert(info.shipper == :FEDEX)
+        assert(info.status == Stalkr::IN_TRANSIT)
+    end
+
     def test_track_bad_code
 
         id = "foobar"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stalkr
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Chetan Sarva