tracking_number 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da0ea43ce94267431428016947a2f230ecfe304f
-  data.tar.gz: a61003c3bfd1715e5c4e8f8d2306f567fa64ab5f
+  metadata.gz: 2ef9cb0a1bdc88afc57d1e6fbdb5892a6e345cd8
+  data.tar.gz: 16b958a9b9a47c805a4d4d22a840e214b62edde7
 SHA512:
-  metadata.gz: bd9ee0004797cd37a3b67e45ec4e7860c6cfde62963ab5094cdfc9b62075b387f19b7a96adf178b547122629ad86852edf1668c247cb14e87cdc8550a0753366
-  data.tar.gz: bf0e523a57f17413861f53c79d29b1d6b1a9192887f7210e8bf3d197fca4b0767f64210f5f766050bfacbb8b5d1ec1148b5da4c44643f470c67627db90c3a524
+  metadata.gz: 298346d3cd6268e5457eb8e10d8c3f423ce093e84b79bb73ec37557cefa78f592f3013a4e086558c99049a4a68d1dcfd234fa4d2cd9738ff4240d61bd90d6c19
+  data.tar.gz: 9a0d7e4430133b692859d8b077536fee7866252ff5c458f778cdadd1bfb34512bb9309e6f8a28471b7a795918c8a3579b424e757df353fde167c567ad9b0ad1d

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.1"
+  - "jruby"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tracking_number (0.9.1)
+    tracking_number (0.10.0)
 
 GEM
   remote: http://rubygems.org/

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.10.0

data/lib/tracking_number.rb

@@ -15,7 +15,7 @@ if defined?(ActiveModel::EachValidator)
 end
 
 module TrackingNumber
-  TYPES = [UPS, FedExExpress, FedExSmartPost, FedExGround, FedExGround18, FedExGround96, USPS91, USPS20, USPS13, DHL, OnTrac]
+  TYPES = [UPS, FedExExpress, FedExSmartPost, FedExGround, FedExGround18, FedExGround96, USPS91, USPS20, USPS13, DHLExpress, DHLExpressAir, OnTrac]
 
   def self.search(body)
     TYPES.collect { |type| type.search(body) }.flatten

data/lib/tracking_number/base.rb

@@ -57,7 +57,6 @@ module TrackingNumber
     def inspect
       "#<%s:%#0x %s>" % [self.class.to_s, self.object_id, tracking_number]
     end
-
   end
 
   class Unknown < Base
@@ -65,4 +64,4 @@ module TrackingNumber
       :unknown
     end
   end
-end
+end

data/lib/tracking_number/dhl.rb

@@ -1,19 +1,34 @@
 module 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
+
+  #DHL Air (a division of DHL Express) have 11 digit numbers
+  class DHLExpressAir < DHL
+    SEARCH_PATTERN = /(\b([0-9]\s*){11,11}\b)/
+    VERIFY_PATTERN = /^([0-9]{10,10})([0-9])$/
+
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+  end
+
+  #DHL Express numbers are 10 digits long
+  # http://www.dhl.co.uk/content/dam/downloads/uk/Express/PDFs/developer_centre/dhlis9_shipment_and_piece_ranges_v1.3.pdf
+  class DHLExpress < DHL
+    SEARCH_PATTERN = /(\b([0-9]\s*){10,10}\b)/
+    VERIFY_PATTERN = /^([0-9]{9,9})([0-9])$/
+
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+  end
+end

data/lib/tracking_number/fedex.rb

@@ -36,11 +36,10 @@ module TrackingNumber
       # http://stackoverflow.com/questions/15744704/how-to-calculate-a-fedex-smartpost-tracking-number-check-digit
 
       @tracking_number = "92#{tracking_number}" unless tracking_number =~ /^92/
-
       sequence = @tracking_number.chars.map(&:to_i)
       check_digit = sequence.pop
-      total = 0
 
+      total = 0
       sequence.reverse.each_with_index do |x, i|
         x *= 3 if i.even?
         total += x

data/lib/tracking_number/usps.rb

@@ -6,8 +6,8 @@ module TrackingNumber
   end
 
   class USPS91 < USPS
-    SEARCH_PATTERN = [/(\b(?:420\s*\d{5})?9\s*[1-5]\s*(?:(?:[0-9]\s*){20}\b))/, /(\b([0-9]\s*){20}\b)/]
-    VERIFY_PATTERN = /^(?:420\d{5})?(9[1-5][0-9]{19})([0-9])$/
+    SEARCH_PATTERN = [/(\b(?:420\s*\d{5})?9\s*[1-5]\s*(?:(?:(?:[0-9]\s*){20}\b)|(?:(?:[0-9]\s*){24}\b)))/, /(\b([0-9]\s*){20}\b)/]
+    VERIFY_PATTERN = /^(?:420\d{5})?(9[1-5](?:[0-9]{19}|[0-9]{23}))([0-9])$/
 
     # Sometimes these numbers will appear without the leading 91, 93, or 94, though, so we need to account for that case
 

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/test/dhl_tracking_number_test.rb

@@ -1,14 +1,34 @@
 require 'test_helper'
 
 class DHLTrackingNumberTest < Minitest::Test
-  context "a DHL tracking number" do
+  context "DHLExpressAir tracking number" do
     ["73891051146"].each do |valid_number|
       should "return dhl for #{valid_number}" do
-        should_be_valid_number(valid_number, TrackingNumber::DHL, :dhl)
+        should_be_valid_number(valid_number, TrackingNumber::DHLExpressAir, :dhl)
+      end
+
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::DHLExpressAir)
+      end
+    end
+  end
+
+  context "DHLExpress tracking numbers" do
+    ["3318810025", "8487135506", "3318810036", "3318810014"].each do |valid_number|
+      should "return dhl for #{valid_number}" do
+        should_be_valid_number(valid_number, TrackingNumber::DHLExpress, :dhl)
+      end
+
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
       end
 
       should "detect #{valid_number} regardless of spacing" do
-        should_detect_number_variants(valid_number, TrackingNumber::DHL)
+        should_detect_number_variants(valid_number, TrackingNumber::DHLExpress)
       end
     end
   end

data/test/fedex_tracking_number_test.rb

@@ -7,6 +7,10 @@ class FedExTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::FedExExpress, :fedex)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::FedExExpress)
       end
@@ -17,6 +21,10 @@ class FedExTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::FedExGround96, :fedex)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::FedExGround96)
       end
@@ -27,6 +35,10 @@ class FedExTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::FedExGround, :fedex)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::FedExGround)
       end
@@ -37,6 +49,10 @@ class FedExTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::FedExGround18, :fedex)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::FedExGround18)
       end
@@ -47,6 +63,10 @@ class FedExTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::FedExSmartPost, :fedex)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::FedExSmartPost)
       end

data/test/ontrac_tracking_number_test.rb

@@ -7,6 +7,10 @@ class OnTracTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::OnTrac, :ontrac)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::OnTrac)
       end

data/test/test_helper.rb

@@ -43,4 +43,13 @@ class Minitest::Test
     assert_equal carrier, t.carrier
     assert t.valid?
   end
+
+  def should_fail_on_check_digit_changes(valid_number)
+    digits = valid_number.chars
+    last = digits.pop.to_i
+    digits << (last  < 2 ? last + 3 : last - 3).to_s
+    invalid_number = digits.join
+    t = TrackingNumber.new(invalid_number)
+    assert !t.valid?, "#{invalid_number} reported as a valid #{t.class}, and it shouldn't be"
+  end
 end

data/test/ups_tracking_number_test.rb

@@ -7,6 +7,10 @@ class UPSTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::UPS, :ups)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::UPS)
       end

data/test/usps_tracking_number_test.rb

@@ -7,6 +7,10 @@ class USPSTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::USPS91)
       end
@@ -17,6 +21,10 @@ class USPSTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::USPS20, :usps)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::USPS20)
       end
@@ -27,6 +35,10 @@ class USPSTrackingNumberTest < Minitest::Test
         should_be_valid_number(valid_number, TrackingNumber::USPS13, :usps)
       end
 
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+
       should "detect #{valid_number} regardless of spacing" do
         should_detect_number_variants(valid_number, TrackingNumber::USPS13)
       end
@@ -36,6 +48,20 @@ class USPSTrackingNumberTest < Minitest::Test
       should "return usps with valid 30 digit number: #{valid_number}" do
         should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
       end
+
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
+    end
+
+    ["92748931507708513018050063"].each do |valid_number|
+      should "return usps with valid 26 digit number: #{valid_number}" do
+        should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
+      end
+
+      should "fail on check digit changes on #{valid_number}" do
+        should_fail_on_check_digit_changes(valid_number)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Jeff Keen
@@ -91,6 +91,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt