tracking_number 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b4c229dbfddaac959991ac1cfb463a551eeb17
-  data.tar.gz: 267399613e49a562ff130331812f667a5f9344ed
+  metadata.gz: da0ea43ce94267431428016947a2f230ecfe304f
+  data.tar.gz: a61003c3bfd1715e5c4e8f8d2306f567fa64ab5f
 SHA512:
-  metadata.gz: b1268047c9ba4b8ad7092a18351a35d04b073cd83f06e9892afb3e21dbbe8b47e74a067f90612750a2b141b49e8a3f4b4ce5a4b136597a85e96e2e4dacd3c25e
-  data.tar.gz: c47873fc7eaf0f37c5a1c4dfb85c7887fbdc40a2b0a6b9c56fee8a402fb35b1fea37f51e7a1a920cf0b55fed284030039e2cd0d63457f00506ad172e51c4fd0c
+  metadata.gz: bd9ee0004797cd37a3b67e45ec4e7860c6cfde62963ab5094cdfc9b62075b387f19b7a96adf178b547122629ad86852edf1668c247cb14e87cdc8550a0753366
+  data.tar.gz: bf0e523a57f17413861f53c79d29b1d6b1a9192887f7210e8bf3d197fca4b0767f64210f5f766050bfacbb8b5d1ec1148b5da4c44643f470c67627db90c3a524

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/tracking_number/fedex.rb

@@ -25,9 +25,8 @@ module TrackingNumber
   end
 
   class FedExSmartPost < FedEx
-    SEARCH_PATTERN = /(\b([0-9]\s*){20}\b)/
-    VERIFY_PATTERN = /^([0-9]{5}[0-9]{14})([0-9])$/
-    LENGTH = 20
+    SEARCH_PATTERN = /(\b(?:9\s*2\s*)?([0-9]\s*){20}\b)/
+    VERIFY_PATTERN = /^((?:92)?[0-9]{5}[0-9]{14})([0-9])$/
 
     def matches
       self.tracking_number.scan(VERIFY_PATTERN).flatten
@@ -36,7 +35,9 @@ module TrackingNumber
     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)
+      @tracking_number = "92#{tracking_number}" unless tracking_number =~ /^92/
+
+      sequence = @tracking_number.chars.map(&:to_i)
       check_digit = sequence.pop
       total = 0
 
@@ -44,6 +45,7 @@ module TrackingNumber
         x *= 3 if i.even?
         total += x
       end
+
       check = total % 10
       check = (10 - check) unless (check.zero?)
 

data/lib/tracking_number/version.rb

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

data/test/fedex_tracking_number_test.rb

@@ -42,7 +42,7 @@ class FedExTrackingNumberTest < Minitest::Test
       end
     end
 
-    ["61299998820821171811"].each do |valid_number|
+    ['61299998820821171811', '9261292700768711948021'].each do |valid_number|
       should "return fedex smart post for #{valid_number}" do
         should_be_valid_number(valid_number, TrackingNumber::FedExSmartPost, :fedex)
       end

metadata

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