tracking_number 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd4cc3dc63f4c3c777b6fa47524189ac10d07b2b1257bbabb0642af66e2fd9c
-  data.tar.gz: 915ef1d78e0f7040b129d4fb5b3d830c4cf98a1e67901fe25ff9833821c6ef79
+  metadata.gz: 223298ed208018a34846ad4ecad1c92cca231fd9fba0e323097ef9b5b6fd16c5
+  data.tar.gz: ffbc69fe1a53b1c88b8d3c4602fe50d2e9ecb8116e391a196658fa53fafa91c0
 SHA512:
-  metadata.gz: 2f49e3e02b3e22e8464c0b9b0f9c94c742a13518f6f4966bf0122bb5cb6283cbf59ddca06b2489456c61674864c43ffd6f9dd2df5da5ce7d44640ffa72acbe15
-  data.tar.gz: 39d0d30954d429e86398d4558bfb001591356f5d6b47eb0295c2985f828482dff3dc64aedbc74dbb3f71bc39e6971a5303b3bd1e9c2a2b5be548ecb41ca6eb40
+  metadata.gz: 4b47d582e0c50e0d4be14bf7c462b1f90b8b8d9a6406f209c05344b9e4b73c958cc75577d3054f56549e953d4ac75e4a886d4f6257315c6ad80802edfa90bbdb
+  data.tar.gz: b404e9f543ef4cb52471dd1ee1f0bdad9f77c62c56f70fcd1e17dfb89e3a5d529c64109510bc40ccb12d66f07fd84b3a75dff06cb27e83b659d35223a0e8fae9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 tracking_number changelog
 
+# [1.5.0](https://github.com/jkeen/tracking_number/compare/v1.4.1...v1.5.0) (2023-08-14)
+
+
+### Features
+
+* include partnership indicator in inspect ([834a8c4](https://github.com/jkeen/tracking_number/commit/834a8c461ef7c58bff9e1e3ea43e65f6d11c3897))
+* update to tracking_number_data 1.6.0 ([6c6293e](https://github.com/jkeen/tracking_number/commit/6c6293edc31de905163d0cee2a76e5b0e27c5f62))
+
 ## [1.4.1](https://github.com/jkeen/tracking_number/compare/v1.4.0...v1.4.1) (2023-05-19)
 
 # [1.4.0](https://github.com/jkeen/tracking_number/compare/v1.3.5...v1.4.0) (2023-05-15)

data/lib/data/couriers/fedex.json

@@ -99,7 +99,7 @@
         ")?",
         "(?<SerialNumber>",
         "(?<SCNC>([0-9]\\s*){2})",
-        "(?<ServiceType>([0-9]\\s*){2})",
+        "(?<ServiceType>2\\s*9\\s*)",
         "(?<ShipperId>([0-9]\\s*){8})",
         "(?<PackageId>([0-9]\\s*){11}|([0-9]\\s*){7})",
         ")",
@@ -146,9 +146,11 @@
         ],
         "invalid": [
           "9261292700768711948020",
-          "420 11213 6129098349792366623 8",
-          "420 92 6129098349792366623 8",
-          "11213 92 6129098349792366623 8"
+          "92001903060085300042901077",
+          "420 11213 61290983497923666231",
+          "92 6129098349792366623 5",
+          "9400 1112 0108 0805 4830 16",
+          "9361 2898 7870 0317 6337 95"
         ]
       }
     },

data/lib/data/couriers/ontrac.json

@@ -19,7 +19,7 @@
           }
         }
       },
-      "tracking_url": "http://www.ontrac.com/trackingres.asp?tracking_number=%s",
+      "tracking_url": "http://www.ontrac.com/tracking/?number=%s",
       "test_numbers": {
         "valid": [
           "C11031500001879",
@@ -52,7 +52,7 @@
           }
         }
       },
-      "tracking_url": "http://www.ontrac.com/trackingres.asp?tracking_number=%s",
+      "tracking_url": "http://www.ontrac.com/tracking/?number=%s",
       "test_numbers": {
         "valid": [
           "D10011354453707",

data/lib/data/couriers/usps.json

@@ -143,6 +143,7 @@
           "9505 5110 6960 5048 6006 24",
           "9101 1234 5678 9000 0000 13",
           "92748931507708513018050063",
+          "92001903060085300042901077",
           "9400 1112 0108 0805 4830 16",
           "9361 2898 7870 0317 6337 95",
           "9405803699300124287899"

data/lib/tracking_number/base.rb

@@ -97,12 +97,31 @@ module TrackingNumber
       TrackingNumber::ChecksumValidations.send(method_name, serial_number, check_digit, checksum_info)
     end
 
+    def checksum?
+      !!self.class.const_get(:VALIDATION)[:checksum]
+    end
+
+    LENGTH_WEIGHT = 0.1
+    CHECKSUM_WEIGHT = 5.0
+
+    def confidence
+      (checksum? ? CHECKSUM_WEIGHT : 0) + tracking_number.length * LENGTH_WEIGHT
+    end
+
     def to_s
       tracking_number
     end
 
     def inspect
-      format('#<%s:%#0x %s>', self.class.to_s, object_id, tracking_number)
+      format('#<%s:%#0x %s%s>', self.class.to_s, object_id, tracking_number, partnership_inspect)
+    end
+
+    def partnership_inspect
+      if shipper? ^ carrier?
+        ' (partnership)'
+      else
+        ''
+      end
     end
 
     def info
@@ -169,6 +188,7 @@ module TrackingNumber
       return unless (partner_tn = find_matching_partner)
 
       possible_twin = partner_tn.send(:find_matching_partner)
+
       if possible_twin.instance_of?(self.class) && possible_twin.tracking_number == tracking_number
         partner_hash[partner_data[:partner_type].to_sym] = partner_tn
         partner_hash[partner_tn.partner_data[:partner_type].to_sym] = self

data/lib/tracking_number/unknown.rb

@@ -22,6 +22,18 @@ module TrackingNumber
       false
     end
 
+    def shipper?
+      false
+    end
+
+    def carrier?
+      false
+    end
+
+    def partnership?
+      false
+    end
+
     def decode
       {}
     end

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/lib/tracking_number.rb

@@ -39,16 +39,13 @@ module TrackingNumber
   end
 
   def self.detect(tracking_number, match: :carrier)
-    tn = nil
-    (TYPES + [Unknown]).each do |test_klass|
-      tn = test_klass.new(tracking_number)
-      if tn.valid? && (!match || match == :all)
-        break
-      elsif tn.valid? && tn.send("#{match}?")
-        break
-      end
+    all_matches = search(tracking_number, match: match)
+
+    if all_matches.empty?
+      Unknown.new(tracking_number)
+    else
+      all_matches.max_by(&:confidence)
     end
-    tn
   end
 
   def self.detect_all(tracking_number)

data/test/test_helper.rb

@@ -51,9 +51,9 @@ class Minitest::Test
   end
 
   def should_fail_on_check_digit_changes(valid_number)
-    digits = valid_number.gsub(/\s/, "").chars.to_a
+    digits = valid_number.gsub(/\s/, "").chars.compact.to_a
     last = digits.pop.to_i
-    digits << (last  < 2 ? last + 3 : last - 3).to_s
+    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"

data/test/tracking_number_test.rb

@@ -200,7 +200,7 @@ class TrackingNumberTest < Minitest::Test
 
   context "searching numbers that have partners" do
     partnership_number = "420 11213 92 6129098349792366623 8"
-    single_number = "0307 1790 0005 2348 3741"
+    single_number = "92001903060085300042901077"
   
     search_string = ["number that matches two services", partnership_number, " number that matches only one: ", single_number, "let's see if that does it"].join(' ')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeff Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport