tracking_number 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/base.rb

@@ -3,7 +3,7 @@ class TrackingNumber
     attr_accessor :tracking_number
     def initialize(tracking_number)
       @original_number = tracking_number
-      @tracking_number = tracking_number.gsub(" ", "").upcase
+      @tracking_number = tracking_number.strip.gsub(" ", "").upcase
     end
 
     def self.search(body)      

data/lib/ups.rb

@@ -42,49 +42,49 @@ class TrackingNumber
 
     def service_type
       case decode[:service_type]
-      when "01":
+      when "01"
        "UPS United States Next Day Air (Red)"
-      when "02":
+      when "02"
        "UPS United States Second Day Air (Blue)"
-      when "03":
+      when "03"
        "UPS United States Ground"
-      when "12":
+      when "12"
        "UPS United States Third Day Select"
-      when "13":
+      when "13"
        "UPS United States Next Day Air Saver (Red Saver)"
-      when "15":
+      when "15"
        "UPS United States Next Day Air Early A.M."
-      when "22":
+      when "22"
        "UPS United States Ground - Returns Plus - Three Pickup Attempts"
-      when "32":
+      when "32"
        "UPS United States Next Day Air Early A.M. - COD"
-      when "33":
+      when "33"
        "UPS United States Next Day Air Early A.M. - Saturday Delivery, COD"
-      when "41":
+      when "41"
        "UPS United States Next Day Air Early A.M. - Saturday Delivery"
-      when "42":
+      when "42"
        "UPS United States Ground - Signature Required"
-      when "44":
+      when "44"
        "UPS United States Next Day Air - Saturday Delivery"
-      when "66":
+      when "66"
        "UPS United States Worldwide Express"
-      when "72":
+      when "72"
        "UPS United States Ground - Collect on Delivery"
-      when "78":
+      when "78"
        "UPS United States Ground - Returns Plus - One Pickup Attempt"
-      when "90":
+      when "90"
        "UPS United States Ground - Returns - UPS Prints and Mails Label"
-      when "A0":
+      when "A0"
        "UPS United States Next Day Air Early A.M. - Adult Signature Required"
-      when "A1":
+      when "A1"
        "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required"
-      when "A2":
+      when "A2"
        "UPS United States Next Day Air - Adult Signature Required"
-      when "A8":
+      when "A8"
        "UPS United States Ground - Adult Signature Required"
-      when "A9":
+      when "A9"
        "UPS United States Next Day Air Early A.M. - Adult Signature Required, COD"
-      when "AA":
+      when "AA"
        "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required, COD"
      end
     end

data/lib/usps.rb

@@ -124,7 +124,7 @@ class TrackingNumber
     end
 
     def valid_checksum?
-      sequence = tracking_number.scan(/[0-9]+/).flatten.to_s
+      sequence = tracking_number.scan(/[0-9]+/).flatten.join
       chars = sequence.chars.to_a
       check_digit = chars.pop.to_i
       

data/test/test_dhl_tracking_number.rb

@@ -4,9 +4,7 @@ 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?
+        should_be_valid_number(valid_number, TrackingNumber::DHL, :dhl)
       end
 
       should "detect #{valid_number} regardless of spacing" do

data/test/test_fedex_tracking_number.rb

@@ -4,10 +4,7 @@ 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?
+        should_be_valid_number(valid_number, TrackingNumber::FedExExpress, :fedex)
       end
 
       should "detect #{valid_number} regardless of spacing" do
@@ -17,10 +14,7 @@ class FedExTrackingNumberTest < Test::Unit::TestCase
 
     ["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?
+        should_be_valid_number(valid_number, TrackingNumber::FedExGround96, :fedex)
       end
 
       should "detect #{valid_number} regardless of spacing" do
@@ -30,10 +24,7 @@ class FedExTrackingNumberTest < Test::Unit::TestCase
     
     ["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?
+        should_be_valid_number(valid_number, TrackingNumber::FedExGround, :fedex)
       end
 
       should "detect #{valid_number} regardless of spacing" do
@@ -43,10 +34,7 @@ class FedExTrackingNumberTest < Test::Unit::TestCase
 
     ["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?
+        should_be_valid_number(valid_number, TrackingNumber::FedExGround18, :fedex)
       end
 
       should "detect #{valid_number} regardless of spacing" do

data/test/test_helper.rb

@@ -41,4 +41,11 @@ class Test::Unit::TestCase
       assert_equal 1, results.size, "could not find #{type} #{valid_number} in #{string}"
     end
   end
+
+  def should_be_valid_number(valid_number, type, carrier)
+    t = TrackingNumber.new(valid_number)
+    assert_equal type, t.class
+    assert_equal carrier, t.carrier
+    assert t.valid?
+  end
 end

data/test/test_tracking_number.rb

@@ -13,6 +13,11 @@ class TrackingNumberTest < Test::Unit::TestCase
       t = TrackingNumber.new("abc 123 def")
       assert_equal "ABC123DEF", t.tracking_number
     end
+
+    should "remove leading and trailing whitespace from tracking number" do
+      t = TrackingNumber.new("  ABC123 \n")
+      assert_equal "ABC123", t.tracking_number
+    end
   end
 
   context "tracking number search" do
@@ -20,5 +25,11 @@ class TrackingNumberTest < Test::Unit::TestCase
       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
+
+    should "return tracking numbers without trailing whitespace" do
+      s = TrackingNumber.search("hello 1Z879E930346834440\nbye")
+      assert_equal 1, s.size
+      assert_equal "1Z879E930346834440", s.first.tracking_number
+    end
   end
 end

data/test/test_ups_tracking_number.rb

@@ -4,9 +4,7 @@ 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
+        should_be_valid_number(valid_number, TrackingNumber::UPS, :ups)
       end
 
       should "detect #{valid_number} regardless of spacing" do

data/test/test_usps_tracking_number.rb

@@ -4,10 +4,7 @@ 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|
       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?
+        should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
       end
 
       should "detect #{valid_number} regardless of spacing" do
@@ -16,24 +13,18 @@ class USPSTrackingNumberTest < Test::Unit::TestCase
     end
     
     ["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)
+      should "return usps with valid 20 digit number: #{valid_number}" do
+        should_be_valid_number(valid_number, TrackingNumber::USPS20, :usps)
       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?
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::USPS20)
       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?
+        should_be_valid_number(valid_number, TrackingNumber::USPS13, :usps)
       end
 
       should "detect #{valid_number} regardless of spacing" do

data/tracking_number.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracking_number}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Keen"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-04-23}
   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 = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jkeen/tracking_number}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Identifies valid tracking numbers}
   s.test_files = [
     "test/test_dhl_tracking_number.rb",

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tracking_number
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jeff Keen
@@ -15,69 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -06:00
+date: 2011-04-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: shoulda
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
-  name: shoulda
   type: :development
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id002
-  prerelease: false
-  name: bundler
   type: :development
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  requirement: *id003
-  prerelease: false
-  name: jeweler
   type: :development
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rcov
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
-  name: rcov
   type: :development
+  prerelease: false
+  version_requirements: *id004
 description: Match tracking numbers to a service, and search blocks of text and pull out valid tracking numbers.
 email: jeff@keen.me
 executables: []
@@ -122,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 885733641048498209
       segments: 
       - 0
       version: "0"
@@ -131,14 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Identifies valid tracking numbers