tracking_number 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32138a72e48748c16e66ead5dcb132b5bd471979
-  data.tar.gz: 33409e73231475efc644fd2902bc07a7b1e1f82a
+  metadata.gz: 36b4c229dbfddaac959991ac1cfb463a551eeb17
+  data.tar.gz: 267399613e49a562ff130331812f667a5f9344ed
 SHA512:
-  metadata.gz: 1cf3034119c7363aeafabfcaf852ca0d39e0ca46e9b80b9dcd6a5833c6fa77c15d39c6947fae12a5b9ea04ed83d6fde05b8199c43d920c617ad5a358a07cdfc2
-  data.tar.gz: 67c55b58307628400732f18a5274ad81f5d6a2e42b21a2b5228d47ce933d10c7b2c2c02684c84e213e2de5347bc6b67218d685cf5ab843ce0ed32e5a5a01903d
+  metadata.gz: b1268047c9ba4b8ad7092a18351a35d04b073cd83f06e9892afb3e21dbbe8b47e74a067f90612750a2b141b49e8a3f4b4ce5a4b136597a85e96e2e4dacd3c25e
+  data.tar.gz: c47873fc7eaf0f37c5a1c4dfb85c7887fbdc40a2b0a6b9c56fee8a402fb35b1fea37f51e7a1a920cf0b55fed284030039e2cd0d63457f00506ad172e51c4fd0c

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.9.0

data/lib/tracking_number.rb

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

data/lib/tracking_number/fedex.rb

@@ -24,6 +24,33 @@ module TrackingNumber
     end
   end
 
+  class FedExSmartPost < FedEx
+    SEARCH_PATTERN = /(\b([0-9]\s*){20}\b)/
+    VERIFY_PATTERN = /^([0-9]{5}[0-9]{14})([0-9])$/
+    LENGTH = 20
+
+    def matches
+      self.tracking_number.scan(VERIFY_PATTERN).flatten
+    end
+
+    def valid_checksum?
+      # http://stackoverflow.com/questions/15744704/how-to-calculate-a-fedex-smartpost-tracking-number-check-digit
+
+      sequence = "92#{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
+
   #TODO Fix these FedEx ground numberss
 
   class FedExGround96 < FedEx
@@ -127,5 +154,4 @@ module TrackingNumber
       return true if check == check_digit.to_i
     end
   end
-
-end
+end

data/lib/tracking_number/usps.rb

@@ -6,28 +6,30 @@ module TrackingNumber
   end
 
   class USPS91 < USPS
-    SEARCH_PATTERN = [/(\b9\s*[1345]\s*(([0-9]\s*){20,20}\b))/, /(\b([0-9]\s*){20,20}\b)/]
-    VERIFY_PATTERN = /^(9[1345][0-9]{19,19})([0-9])$/
+    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])$/
 
-    # Sometimes these numbers will appear without the leading 91 or 94, though, so we need to account for that case
+    # Sometimes these numbers will appear without the leading 91, 93, or 94, though, so we need to account for that case
 
     def decode
-      # Application ID: 91 or 93 or 94 or 95
+      # Application ID: 91, 93, 94 or 95
       # 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)
+      base_tracking_number = self.tracking_number.to_s.gsub(/^420\d{5}/, '')
+
+      {:application_id => base_tracking_number.to_s.slice(0...2),
+       :service_code =>  base_tracking_number.to_s.slice(2...4),
+       :mailer_id => base_tracking_number.to_s.slice(4...12),
+       :package_identifier =>  base_tracking_number.to_s.slice(12...21),
+       :check_digit => base_tracking_number.slice(21...22)
       }
     end
 
     def matches
-      if self.tracking_number =~ /^9[1345]/
+      if self.tracking_number =~ /^(420\d{5})?9[1-5]/
         self.tracking_number.scan(VERIFY_PATTERN).flatten
       else
         "91#{self.tracking_number}".scan(VERIFY_PATTERN).flatten
@@ -35,7 +37,7 @@ module TrackingNumber
     end
 
     def valid_checksum?
-      if self.tracking_number =~ /^9[1345]/
+      if self.tracking_number =~ /^(420\d{5})?9[1-5]/
         return true if weighted_usps_checksum_valid?(tracking_number)
       else
         if weighted_usps_checksum_valid?("91#{self.tracking_number}")
@@ -49,7 +51,7 @@ module TrackingNumber
     private
 
     def weighted_usps_checksum_valid?(sequence)
-      chars = sequence.chars.to_a
+      chars = sequence.gsub(/^420\d{5}/, '').chars.to_a
       check_digit = chars.pop
 
       total = 0

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/test/fedex_tracking_number_test.rb

@@ -42,5 +42,14 @@ class FedExTrackingNumberTest < Minitest::Test
       end
     end
 
+    ["61299998820821171811"].each do |valid_number|
+      should "return fedex smart post for #{valid_number}" do
+        should_be_valid_number(valid_number, TrackingNumber::FedExSmartPost, :fedex)
+      end
+
+      should "detect #{valid_number} regardless of spacing" do
+        should_detect_number_variants(valid_number, TrackingNumber::FedExSmartPost)
+      end
+    end
   end
 end

data/test/usps_tracking_number_test.rb

@@ -31,5 +31,11 @@ class USPSTrackingNumberTest < Minitest::Test
         should_detect_number_variants(valid_number, TrackingNumber::USPS13)
       end
     end
+
+    ["420221539101026837331000039521"].each do |valid_number|
+      should "return usps with valid 30 digit number: #{valid_number}" do
+        should_be_valid_number(valid_number, TrackingNumber::USPS91, :usps)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeff Keen