stalkr 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/stalkr.rb

@@ -11,6 +11,7 @@ require 'date'
 
 
 stalkr_dir = File.dirname(__FILE__)
+require "#{stalkr_dir}/stalkr/datetime_patch"
 require "#{stalkr_dir}/stalkr/base"
 require "#{stalkr_dir}/stalkr/result"
 require "#{stalkr_dir}/stalkr/error"
@@ -21,37 +22,5 @@ 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
-    # monkey patch DateTime to add to_time (exists in Ruby 1.9.2 and above)
-    class DateTime
-        def to_time
-          d = new_offset(0)
-          t = d.instance_eval do
-            Time.utc(year, mon, mday, hour, min, sec +
-                     sec_fraction)
-          end
-          t.getlocal
-        end
-    end
-end
 
-module Stalkr
-
-    def self.shippers
-        return [ Stalkr::UPS, Stalkr::USPS, Stalkr::FEDEX ]
-    end
-
-    def self.track(id)
-        shipper = nil
-        if id =~ /\d{22}/ then
-            shipper = Stalkr::USPS
-        elsif id =~ /^1Z/ then
-            shipper = Stalkr::UPS
-        elsif id =~ /\d{20}/ or id =~ /\d{15}/ then
-            shipper = Stalkr::FEDEX
-        end
-        raise 'Unknown shipper code' if shipper.nil?
-        return shipper.new.track(id)
-    end
-
-end # module Stalkr
+

data/lib/stalkr/base.rb

@@ -1,6 +1,20 @@
 
 module Stalkr
 
+    @@shippers = []
+
+    def self.shippers
+        return @@shippers
+    end
+
+    def self.detect_shipper(text)
+        Stalkr.shippers.each do |s|
+            id = s.extract_id(text)
+            return [id, s] if id
+        end
+        return nil
+    end
+
     class Base
 
         class << self

data/lib/stalkr/china_post.rb

@@ -65,3 +65,5 @@ class ChinaPost < Base
 
 end # class ChinaPost
 end # module Stalkr
+
+Stalkr.shippers << Stalkr::ChinaPost

data/lib/stalkr/datetime_patch.rb

@@ -0,0 +1,14 @@
+
+if not DateTime.new.public_methods.include? "to_time" then
+    # monkey patch DateTime to add to_time (exists in Ruby 1.9.2 and above)
+    class DateTime
+        def to_time
+          d = new_offset(0)
+          t = d.instance_eval do
+            Time.utc(year, mon, mday, hour, min, sec +
+                     sec_fraction)
+          end
+          t.getlocal
+        end
+    end
+end

data/lib/stalkr/dhl.rb

@@ -70,3 +70,5 @@ class DHL < Base
 
 end # class ChinaPost
 end # module Stalkr
+
+Stalkr.shippers << Stalkr::DHL

data/lib/stalkr/fedex.rb

@@ -77,3 +77,5 @@ class FEDEX < Base
 
 end # class FEDEX
 end # module Stalkr
+
+Stalkr.shippers << Stalkr::FEDEX

data/lib/stalkr/ups.rb

@@ -86,3 +86,5 @@ class UPS < Base
 
 end # class UPS
 end # module Stalkr
+
+Stalkr.shippers << Stalkr::UPS

data/lib/stalkr/usps.rb

@@ -93,3 +93,5 @@ class USPS < Base
 
 end # class USPS
 end # module Stalkr
+
+Stalkr.shippers << Stalkr::USPS

data/test/stalkr/china_post_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class ChinaPost_Test < Test::Unit::TestCase
 
+    def test_has_shipper
+        assert(Stalkr.shippers.include? Stalkr::ChinaPost)
+    end
+
     def test_track
         id = "RA103044224CN"
         info = Stalkr::ChinaPost.new.track(id)

data/test/stalkr/dhl_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class DHL_Test < Test::Unit::TestCase
 
+    def test_has_shipper
+        assert(Stalkr.shippers.include? Stalkr::DHL)
+    end
+
     def test_track
         id = "5391587692"
         info = Stalkr::DHL.new.track(id)

data/test/stalkr/fedex_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class FEDEX_Test < Test::Unit::TestCase
 
+    def test_has_shipper
+        assert(Stalkr.shippers.include? Stalkr::FEDEX)
+    end
+
     def test_track
         id = "106050761498748"
         info = Stalkr::FEDEX.new.track(id)

data/test/stalkr/ups_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class UPS_Test < Test::Unit::TestCase
 
+    def test_has_shipper
+        assert(Stalkr.shippers.include? Stalkr::UPS)
+    end
+
     def test_track
         id = "1ZX799470341200708"
         info = Stalkr::UPS.new.track(id)

data/test/stalkr/usps_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 class USPS_Test < Test::Unit::TestCase
 
+    def test_has_shipper
+        assert(Stalkr.shippers.include? Stalkr::USPS)
+    end
+
     def test_track
         id = "9400110200793331353367"
         info = Stalkr::USPS.new.track(id)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stalkr
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Chetan Sarva
@@ -112,6 +112,7 @@ files:
 - lib/stalkr.rb
 - lib/stalkr/base.rb
 - lib/stalkr/china_post.rb
+- lib/stalkr/datetime_patch.rb
 - lib/stalkr/dhl.rb
 - lib/stalkr/error.rb
 - lib/stalkr/fedex.rb