tracking_number 0.4.0 → 0.5.0

data/.gitignore

@@ -0,0 +1,42 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/Gemfile

@@ -1,13 +1,3 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+# Specify your gem's dependencies in tracking_number.gemspec
+gemspec

data/Gemfile.lock

@@ -1,12 +1,11 @@
+PATH
+  remote: .
+  specs:
+    tracking_number (0.4.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
 
@@ -14,7 +13,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
   rcov
   shoulda
+  tracking_number!

data/Rakefile

@@ -1,42 +1,31 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+Bundler::GemHelper.install_tasks
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "tracking_number"
-  gem.homepage = "http://github.com/jkeen/tracking_number"
-  gem.license = "MIT"
-  gem.summary = %Q{Identifies valid tracking numbers}
-  gem.description = %Q{Match tracking numbers to a service, and search blocks of text and pull out valid tracking numbers.}
-  gem.email = "jeff@keen.me"
-  gem.authors = ["Jeff Keen"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
+# if not defined?(Bundler)
+#   require 'bundler'
+#   begin
+#     Bundler.setup(:default, :development)
+#   rescue Bundler::BundlerError => e
+#     $stderr.puts e.message
+#     $stderr.puts "Run `bundle install` to install missing gems"
+#     exit e.status_code
+#   end
+# end
+
+require 'rake'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
   test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -44,10 +33,11 @@ task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+  require 'tracking_number'
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "tracking_number #{version}"
+  rdoc.title = "tracking_number #{TrackingNumber::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/tracking_number.rb

@@ -3,14 +3,14 @@
 # Information on validating tracking numbers found here:
 # http://answers.google.com/answers/threadview/id/207899.html
 
-require 'base'
-require 'usps'
-require 'fedex'
-require 'ups'
-require 'dhl'
-require 'ontrac'
+require 'tracking_number/base'
+require 'tracking_number/usps'
+require 'tracking_number/fedex'
+require 'tracking_number/ups'
+require 'tracking_number/dhl'
+require 'tracking_number/ontrac'
 
-class TrackingNumber
+module TrackingNumber
   TYPES = [UPS, FedExExpress, FedExGround, FedExGround18, FedExGround96, USPS91, USPS20, USPS13, DHL, OnTrac]
 
   def self.search(body)
@@ -18,14 +18,12 @@ class TrackingNumber
   end
 
   def self.detect(tracking_number)
-    detected = TYPES.collect do |test|
-      t = test.new(tracking_number)
-      t if t.valid?
+    tn = nil
+    for test_klass in (TYPES+[Unknown])
+      tn = test_klass.new(tracking_number)
+      break if tn.valid?
     end
-    found = detected.compact.first
-
-    return found if found
-    return Unknown.new(tracking_number)
+    return tn
   end
 
   def self.new(tracking_number)

data/lib/{base.rb → tracking_number/base.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class Base
     attr_accessor :tracking_number
     def initialize(tracking_number)
@@ -6,7 +6,7 @@ class TrackingNumber
       @tracking_number = tracking_number.strip.gsub(" ", "").upcase
     end
 
-    def self.search(body)      
+    def self.search(body)
       valids = self.scan(body).uniq.collect { |possible| new(possible) }.select { |t| t.valid? }
 
       uniques = {}
@@ -51,6 +51,11 @@ class TrackingNumber
     def to_s
       self.tracking_number
     end
+
+    def inspect
+      "#<%s:%#0x %s>" % [self.class.to_s, self.object_id, tracking_number]
+    end
+
   end
 
   class Unknown < Base

data/lib/{dhl.rb → tracking_number/dhl.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class DHL < Base
     SEARCH_PATTERN = /(\b([0-9]\s*){11,11}\b)/
     VERIFY_PATTERN = /^([0-9]{10,10})([0-9])$/

data/lib/{fedex.rb → tracking_number/fedex.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class FedEx < Base
     def carrier
       :fedex

data/lib/{ontrac.rb → tracking_number/ontrac.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class OnTrac < Base
     SEARCH_PATTERN = /(\b(C\s*)([0-9]\s*){14,14}\b)/
     VERIFY_PATTERN = /^(C[0-9]{13,13})([0-9])$/

data/lib/{ups.rb → tracking_number/ups.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class UPS < Base
     SEARCH_PATTERN = /(\b1\s*Z\s*(\w\s*){16,16}\b)/
     VERIFY_PATTERN = /^1Z(\w{15,15})(\w)$/

data/lib/{usps.rb → tracking_number/usps.rb}

@@ -1,4 +1,4 @@
-class TrackingNumber
+module TrackingNumber
   class USPS < Base
     def carrier
       :usps
@@ -6,13 +6,13 @@ class TrackingNumber
   end
   
   class USPS91 < USPS
-    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])$/
+    SEARCH_PATTERN = [/(\b9\s*[14]\s*(([0-9]\s*){20,20}\b))/, /(\b([0-9]\s*){20,20}\b)/]
+    VERIFY_PATTERN = /^(9[14][0-9]{19,19})([0-9])$/
   
-    # Sometimes these numbers will appear without the leading 91, though, so we need to account for that case
+    # Sometimes these numbers will appear without the leading 91 or 94, though, so we need to account for that case
     
     def decode 
-      # Application ID: 91
+      # Application ID: 91 or 94
       # Service Code: 2 Digits
       # Mailer Id: 8 Digits
       # Package Id: 9 Digits
@@ -27,7 +27,7 @@ class TrackingNumber
     end
     
     def matches
-      if self.tracking_number =~ /^91/
+      if self.tracking_number =~ /^9[14]/
         self.tracking_number.scan(VERIFY_PATTERN).flatten
       else
         "91#{self.tracking_number}".scan(VERIFY_PATTERN).flatten
@@ -35,7 +35,7 @@ class TrackingNumber
     end
     
     def valid_checksum?
-      if self.tracking_number =~ /^91/ 
+      if self.tracking_number =~ /^9[14]/ 
         return true if weighted_usps_checksum_valid?(tracking_number) 
       else
         if weighted_usps_checksum_valid?("91#{self.tracking_number}")

data/lib/tracking_number/version.rb

@@ -0,0 +1,3 @@
+module TrackingNumber
+  VERSION = "0.5.0"
+end

data/test/test_helper.rb

@@ -1,12 +1,14 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+# if not defined?(Bundler)
+#   require 'bundler'
+#   begin
+#     Bundler.setup(:default, :development)
+#   rescue Bundler::BundlerError => e
+#     $stderr.puts e.message
+#     $stderr.puts "Run `bundle install` to install missing gems"
+#     exit e.status_code
+#   end
+# end
 require 'test/unit'
 require 'shoulda'
 

data/test/{test_usps_tracking_number.rb → usps_tracking_number_test.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", "7196 9010 7560 0307 7385"].each do |valid_number|
+    ["9101 1234 5678 9000 0000 13", "7196 9010 7560 0307 7385", "9400 1112 0108 0805 4830 16"].each do |valid_number|
       should "return usps with valid 22 digit number: #{valid_number}" do
         should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
       end

data/tracking_number.gemspec

@@ -1,11 +1,11 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "tracking_number/version"
 
 Gem::Specification.new do |s|
   s.name = %q{tracking_number}
-  s.version = "0.4.0"
+  s.version = TrackingNumber::VERSION
+  s.platform = Gem::Platform::RUBY
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Keen"]
@@ -16,63 +16,33 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/base.rb",
-    "lib/dhl.rb",
-    "lib/fedex.rb",
-    "lib/ontrac.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_ontrac_tracking_number.rb",
-    "test/test_tracking_number.rb",
-    "test/test_ups_tracking_number.rb",
-    "test/test_usps_tracking_number.rb",
-    "tracking_number.gemspec"
-  ]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
   s.homepage = %q{http://github.com/jkeen/tracking_number}
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
   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_ontrac_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
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      # s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      # s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      # s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      # s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    # s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    # s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

metadata

@@ -1,152 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tracking_number
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Jeff Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2011-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70300998016440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70300998016440
+- !ruby/object:Gem::Dependency
   name: rcov
-  prerelease: false
+  requirement: &70300998015740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-description: Match tracking numbers to a service, and search blocks of text and pull out valid tracking numbers.
+  prerelease: false
+  version_requirements: *70300998015740
+description: Match tracking numbers to a service, and search blocks of text and pull
+  out valid tracking numbers.
 email: jeff@keen.me
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/base.rb
-- lib/dhl.rb
-- lib/fedex.rb
-- lib/ontrac.rb
 - lib/tracking_number.rb
-- lib/ups.rb
-- lib/usps.rb
-- test/test_dhl_tracking_number.rb
-- test/test_fedex_tracking_number.rb
+- lib/tracking_number/base.rb
+- lib/tracking_number/dhl.rb
+- lib/tracking_number/fedex.rb
+- lib/tracking_number/ontrac.rb
+- lib/tracking_number/ups.rb
+- lib/tracking_number/usps.rb
+- lib/tracking_number/version.rb
+- test/dhl_tracking_number_test.rb
+- test/fedex_tracking_number_test.rb
+- test/ontrac_tracking_number_test.rb
 - test/test_helper.rb
-- test/test_ontrac_tracking_number.rb
-- test/test_tracking_number.rb
-- test/test_ups_tracking_number.rb
-- test/test_usps_tracking_number.rb
+- test/tracking_number_test.rb
+- test/ups_tracking_number_test.rb
+- test/usps_tracking_number_test.rb
 - tracking_number.gemspec
 homepage: http://github.com/jkeen/tracking_number
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 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_files:
+- test/dhl_tracking_number_test.rb
+- test/fedex_tracking_number_test.rb
+- test/ontrac_tracking_number_test.rb
 - test/test_helper.rb
-- test/test_ontrac_tracking_number.rb
-- test/test_tracking_number.rb
-- test/test_ups_tracking_number.rb
-- test/test_usps_tracking_number.rb
+- test/tracking_number_test.rb
+- test/ups_tracking_number_test.rb
+- test/usps_tracking_number_test.rb