tracking_number 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/base.rb

@@ -6,12 +6,24 @@ class TrackingNumber
       @tracking_number = tracking_number.gsub(" ", "").upcase
     end
 
-    def self.search(body)
-     self.scan(body).uniq.collect { |possible| new(possible) }.select { |t| t.valid? }
+    def self.search(body)      
+      valids = self.scan(body).uniq.collect { |possible| new(possible) }.select { |t| t.valid? }
+
+      uniques = {}
+      valids.each do |t|
+        uniques[t.tracking_number] = t unless uniques.has_key?(t.tracking_number)
+      end
+      
+      uniques.values
     end
     
     def self.scan(body)
-      possibles = body.scan(self.const_get("SEARCH_PATTERN")).uniq.flatten
+      patterns = [self.const_get("SEARCH_PATTERN")].flatten
+      possibles = patterns.collect do |pattern|
+        body.scan(pattern).uniq.flatten
+      end
+      
+      possibles.flatten.compact.uniq
     end
 
     def valid?

data/lib/usps.rb

@@ -6,12 +6,10 @@ class TrackingNumber
   end
   
   class USPS91 < USPS
-    SEARCH_PATTERN = /(\b9\s*1\s*(([0-9]\s*){20,20}\b))/
+    SEARCH_PATTERN = [/(\b9\s*1\s*(([0-9]\s*){20,20}\b))/, /(\b([0-9]\s*){20,20}\b)/]
     VERIFY_PATTERN = /^(91[0-9]{19,19})([0-9])$/
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
+  
+    # Sometimes these numbers will appear without the leading 91, though, so we need to account for that case
     
     def decode 
       # Application ID: 91
@@ -28,8 +26,30 @@ class TrackingNumber
       }
     end
     
+    def matches
+      if self.tracking_number =~ /^91/
+        self.tracking_number.scan(VERIFY_PATTERN).flatten
+      else
+        "91#{self.tracking_number}".scan(VERIFY_PATTERN).flatten
+      end
+    end
+    
     def valid_checksum?
-      chars = tracking_number.chars.to_a
+      if self.tracking_number =~ /^91/ 
+        return true if weighted_usps_checksum_valid?(tracking_number) 
+      else
+        if weighted_usps_checksum_valid?("91#{self.tracking_number}")
+          # set the tracking number to the 91 format if it passes this test
+          self.tracking_number = "91#{self.tracking_number}"
+          return true
+        end
+      end
+    end
+    
+    private
+    
+    def weighted_usps_checksum_valid?(sequence)
+      chars = sequence.chars.to_a
       check_digit = chars.pop
       
       total = 0
@@ -47,6 +67,9 @@ class TrackingNumber
   end
   
   class USPS20 < USPS
+    # http://www.usps.com/cpim/ftp/pubs/pub109.pdf (Publication 109. Extra Services Technical Guide, pg. 19)
+    # http://www.usps.com/cpim/ftp/pubs/pub91.pdf (Publication 91. Confirmation Services Technical Guide pg. 38)
+    
     SEARCH_PATTERN = /(\b([0-9]\s*){20,20}\b)/
     VERIFY_PATTERN = /^([0-9]{2,2})([0-9]{9,9})([0-9]{8,8})([0-9])$/
 
@@ -83,7 +106,6 @@ class TrackingNumber
       chars.reverse.each_with_index do |c, i|
         x = c.to_i
         x *= 3 if i.even?
-
         total += x
       end
 

data/test/test_usps_tracking_number.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class USPSTrackingNumberTest < Test::Unit::TestCase
   context "a USPS tracking number" do
-    ["9101 1234 5678 9000 0000 13"].each do |valid_number|
+    ["9101 1234 5678 9000 0000 13", "7196 9010 7560 0307 7385"].each do |valid_number|
       should "return usps with valid 22 digit number: #{valid_number}" do
         t = TrackingNumber.new("9101 1234 5678 9000 0000 13")
         assert_equal TrackingNumber::USPS91, t.class
@@ -15,8 +15,6 @@ class USPSTrackingNumberTest < Test::Unit::TestCase
       end
     end
     
-    # Actual tracking number I got from the USPS that doesn't validate.  UGghhh
-    #"7196 9010 7560 0307 7385",
     ["0307 1790 0005 2348 3741"].each do |valid_number|
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::USPS20)

data/tracking_number.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracking_number}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Keen"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-22}
   s.description = %q{Match tracking numbers to a service, and search blocks of text and pull out valid tracking numbers.}
   s.email = %q{jeff@keen.me}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracking_number
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeff Keen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency