stalkr 0.9.0 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/stalkr.rb

@@ -11,6 +11,8 @@ require 'date'
 
 require 'stalkr/base'
 require 'stalkr/result'
+require 'stalkr/error'
+
 require 'stalkr/ups'
 require 'stalkr/usps'
 require 'stalkr/fedex'
@@ -23,16 +25,17 @@ if not DateTime.new.public_methods.include? "to_time" then
           t = d.instance_eval do
             Time.utc(year, mon, mday, hour, min, sec +
                      sec_fraction)
-          end.getlocal
+          end
+          t.getlocal
         end
     end
 end
 
 module Stalkr
 
-	def self.shippers
-		return [ Stalkr::UPS, Stalkr::USPS, Stalkr::FEDEX ]
-	end
+    def self.shippers
+        return [ Stalkr::UPS, Stalkr::USPS, Stalkr::FEDEX ]
+    end
 
     def self.track(id)
         shipper = nil

data/lib/stalkr/error.rb

@@ -0,0 +1,16 @@
+
+module Stalkr
+
+class Error < ::Exception
+
+    attr_accessor :html
+
+    def initialize(ex, html)
+        super(ex.message)
+        self.set_backtrace(ex.backtrace)
+        self.html = html
+    end
+
+end
+
+end

data/lib/stalkr/fedex.rb

@@ -6,7 +6,7 @@ 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)?)|(\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|\b(\d{12}|\d{15})\b/i
 
     def track(id)
 
@@ -15,68 +15,54 @@ class FEDEX < Base
         url.gsub!(/%CODE%/, id)
         html = fetchurl(url)
 
-        if html =~ /invalid._header/ then
-            ret = Result.new(:FEDEX)
-            ret.status = UNKNOWN
-            return ret
-        end
+        begin
 
-        info_scraper = Scraper.define do
+            if html =~ /invalid._header/ then
+                ret = Result.new(:FEDEX)
+                ret.status = UNKNOWN
+                return ret
+            end
 
-            array :dates
+            info_scraper = Scraper.define do
 
-            process "div.detailshipmentstatus", :status => :text
-            process "div.detailshipdates > div.fielddata", :dates => :text
-            process "div.detaildestination > div.fielddata", :destination => :text
-            process_first "div.detailshipfacts div.dataentry", :service_type => :text
+                array :dates
 
-            result :status, :dates, :destination, :service_type
+                process "div.detailshipmentstatus", :status => :text
+                process "div.detailshipdates > div.fielddata", :dates => :text
+                process "div.detaildestination > div.fielddata", :destination => :text
+                process_first "div.detailshipfacts div.dataentry", :service_type => :text
 
-        end
+                result :status, :dates, :destination, :service_type
 
-        ret = Result.new(:FEDEX)
+            end
 
-        info = info_scraper.scrape(html)
+            ret = Result.new(:FEDEX)
 
-        if info.status.strip.downcase == "delivered" then
-            ret.status = DELIVERED
-        end
-        ret.location = info.destination.strip
+            info = info_scraper.scrape(html)
+
+            if info.status.strip.downcase == "delivered" then
+                ret.status = DELIVERED
+            end
+            ret.location = info.destination.strip
+
+            # obj.service_type = info.service_type.strip
+
+            # try to get dates
+            shipped_date = info.dates[0].strip
+            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 = "(.*?)";$/
+            end
+            ret.delivered_at = delivery_date
+            ret.updated_at = delivery_date
+
+            return ret
 
-        # obj.service_type = info.service_type.strip
+        rescue Exception => ex
+            raise Stalkr::Error.new(ex, html)
 
-        # try to get dates
-        shipped_date = info.dates[0].strip
-        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 = "(.*?)";$/
         end
-        ret.delivered_at = delivery_date
-        ret.updated_at = delivery_date
-
-        # pull progress from JSON
-        # if html =~ /^var detailInfoObject = (.*);$/ then
-        #     json = $1
-        #     progress = JSON.parse(json)
-        #     scans = progress['scans']
-        #
-        #     progress = []
-        #
-        #     scans.each { |scan|
-        #         o = OpenStruct.new
-        #         o.location      = scan['scanLocation']
-        #         o.date          = scan['scanDate']
-        #         o.local_time    = scan['scanTime']
-        #         o.desc          = scan['scanStatus']
-        #         progress << o
-        #     }
-        #
-        #     obj.progress = progress
-        #
-        # end
-
-        return ret
 
     end
 

data/lib/stalkr/ups.rb

@@ -25,53 +25,60 @@ class UPS < Base
         url.gsub!(/%CODE%/, id)
         html = fetchurl(url)
 
-        detail_scraper = Scraper.define do
+        begin
 
-            array :keys
-            array :vals
-            array :lists
+            detail_scraper = Scraper.define do
 
-            process "#trkNum", :trackingNumber => :text
-            process "#tt_spStatus", :status => :text
-            process "#fontControl dt", :keys => :text
-            process "#fontControl dd", :vals => :text
-            process "#fontControl ul.clearfix li", :lists => :text
+                array :keys
+                array :vals
+                array :lists
 
-            result :keys, :vals, :trackingNumber, :status, :lists
+                process "#trkNum", :trackingNumber => :text
+                process "#tt_spStatus", :status => :text
+                process "#fontControl dt", :keys => :text
+                process "#fontControl dd", :vals => :text
+                process "#fontControl ul.clearfix li", :lists => :text
 
-        end
+                result :keys, :vals, :trackingNumber, :status, :lists
 
-        details = detail_scraper.scrape(html)
+            end
 
-        if not details.trackingNumber then
-            raise "UPS scraper failed"
-        end
+            details = detail_scraper.scrape(html)
 
-        ret = Result.new(:UPS)
+            if not details.trackingNumber then
+                raise "UPS scraper failed"
+            end
 
-        ret.status = case details.status.strip.downcase
-            when "in transit"
-                IN_TRANSIT
-            when "delivered"
-                DELIVERED
-            else
-                UNKNOWN
-        end
+            ret = Result.new(:UPS)
 
-        hash = {}
-        details.keys.each_with_index do |k,i|
-            hash[k] = details.vals[i]
-        end
+            ret.status = case details.status.strip.downcase
+                when "in transit"
+                    IN_TRANSIT
+                when "delivered"
+                    DELIVERED
+                else
+                    UNKNOWN
+            end
 
-        if ret.status == DELIVERED then
-            delivered_at = cleanup_html( hash["Delivered On:"] )
-            ret.delivered_at = DateTime.strptime( delivered_at, "%A, %m/%d/%Y at %I:%M %p" ).to_time
-        end
+            hash = {}
+            details.keys.each_with_index do |k,i|
+                hash[k] = details.vals[i]
+            end
 
-        cleanup_html( details.lists[3] ) =~ /Updated: (.*?)$/
-        ret.updated_at = DateTime.strptime( $1, "%m/%d/%Y %I:%M %p" ).to_time
+            if ret.status == DELIVERED then
+                delivered_at = cleanup_html( hash["Delivered On:"] )
+                ret.delivered_at = DateTime.strptime( delivered_at, "%A, %m/%d/%Y at %I:%M %p" ).to_time
+            end
 
-        return ret
+            cleanup_html( details.lists[3] ) =~ /Updated: (.*?)$/
+            ret.updated_at = DateTime.strptime( $1, "%m/%d/%Y %I:%M %p" ).to_time
+
+            return ret
+
+        rescue Exception => ex
+            raise Stalkr::Error.new(ex, html)
+
+        end
 
     end
 

data/lib/stalkr/usps.rb

@@ -3,8 +3,10 @@ module Stalkr
 
 class USPS < Base
 
-    # 20 or 22 digits, beginning with 91 (and with or without spaces between groupings)
-    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/i
+    # 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
 
     def track(id)
 
@@ -16,62 +18,70 @@ class USPS < Base
         url.gsub!(/%CODE%/, id)
         html = fetchurl(url)
 
-        info_scraper = Scraper.define do
+        begin
 
-            array :details
-            array :info
-            array :txt
+            info_scraper = Scraper.define do
 
-            process "span.mainTextbold", :info => :text
-            process "td.mainTextbold", :details => :text
-            process "td.mainText", :txt => :text
+                array :details
+                array :info
+                array :txt
 
-            result :details, :info, :txt
+                process "span.mainTextbold", :info => :text
+                process "td.mainTextbold", :details => :text
+                process "td.mainText", :txt => :text
 
-        end
+                result :details, :info, :txt
 
-        scrape = info_scraper.scrape(html)
+            end
 
-        # verify its the correct response page
-        if scrape.info[0].gsub(/ /, '') != id then
-            raise "USPS scraper failed"
-        end
+            scrape = info_scraper.scrape(html)
 
-        # extract and return
-        ret = Result.new(:USPS)
-        if scrape.txt.find{ |t| t =~ /There is no record of this item/ } then
-            ret.status = UNKNOWN
-        elsif scrape.info.find{ |i| i.downcase == "delivered" } then
-            ret.status = DELIVERED
-        else
-            ret.status = UNKNOWN
-        end
+            # verify its the correct response page
+            if scrape.info[0].gsub(/ /, '') != id then
+                raise "USPS scraper failed"
+            end
 
-        if scrape.details and not scrape.details.empty? then
-            if scrape.details[0] =~ /^(.*?), (.*? \d+, \d+), (\d+:\d+ .m), (.*?)$/ then
-                ret.location = $4
+            # extract and return
+            ret = Result.new(:USPS)
+            if scrape.txt.find{ |t| t =~ /There is no record of this item/ } then
+                ret.status = UNKNOWN
+            elsif scrape.info.find{ |i| i.downcase == "delivered" } then
+                ret.status = DELIVERED
+            else
+                ret.status = UNKNOWN
+            end
+
+            if scrape.details and not scrape.details.empty? then
+                if scrape.details[0] =~ /^(.*?), (.*? \d+, \d+), (\d+:\d+ .m), (.*?)$/ then
+                    ret.location = $4
+                    # not sure if this time is always in EST or the time of the area in which it was delivered?
+                    ret.updated_at = DateTime.strptime( "#{$2} #{$3} -0500", "%B %d, %Y %I:%M %p %z" ).to_time
+                    if ret.status == DELIVERED then
+                        ret.delivered_at = ret.updated_at
+                    end
+
+                elsif scrape.details[0] =~ /Electronic Shipping Info Received/ then
+                    ret.status = IN_TRANSIT
+                end
+
+            elsif s = scrape.txt.find{ |t| t =~ /files offline/ }
+                s =~ /at (\d+:\d+ .m) on (.*? \d+, \d+) in (.*?)\.$/
+                ret.location = $3
                 # not sure if this time is always in EST or the time of the area in which it was delivered?
-                ret.updated_at = DateTime.strptime( "#{$2} #{$3} -0500", "%B %d, %Y %I:%M %p %z" ).to_time
+                ret.updated_at = DateTime.strptime( "#{$2} #{$1} -0500", "%B %d, %Y %I:%M %p %z" ).to_time
                 if ret.status == DELIVERED then
                     ret.delivered_at = ret.updated_at
                 end
 
-            elsif scrape.details[0] =~ /Electronic Shipping Info Received/ then
-                ret.status = IN_TRANSIT
             end
 
-        elsif s = scrape.txt.find{ |t| t =~ /files offline/ }
-            s =~ /at (\d+:\d+ .m) on (.*? \d+, \d+) in (.*?)\.$/
-            ret.location = $3
-            # not sure if this time is always in EST or the time of the area in which it was delivered?
-            ret.updated_at = DateTime.strptime( "#{$2} #{$1} -0500", "%B %d, %Y %I:%M %p %z" ).to_time
-            if ret.status == DELIVERED then
-                ret.delivered_at = ret.updated_at
-            end
+            return ret
+
+        rescue Exception => ex
+            raise Stalkr::Error.new(ex, html)
 
         end
 
-        return ret
     end
 
 end # class USPS

data/test/stalkr/fedex_test.rb

@@ -18,9 +18,29 @@ class FEDEX_Test < Test::Unit::TestCase
 
     end
 
+    def test_track_bad_code_numeric
+
+        begin
+            id = "200793242831442"
+            info = Stalkr::FEDEX.new.track(id)
+            flunk("no exception raised")
+
+        rescue Exception => ex
+            assert(ex.kind_of? Stalkr::Error)
+            assert(!(ex.html.nil? || ex.html.empty?))
+        end
+
+    end
+
     def test_extract_id
         str = "asdf 106050761498748 asdfas"
         assert(Stalkr::FEDEX.extract_id(str) == "106050761498748")
     end
 
+    def test_should_not_extract
+        str = "Your tracking number is: 02185456301085740874. "
+        id = Stalkr::FEDEX.extract_id(str)
+        assert(id.nil?)
+    end
+
 end

data/test/stalkr/usps_test.rb

@@ -30,4 +30,10 @@ class USPS_Test < Test::Unit::TestCase
         assert(Stalkr::USPS.extract_id(str) == "9102901001299192824023")
     end
 
+    def test_extract_id_2
+        str = "Your tracking number is: 02185456301085740874. "
+        id = Stalkr::USPS.extract_id(str)
+        assert(!id.nil? && id == "02185456301085740874")
+    end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stalkr
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Chetan Sarva
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -05:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - VERSION
 - lib/stalkr.rb
 - lib/stalkr/base.rb
+- lib/stalkr/error.rb
 - lib/stalkr/fedex.rb
 - lib/stalkr/result.rb
 - lib/stalkr/ups.rb