tracking_number 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/base.rb

@@ -0,0 +1,49 @@
+class TrackingNumber
+  class Base
+    attr_accessor :tracking_number
+    def initialize(tracking_number)
+      @original_number = tracking_number
+      @tracking_number = tracking_number.gsub(" ", "").upcase
+    end
+
+    def self.search(body)
+     self.scan(body).uniq.collect { |possible| new(possible) }.select { |t| t.valid? }
+    end
+    
+    def self.scan(body)
+      possibles = body.scan(self.const_get("SEARCH_PATTERN")).uniq.flatten
+    end
+
+    def valid?
+      return false unless valid_format?
+      return false unless valid_checksum?
+      return true
+    end
+
+    def valid_format?
+      !matches.nil? && !matches.empty?
+    end
+    
+    def decode
+      {}
+    end
+
+    def matches
+      []
+    end
+
+    def valid_checksum?
+      false
+    end
+
+    def to_s
+      self.tracking_number
+    end
+  end
+
+  class Unknown < Base
+    def carrier
+      :unknown
+    end
+  end
+end

data/lib/dhl.rb

@@ -0,0 +1,19 @@
+class TrackingNumber
+  class DHL < Base
+    SEARCH_PATTERN = /(\b([0-9]\s*){11,11}\b)/
+    VERIFY_PATTERN = /^([0-9]{10,10})([0-9])$/
+    def carrier
+      :dhl
+    end
+
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      # standard mod 7 check
+      sequence, check_digit = matches
+      return true if sequence.to_i % 7 == check_digit.to_i
+    end
+  end
+end

data/lib/fedex.rb

@@ -0,0 +1,130 @@
+class TrackingNumber
+  class FedEx < Base
+    def carrier
+      :fedex
+    end
+  end
+
+  class FedExExpress < FedEx
+    SEARCH_PATTERN = /(\b([0-9]\s*){12,12}\b)/
+    VERIFY_PATTERN = /^([0-9]{11,11})([0-9])$/
+    LENGTH = 12
+    
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      sequence = tracking_number.chars.to_a
+      check = sequence.pop
+      total = 0
+      sequence.zip([3,1,7,3,1,7,3,1,7,3,1]).collect { |pair| pair[0].to_i * pair[1].to_i }.each { |t| total += t.to_i }
+      return (total % 11) == check.to_i
+    end
+  end
+  
+  #TODO Fix these FedEx ground numberss
+
+  class FedExGround96 < FedEx
+    SEARCH_PATTERN = /(\b9\s*6\s*([0-9]\s*){20,20}\b)/
+    VERIFY_PATTERN = /^96[0-9]{5,5}([0-9]{14,14})([0-9])$/
+    LENGTH = 22
+    
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def decode
+      {:application_id => self.tracking_number.to_s.slice(0...2),
+       :serial_container =>  self.tracking_number.to_s.slice(2...4), 
+       :service_code => self.tracking_number.to_s.slice(4...7),
+       :shipper_id =>  self.tracking_number.to_s.slice(7...14),
+       :package_identifier =>  self.tracking_number.to_s.slice(14...21),
+       :check_digit => self.tracking_number.slice(21...22)
+      }
+    end
+
+    def valid_checksum?
+      # 22 numbers
+      # http://fedex.com/us/solutions/ppe/FedEx_Ground_Label_Layout_Specification.pdf
+      # 96 - UCC/EAN Application Identifier
+      
+      # [0-9]{2,2} - SCNC
+      # [0-9]{3,3} - Class Of Service
+      # [0-9]{7,7} - RPS Shipper ID (used in calculation)
+      # [0-9]{7,7} - Package Number (used in calculation)
+      # [0-9]      - Check Digit
+      sequence, check_digit = matches
+
+      total = 0
+      sequence.chars.to_a.map(&:to_i).reverse.each_with_index do |x, i|
+        x *= 3 if i.even?
+        total += x
+      end
+
+      check = total % 10
+      check = (10 - check) unless (check.zero?)
+      return true if check == check_digit.to_i
+    end
+  end
+
+  class FedExGround < FedEx
+    SEARCH_PATTERN = /(\b([0-9]\s*){15,15}\b)/
+    VERIFY_PATTERN = /^([0-9]{15,15})$/
+    LENGTH = 15
+    
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      sequence = tracking_number.chars.to_a.map(&:to_i)
+      check_digit = sequence.pop
+      total = 0
+      sequence.reverse.each_with_index do |x, i|
+        x *= 3 if i.even?
+        total += x
+      end
+      check = total % 10
+      check = (10 - check) unless (check.zero?)
+      return true if check == check_digit.to_i
+    end
+  end
+
+  class FedExGround18 < FedEx
+    SEARCH_PATTERN = /(\b([0-9]\s*){18,18}\b)/
+    VERIFY_PATTERN = /^[0-9]{2,2}([0-9]{15,15})([0-9])$/
+    LENGTH = 20
+    
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def decode
+      {:application_id => self.tracking_number.to_s.slice(0...2),
+       :serial_container =>  self.tracking_number.to_s.slice(1...2), 
+       :service_code => self.tracking_number.to_s.slice(2...3),
+       :shipper_id =>  self.tracking_number.to_s.slice(3...10),
+       :package_identifier =>  self.tracking_number.to_s.slice(10...17),
+       :check_digit => self.tracking_number.slice(17...18)
+      }
+    end
+    
+    def valid_checksum?
+      # [0-9]{2,2} - Not used
+      # [0-9]{15, 15} - used for calculation
+      
+      sequence = tracking_number.chars.to_a.map(&:to_i)
+      check_digit = sequence.pop
+      total = 0
+      sequence.reverse.each_with_index do |x, i|
+        x *= 3 if i.even?
+        total += x
+      end
+      check = total % 10
+      check = (10 - check) unless (check.zero?)
+      return true if check == check_digit.to_i
+    end
+  end
+
+end

data/lib/tracking_number.rb

@@ -3,177 +3,31 @@
 # Information on validating tracking numbers found here:
 # http://answers.google.com/answers/threadview/id/207899.html
 
-class TrackingNumber
-  SEARCH_PATTERNS = {
-    :ups => /(\b1\s*Z\s*(\w\s*){16,16}\b)/,
-    :fedex_express => /(\b([0-9]\s*){12,12}\b)/,
-    :fedex_ground_96 => /(\b9\s*6\s*([0-9]\s*){20,20}\b)/,
-    :fedex_ground_sscc18 => /(\b([0-9]\s*){18,18}\b)/,
-    :dhl => /(\b([0-9]\s*){11,11}\b)/,
-    :usps => /(\b([0-9]\s*){22,22}\b)/
-  }
-
-  VERIFY_PATTERNS = {
-    :ups => /^1Z(\w{15,15})(\w)$/,
-    :fedex_express => /^([0-9]{11,11})([0-9])$/,
-    :fedex_ground_96 => /^96[0-9]{5,5}([0-9]{14,14})([0-9])$/,
-    :fedex_ground_sscc18 => /^[0-9]{2,2}([0-9]{15,15})([0-9])$/,
-    :dhl => /^([0-9]{10,10})([0-9])$/,
-    :usps => /^([0-9]{21,21})([0-9])/
-  }
+require 'base'
+require 'usps'
+require 'fedex'
+require 'ups'
+require 'dhl'
 
-  def self.scan(body)
-    possibles = SEARCH_PATTERNS.values.collect { |pattern| 
-      body.scan(pattern)
-    }.uniq.flatten
-  end
+class TrackingNumber
+  TYPES = [UPS, FedExExpress, FedExGround, FedExGround18, FedExGround96, USPS91, USPS20, USPS13, DHL]
 
   def self.search(body)
-   self.scan(body).uniq.collect { |possible| TrackingNumber.new(possible) }.select { |t| t.valid? }
-  end
-
-  def initialize(tracking_number)
-    @original_number = tracking_number
-    @tracking_number = tracking_number.to_s.upcase.gsub(/\s/,"")
-  end
-
-  def valid?
-    carrier != :unknown
+    TYPES.collect { |type| type.search(body) }.flatten
   end
 
-  def carrier
-    @carrier = if ups?(@tracking_number)
-      :ups
-    elsif fedex_express?(@tracking_number)
-      :fedex
-    elsif fedex_ground_96?(@tracking_number)
-      :fedex
-    elsif fedex_ground_sscc18?(@tracking_number)
-      :fedex
-    elsif usps?(@tracking_number)
-      :usps
-    elsif dhl?(@tracking_number)
-      :dhl
-    else
-      :unknown
+  def self.detect(tracking_number)
+    detected = TYPES.collect do |test|
+      t = test.new(tracking_number)
+      t if t.valid?
     end
-  end
-  
-  def original_number
-    @original_number
-  end
-  
-  def tracking_number
-    @tracking_number
-  end
+    found = detected.compact.first
 
-  def to_s
-    @tracking_number
+    return found if found
+    return Unknown.new(tracking_number)
   end
 
-  private
-
-    def ups?(tracking_number)
-      results = tracking_number.scan(VERIFY_PATTERNS[:ups])
-      return false if results.nil? || results.empty?
-
-      sequence, check_digit = results.flatten
-      total = 0
-      sequence.chars.each_with_index do |c, i|
-        x = if c[/[0-9]/] # numeric
-          c.to_i
-        else
-          (c[0].ord - 3) % 10
-        end
-        x *= 2 if i.odd?
-        total += x
-      end
-
-      check = (total % 10)
-      check = (10 - check) unless (check.zero?)
-
-      return true if (check.to_i == check_digit.to_i)
-    end
-
-
-    def fedex_express?(tracking_number)
-      results = tracking_number.scan(VERIFY_PATTERNS[:fedex_express]).flatten
-      return false if results.nil? || results.empty?
-      sequence, check = results
-
-      sequence = sequence.chars.to_a.map(&:to_i)
-      total = 0
-      sequence.zip([3,1,7,3,1,7,3,1,7,3,1]).collect { |pair| pair[0] * pair[1] }.each { |t| total += t.to_i }
-      return true if (total % 11) == check.to_i
-    end
-
-    def fedex_ground_96?(tracking_number)
-      # 22 numbers
-      # http://fedex.com/us/solutions/ppe/FedEx_Ground_Label_Layout_Specification.pdf
-      # 96 - UCC/EAN Application Identifier
-      # [0-9]{2,2} - SCNC
-      # [0-9]{3,3} - Class Of Service
-
-      # [0-9]{7,7} - RPS Shipper ID (used in calculation)
-      # [0-9]{7,7} - Package Number (used in calculation)
-
-      # [0-9]      - Check Digit
-      results = tracking_number.scan(VERIFY_PATTERNS[:fedex_ground_96]).flatten
-      return false if results.nil? || results.empty?
-
-      sequence, check_digit = results.flatten
-      total = 0
-      sequence.chars.to_a.reverse.map(&:to_i).each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
-
-    def fedex_ground_sscc18?(tracking_number)
-      # [0-9]{2,2} - Not used
-      # [0-9]{15, 15} - used for calculation
-      results = tracking_number.scan(VERIFY_PATTERNS[:fedex_ground_sscc18]).flatten
-      return false if results.nil? || results.empty?
-      sequence, check_digit = results
-      total = 0
-      sequence.chars.to_a.map(&:to_i).reverse.each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
-
-    def dhl?(tracking_number)
-      # standard mod 7 check
-      results = tracking_number.scan(VERIFY_PATTERNS[:dhl]).flatten
-      return false if results.nil? || results.empty?
-
-      sequence, check_digit = results
-      return true if sequence.to_i % 7 == check_digit.to_i
-    end
-
-    def usps?(tracking_number)
-      # standard mod 10 check
-      results = tracking_number.scan(VERIFY_PATTERNS[:usps]).flatten
-      return false if results.nil? || results.empty?
-
-      sequence, check_digit = results
-      total = 0
-      sequence.chars.to_a.reverse.each_with_index do |c, i|
-        x = c.to_i
-        x *= 3 if i.even?
-
-        total += x
-      end
-
-      check = total % 10
-      check = 10 - check unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
+  def self.new(tracking_number)
+    self.detect(tracking_number)
+  end
 end

data/lib/ups.rb

@@ -0,0 +1,92 @@
+class TrackingNumber
+  class UPS < Base
+    SEARCH_PATTERN = /(\b1\s*Z\s*(\w\s*){16,16}\b)/
+    VERIFY_PATTERN = /^1Z(\w{15,15})(\w)$/
+    
+    def carrier
+      :ups
+    end
+
+    def matches
+       self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      sequence = tracking_number.slice(2...17)
+      check_digit = tracking_number.slice(17, 18)
+
+      total = 0
+      sequence.chars.each_with_index do |c, i|
+        x = if c[/[0-9]/] # numeric
+          c.to_i
+        else
+          (c[0].ord - 3) % 10
+        end
+        x *= 2 if i.odd?
+        total += x
+      end
+
+      check = (total % 10)
+      check = (10 - check) unless (check.zero?)
+
+      return (check.to_i == check_digit.to_i)
+    end
+
+    def decode
+      {:shipper_account =>  self.tracking_number.to_s.slice(2...8), 
+       :service_type => self.tracking_number.to_s.slice(8...10),
+       :package_identifier =>  self.tracking_number.to_s.slice(10...17),
+       :check_digit => self.tracking_number.to_s.slice(17, 18)
+      }
+    end
+
+    def service_type
+      case decode[:service_type]
+      when "01":
+       "UPS United States Next Day Air (Red)"
+      when "02":
+       "UPS United States Second Day Air (Blue)"
+      when "03":
+       "UPS United States Ground"
+      when "12":
+       "UPS United States Third Day Select"
+      when "13":
+       "UPS United States Next Day Air Saver (Red Saver)"
+      when "15":
+       "UPS United States Next Day Air Early A.M."
+      when "22":
+       "UPS United States Ground - Returns Plus - Three Pickup Attempts"
+      when "32":
+       "UPS United States Next Day Air Early A.M. - COD"
+      when "33":
+       "UPS United States Next Day Air Early A.M. - Saturday Delivery, COD"
+      when "41":
+       "UPS United States Next Day Air Early A.M. - Saturday Delivery"
+      when "42":
+       "UPS United States Ground - Signature Required"
+      when "44":
+       "UPS United States Next Day Air - Saturday Delivery"
+      when "66":
+       "UPS United States Worldwide Express"
+      when "72":
+       "UPS United States Ground - Collect on Delivery"
+      when "78":
+       "UPS United States Ground - Returns Plus - One Pickup Attempt"
+      when "90":
+       "UPS United States Ground - Returns - UPS Prints and Mails Label"
+      when "A0":
+       "UPS United States Next Day Air Early A.M. - Adult Signature Required"
+      when "A1":
+       "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required"
+      when "A2":
+       "UPS United States Next Day Air - Adult Signature Required"
+      when "A8":
+       "UPS United States Ground - Adult Signature Required"
+      when "A9":
+       "UPS United States Next Day Air Early A.M. - Adult Signature Required, COD"
+      when "AA":
+       "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required, COD"
+     end
+    end
+  end
+end

data/lib/usps.rb

@@ -0,0 +1,127 @@
+class TrackingNumber
+  class USPS < Base
+    def carrier
+      :usps
+    end
+  end
+  
+  class USPS91 < USPS
+    SEARCH_PATTERN = /(\b9\s*1\s*(([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
+    
+    def decode 
+      # Application ID: 91
+      # Service Code: 2 Digits
+      # Mailer Id: 8 Digits
+      # Package Id: 9 Digits
+      # Checksum: 1 Digit
+
+      {:application_id => self.tracking_number.to_s.slice(0...2),
+       :service_code =>  self.tracking_number.to_s.slice(2...4), 
+       :mailer_id => self.tracking_number.to_s.slice(4...12),
+       :package_identifier =>  self.tracking_number.to_s.slice(12...21),
+       :check_digit => self.tracking_number.slice(21...22)
+      }
+    end
+    
+    def valid_checksum?
+      chars = tracking_number.chars.to_a
+      check_digit = chars.pop
+      
+      total = 0
+      chars.reverse.each_with_index do |c, i|
+        x = c.to_i
+        x *= 3 if i.even?
+
+        total += x
+      end
+
+      check = total % 10
+      check = 10 - check unless (check.zero?)
+      return true if check == check_digit.to_i
+    end
+  end
+  
+  class USPS20 < USPS
+    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])$/
+
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+    
+    def decode
+      {:service_code =>  self.tracking_number.to_s.slice(0...2), 
+       :mailer_id => self.tracking_number.to_s.slice(2...11),
+       :package_identifier =>  self.tracking_number.to_s.slice(11...19),
+       :check_digit => self.tracking_number.slice(19...20)
+      }
+    end
+    
+    def service_type
+      case decode[:service_code]
+      when "71"
+        "Certified Mail"
+      when "73"
+        "Insured Mail"
+      when "77"
+        "Registered Mail"
+      when "81"
+        "Return Receipt for Merchandise"
+      end
+    end
+    
+    def valid_checksum?
+      chars = tracking_number.chars.to_a
+      check_digit = chars.pop
+      
+      total = 0
+      chars.reverse.each_with_index do |c, i|
+        x = c.to_i
+        x *= 3 if i.even?
+
+        total += x
+      end
+
+      check = total % 10
+      check = 10 - check unless (check.zero?)
+      return true if check == check_digit.to_i
+    end
+  end
+  
+  class USPS13 < USPS
+    SEARCH_PATTERN = /(\b([A-Z]\s*){2,2}([0-9]\s*){9,9}([A-Z]\s*){2,2}\b)/
+    VERIFY_PATTERN = /^([A-Z]{2,2})([0-9]{9,9})([A-Z]{2,2})$/
+    
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      sequence = tracking_number.scan(/[0-9]+/).flatten.to_s
+      chars = sequence.chars.to_a
+      check_digit = chars.pop.to_i
+      
+      sum = 0
+      chars.zip([8,6,4,2,3,5,9,7]).each do |pair|
+        sum += (pair[0].to_i * pair[1].to_i)
+      end
+      
+      remainder = sum % 11
+      check = case remainder
+      when 1
+        0
+      when 0
+        5
+      else
+        11 - remainder
+      end
+      
+      return check == check_digit
+    end
+  end
+end

data/test/test_dhl_tracking_number.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class DHLTrackingNumberTest < Test::Unit::TestCase
+  context "a DHL tracking number" do
+    ["73891051146"].each do |valid_number|
+      should "return dhl for #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal :dhl, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::DHL)
+      end
+    end
+  end
+end

data/test/test_fedex_tracking_number.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class FedExTrackingNumberTest < Test::Unit::TestCase
+  context "a FedEx tracking number" do
+    ["986578788855", "477179081230", "799531274483", "790535312317"].each do |valid_number|
+      should "return fedex express for #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::FedExExpress, t.class
+        assert_equal :fedex, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::FedExExpress)
+      end
+    end
+
+    ["9611020987654312345672"].each do |valid_number|
+      should "return fedex 96 for #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::FedExGround96, t.class
+        assert_equal :fedex, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::FedExGround96)
+      end
+    end
+    
+    ["0414 4176 0228 964", "5682 8361 0012 000", "5682 8361 0012 734"].each do |valid_number|
+      should "return fedex ground for #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::FedExGround, t.class
+        assert_equal :fedex, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::FedExGround)
+      end
+    end
+
+    ["00 0123 4500 0000 0027"].each do |valid_number|
+      should "return fedex sscc18 for #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::FedExGround18, t.class
+        assert_equal :fedex, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::FedExGround18)
+      end
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -16,13 +16,29 @@ require 'tracking_number'
 
 class Test::Unit::TestCase
   def possible_numbers(tracking)
+    tracking = tracking.to_s
     possible_numbers = []
     possible_numbers << tracking
+    possible_numbers << tracking.to_s.gsub(" ", "")
     possible_numbers << tracking.chars.to_a.join(" ")
     possible_numbers << tracking.chars.to_a.join("  ")
     possible_numbers << tracking.slice(0, (tracking.length / 2)) + "  " + tracking.slice((tracking.length / 2), tracking.length)
-    
-    possible_numbers
+
+    possible_numbers.flatten.uniq
+  end
+
+  def possible_strings(tracking)
+    possible_numbers(tracking).flatten.collect { |t| search_string(t) }
+  end
+
+  def search_string(number)
+    %Q{Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor #{number} ut labore et dolore magna aliqua.}
+  end
+
+  def should_detect_number_variants(valid_number, type)
+    possible_strings(valid_number).each do |string|      
+      results = type.search(string)
+      assert_equal 1, results.size, "could not find #{type} #{valid_number} in #{string}"
+    end
   end
-  
 end

data/test/test_tracking_number.rb

@@ -1,96 +1,24 @@
 require 'test_helper'
 
-class TrackingNumberTest < Test::Unit::TestCase 
-  context "a UPS tracking number" do
-    should "return ups as the carrier" do
-      assert_equal :ups, TrackingNumber.new("1Z5R89390357567127").carrier
-      assert_equal :ups, TrackingNumber.new("1Z879E930346834440").carrier 
-      assert_equal :ups, TrackingNumber.new("1Z410E7W0392751591").carrier 
-      assert_equal :ups, TrackingNumber.new("1Z8V92A70367203024").carrier 
-    end
-  end
-
-  context "a FedEx tracking number" do  
-    should "return fedex as the carrier if it's a valid fedex express number" do
-      t = TrackingNumber.new("986578788855")
-      assert_equal :fedex, t.carrier
-      assert t.valid?
-    
-      t = TrackingNumber.new("477179081230")
-      assert_equal :fedex, t.carrier 
-      assert t.valid?
-    end
-  
-    should "return fedex as the carrier with valid fedex ground (96) number" do
-      t = TrackingNumber.new("9611020987654312345672")
-      assert_equal :fedex, t.carrier 
-      assert t.valid?    
-    end
-
-    should "return fedex as the carrier with valid fedex ground (SSCC18) number" do
-      t = TrackingNumber.new("000123450000000027")
-      assert_equal :fedex, t.carrier 
-      assert t.valid?
-    end
-  end
-  
-  context "a DHL tracking number" do
-    should "return dhl if it's a valid number" do
-      t = TrackingNumber.new("73891051146")
-      assert_equal :dhl, t.carrier
-      assert t.valid?
-    end    
-  end
-  
-  context "a USPS tracking number" do  
-    should "return usps with if number" do
-      t = TrackingNumber.new("9101 1234 5678 9000 0000 13")
-      assert_equal :usps, t.carrier
-      assert t.valid?
-    end
-  end
-  
+class TrackingNumberTest < Test::Unit::TestCase
   context "a tracking number" do
     should "return unknown when given invalid number" do
       t = TrackingNumber.new("101")
+      assert_equal TrackingNumber::Unknown, t.class
       assert_equal :unknown, t.carrier
       assert !t.valid?
     end
-  
+
     should "upcase and remove spaces from tracking number" do
       t = TrackingNumber.new("abc 123 def")
       assert_equal "ABC123DEF", t.tracking_number
     end
   end
-  
-  context "tracking number search" do  
-    [{"73891051146" => :dhl}, 
-     {"1Z8V92A70367203024" => :ups}, 
-     {"000123450000000027" => :fedex}, {"9611020987654312345672" => :fedex}, {"477179081230" => :fedex}, 
-     {"9101123456789000000013" => :usps}].each do |pair|
-      expected_service = pair.to_a.flatten[1]
-      tracking = pair.to_a.flatten[0]
-          
-      should "detect #{expected_service} with number #{tracking} regardless of spacing" do 
-        possible_numbers(tracking).each do |spaced_tracking|
-          results = TrackingNumber.search("blah blah #{spaced_tracking} blah blah")
-          assert_equal 1, results.size, "#{spaced_tracking} did not match #{expected_service}"
-          assert_equal expected_service, results.first.carrier
-        end
-      end
-    
-      should "not detect #{expected_service} when word word boundaries are not in tact" do  
-        possible_numbers(tracking).each do |spaced_tracking|
-          bad_number = "x1#{spaced_tracking}1x"          
-          results = TrackingNumber.search("blah blah #{bad_number} blah blah")
-          assert_equal 0, results.size, "#{bad_number} should not match #{expected_service}"
-        end
-      end
-      
-      should "return two tracking numbers when given string with two" do
-        s = TrackingNumber.search("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 1Z879E930346834440 nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute 9611020987654312345672 dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
-        assert_equal 2, s.size
-      end
+
+  context "tracking number search" do
+    should "return two tracking numbers when given string with two" do
+      s = TrackingNumber.search("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 1Z879E930346834440 nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute 9611020987654312345672 dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+      assert_equal 2, s.size
     end
   end
 end

data/test/test_ups_tracking_number.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class UPSTrackingNumberTest < Test::Unit::TestCase
+  context "a UPS tracking number" do
+    ["1Z5R89390357567127", "1Z879E930346834440", "1Z410E7W0392751591", "1Z8V92A70367203024"].each do |valid_number|
+      should "return ups with valid number #{valid_number}" do
+        t =  TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::UPS, t.class
+        assert_equal :ups, t.carrier
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::UPS)
+      end
+    end
+  end
+end

data/test/test_usps_tracking_number.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class USPSTrackingNumberTest < Test::Unit::TestCase
+  context "a USPS tracking number" do
+    ["9101 1234 5678 9000 0000 13"].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
+        assert_equal :usps, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::USPS91)
+      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)
+      end
+
+      should "return usps with valid 20 digit number: #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::USPS20, t.class
+        assert_equal :usps, t.carrier
+        assert t.valid?
+      end
+    end
+
+    ["RB123456785US"].each do |valid_number|
+      should "return usps with valid 13 character number #{valid_number}" do
+        t = TrackingNumber.new(valid_number)
+        assert_equal TrackingNumber::USPS13, t.class
+        assert_equal :usps, t.carrier
+        assert t.valid?
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::USPS13)
+      end
+    end
+  end
+end

data/tracking_number.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracking_number}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Keen"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-02-09}
   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 = [
@@ -24,23 +24,35 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/base.rb",
+    "lib/dhl.rb",
+    "lib/fedex.rb",
     "lib/tracking_number.rb",
+    "lib/ups.rb",
+    "lib/usps.rb",
+    "test/test_dhl_tracking_number.rb",
+    "test/test_fedex_tracking_number.rb",
     "test/test_helper.rb",
     "test/test_tracking_number.rb",
+    "test/test_ups_tracking_number.rb",
+    "test/test_usps_tracking_number.rb",
     "tracking_number.gemspec"
   ]
   s.homepage = %q{http://github.com/jkeen/tracking_number}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Identifies valid tracking numbers}
   s.test_files = [
+    "test/test_dhl_tracking_number.rb",
+    "test/test_fedex_tracking_number.rb",
     "test/test_helper.rb",
-    "test/test_tracking_number.rb"
+    "test/test_tracking_number.rb",
+    "test/test_ups_tracking_number.rb",
+    "test/test_usps_tracking_number.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracking_number
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Keen
@@ -14,65 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -06:00
+date: 2011-02-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  requirement: *id001
   prerelease: false
-  version_requirements: *id001
+  name: shoulda
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  type: :development
+  requirement: *id002
   prerelease: false
-  version_requirements: *id002
+  name: bundler
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  type: :development
+  requirement: *id003
   prerelease: false
-  version_requirements: *id003
+  name: jeweler
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: *id004
+  name: rcov
+  type: :development
 description: Match tracking numbers to a service, and search blocks of text and pull out valid tracking numbers.
 email: jeff@keen.me
 executables: []
@@ -90,9 +95,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/base.rb
+- lib/dhl.rb
+- lib/fedex.rb
 - lib/tracking_number.rb
+- lib/ups.rb
+- lib/usps.rb
+- test/test_dhl_tracking_number.rb
+- test/test_fedex_tracking_number.rb
 - test/test_helper.rb
 - test/test_tracking_number.rb
+- test/test_ups_tracking_number.rb
+- test/test_usps_tracking_number.rb
 - tracking_number.gemspec
 has_rdoc: true
 homepage: http://github.com/jkeen/tracking_number
@@ -108,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1308548554367875831
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -117,16 +131,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Identifies valid tracking numbers
 test_files: 
+- test/test_dhl_tracking_number.rb
+- test/test_fedex_tracking_number.rb
 - test/test_helper.rb
 - test/test_tracking_number.rb
+- test/test_ups_tracking_number.rb
+- test/test_usps_tracking_number.rb