stalkr 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/stalkr.rb

@@ -18,6 +18,7 @@ require "#{stalkr_dir}/stalkr/error"
 require "#{stalkr_dir}/stalkr/ups"
 require "#{stalkr_dir}/stalkr/usps"
 require "#{stalkr_dir}/stalkr/fedex"
+require "#{stalkr_dir}/stalkr/dhl"
 require "#{stalkr_dir}/stalkr/china_post"
 
 if not DateTime.new.public_methods.include? "to_time" then

data/lib/stalkr/base.rb

@@ -39,11 +39,17 @@ module Stalkr
         end
 
         def self.extract_id(str)
-            if str =~ regex() then
-                # return the first non-nil backreference
-                m = $~.to_a
-                m.shift
-                return m.find{ |s| not s.nil? }.gsub(/ /, '').upcase
+            r = regex()
+            if r.kind_of? Regexp then
+                r = [ r ]
+            end
+            r.each do |re|
+                if str =~ re then
+                    # return the first non-nil backreference
+                    m = $~.to_a
+                    m.shift
+                    return m.find{ |s| not s.nil? }.gsub(/ /, '').upcase
+                end
             end
             return nil
         end

data/lib/stalkr/dhl.rb

@@ -0,0 +1,72 @@
+
+module Stalkr
+
+class DHL < Base
+
+    # ########## (10 digit number)
+    self.regex = /\b(\d{10})\b/i
+
+    def track(id)
+
+        url = "http://track.dhl-usa.com/TrackByNbr.asp?ShipmentNumber="
+        html = fetchurl(url + id)
+
+        begin
+
+            info_scraper = Scraper.define do
+
+                array :updated_at
+                array :history
+
+                process "td.headerRegular.pT5", :status => :text
+                process "td.bodytext.pT5", :updated_at => :text
+                process ".pL5_pT4_pB4_pR4", :history => :text
+
+                result :status, :updated_at, :history
+            end
+
+            # row_scraper = Scraper.define do
+            #     array :rows
+            #     process "tr", :rows => td_scraper
+            #     result :rows
+            # end
+
+            info = info_scraper.scrape(html)
+
+            if not info.status or info.status.strip.empty? then
+                raise "DHL scraper failed"
+            end
+
+            ret = Result.new(:DHL)
+
+            status = cleanup_html(info.status).downcase
+            if status =~ /delivered/ then
+                ret.status = DELIVERED
+            elsif info.history.size > 0 then
+                ret.status = IN_TRANSIT
+            else
+                ret.status = UNKNOWN
+            end
+
+            updated_at = cleanup_html( info.updated_at.first )
+            ret.updated_at = DateTime.strptime( updated_at, "Tracking detail provided by DHL: %m/%d/%Y, %I:%M:%S %p" ).to_time # 2/19/2011, 12:42:51 pm pt.
+
+            if ret.status == DELIVERED then
+                delivered_at = cleanup_html(info.history.shift)
+                ret.delivered_at = DateTime.strptime( updated_at, "%m/%d/%Y %I:%M %p" ).to_time # 2/17/2011 10:13 am
+            end
+
+            # update location
+            ret.location = cleanup_html(info.history[2])
+
+            return ret
+
+        rescue Exception => ex
+            raise Stalkr::Error.new(ex, html)
+
+        end
+
+    end
+
+end # class ChinaPost
+end # module Stalkr

data/lib/stalkr/fedex.rb

@@ -6,7 +6,9 @@ module Stalkr
 
 class FEDEX < Base
 
-    self.regex = /\b((96\d\d\d\d\d ?\d\d\d\d|96\d\d) ?\d\d\d\d ?d\d\d\d( ?\d\d\d)?)\b|\b(\d{12}|\d{15})\b/i
+    self.regex = [  /\b((96\d\d\d\d\d ?\d\d\d\d|96\d\d) ?\d\d\d\d ?d\d\d\d( ?\d\d\d)?)\b/i,
+                    /\b(\d{12}|\d{15})\b/i
+                    ]
 
     def track(id)
 

data/lib/stalkr/ups.rb

@@ -16,7 +16,9 @@ module Stalkr
 
 class UPS < Base
 
-    self.regex = /\b(1Z ?[0-9A-Z]{3} ?[0-9A-Z]{3} ?[0-9A-Z]{2} ?[0-9A-Z]{4} ?[0-9A-Z]{3} ?[0-9A-Z]|[\dT]\d{3} ?\d{4} ?\d{3})\b/i
+    self.regex = [  /\b(1Z ?[0-9A-Z]{3} ?[0-9A-Z]{3} ?[0-9A-Z]{2} ?[0-9A-Z]{4} ?[0-9A-Z]{3} ?[0-9A-Z])\b/i,
+                    /\b([\dT]\d{3} ?\d{4} ?\d{3})\b/i
+                    ]
 
     def track(id)
 

data/lib/stalkr/usps.rb

@@ -4,9 +4,16 @@ module Stalkr
 class USPS < Base
 
     # 1) 20 or 22 digits, beginning with 91 (and with or without spaces between groupings)
-    # 2) 20 digits (no real pattern)
-    # TODO: 2nd pattern is too generic. Could also match other carriers.
-    self.regex = /\b(91\d{2} ?\d{4} ?\d{4} ?\d{4} ?\d{4} ?\d{2}|91\d{2} ?\d{4} ?\d{4} ?\d{4} ?\d{4})\b|\b(\d{20})\b/i
+    # 2) 22 digits, beginning with 94 (and with or without spaces between groupings)
+    # 3) 20 digits (no real pattern)
+    # 4) XX#########XX (start and end with 2 letter, 9 digit number in the middle)
+
+    # TODO: 3rd pattern is too generic. Could also match other carriers.
+    self.regex = [  /\b((91|94)\d{2} ?\d{4} ?\d{4} ?\d{4} ?\d{4} ?\d{2})\b/i,
+                    /\b(91\d{2} ?\d{4} ?\d{4} ?\d{4} ?\d{4})\b/i,
+                    /\b(\d{20})\b/i,
+                    /\b([A-Z]{2}\d{9}[A-Z]{2})\b/i
+                    ]
 
     def track(id)
 

data/test/stalkr/dhl_test.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class DHL_Test < Test::Unit::TestCase
+
+    def test_track
+        id = "5391587692"
+        info = Stalkr::DHL.new.track(id)
+        assert(info.shipper == :DHL)
+        assert(info.status == Stalkr::IN_TRANSIT)
+        assert(info.updated_at.kind_of? Time)
+    end
+
+    def test_track_bad_code
+
+        begin
+            id = "foobar"
+            info = Stalkr::DHL.new.track(id)
+            flunk("no exception was thrown")
+
+        rescue Exception => ex
+            if ex.message != "DHL scraper failed" then
+                flunk("wrong exception was thrown")
+            end
+        end
+
+    end
+
+    def test_valid_id
+        id = "5391587692"
+        assert(Stalkr::DHL.is_valid?(id))
+    end
+
+    def test_extract_id
+        str = "*5391587692*"
+        assert(Stalkr::DHL.extract_id(str) == "5391587692")
+    end
+
+end

data/test/stalkr/usps_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 class USPS_Test < Test::Unit::TestCase
 
     def test_track
-        id = "9102901001299192824023"
+        id = "9400110200793331353367"
         info = Stalkr::USPS.new.track(id)
         assert(info.shipper == :USPS)
         assert(info.status == Stalkr::DELIVERED)
@@ -32,8 +32,17 @@ class USPS_Test < Test::Unit::TestCase
 
     def test_extract_id_2
         str = "Your tracking number is: 02185456301085740874. "
-        id = Stalkr::USPS.extract_id(str)
-        assert(!id.nil? && id == "02185456301085740874")
+        assert(Stalkr::USPS.extract_id(str) == "02185456301085740874")
+    end
+
+    def test_extract_id_3
+        str = "Your tracking number is: 9400110200793331353367. "
+        assert(Stalkr::USPS.extract_id(str) == "9400110200793331353367")
+    end
+
+    def test_extract_id_4
+        str = "Your tracking number is: LJ337239295US. "
+        assert(Stalkr::USPS.extract_id(str) == "LJ337239295US")
     end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stalkr
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Chetan Sarva
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -05:00
+date: 2011-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,12 +112,14 @@ files:
 - lib/stalkr.rb
 - lib/stalkr/base.rb
 - lib/stalkr/china_post.rb
+- lib/stalkr/dhl.rb
 - lib/stalkr/error.rb
 - lib/stalkr/fedex.rb
 - lib/stalkr/result.rb
 - lib/stalkr/ups.rb
 - lib/stalkr/usps.rb
 - test/stalkr/china_post_test.rb
+- test/stalkr/dhl_test.rb
 - test/stalkr/fedex_test.rb
 - test/stalkr/ups_test.rb
 - test/stalkr/usps_test.rb
@@ -159,6 +161,7 @@ specification_version: 3
 summary: Ruby library for tracking packages
 test_files: 
 - test/stalkr/china_post_test.rb
+- test/stalkr/dhl_test.rb
 - test/stalkr/fedex_test.rb
 - test/stalkr/ups_test.rb
 - test/stalkr/usps_test.rb