tracking_number 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0ebf70c34149816925fc8f0395d085c7d011a1bbd6af5c0d745159bde4c297f
-  data.tar.gz: 78f1d0571abcf5e4a03d5f20c2084cbe895b1edaa633e27b4d9802e764ea903f
+  metadata.gz: 9afbba036e56d456901b4dcd0c3b0ee1626e104113831edd5ae8f63a3cfdae7c
+  data.tar.gz: 000e731bcda5a5729fda6171f9bcb2c409d09054dd15b191cb7c57e931be7d0d
 SHA512:
-  metadata.gz: 01ae63c7d08485d12125fed9351b169fd9c79a20d5db1889cc0ce1052490f70faf8ca0180892fa0c432d89605b33540435438d75b96d7fb0798b819f7d9855b1
-  data.tar.gz: fd3847611f9069300c5e1f16fb006131863953c0dbf7cc24dfbbd38f3c03d8fb2295f375f5359ad4ec7fce6ff4c96ddb27123975e9d318744d34d1a7740a8662
+  metadata.gz: e098f919430d362155a398423664a414bd81673c4f658916f3155569ade1e0d257bbc91a5df591567d87045c100df4eeeadf900209c0ef0a815170ee0c86b569
+  data.tar.gz: dec2cba1b5a505c3fa25e93c63a90e0081333366260a8162da8efd6b31dfe63d54bbacda3b1ac91ddb808e62fc175703487b98eedc4f4ab31c4d04efb961c8a2

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+
+## [v1.2](https://github.com/jkeen/tracking_number/tree/v1.2) (2022-11-03)
+Update tracking number definitions from [tracking_number_data](https://github.com/jkeen/tracking_number_data). Now includes Lasership, UPS Waybill, Landmark, Canada Post, On Trac (D*)
+
+## [v1.1.2](https://github.com/jkeen/tracking_number/tree/v1.1.1) (2022-11-03)
+Add method to help tracking_number_data test itself better
 ## [v1.1.1](https://github.com/jkeen/tracking_number/tree/v1.1.1) (2022-11-03)
 Fix gem build error
 

data/lib/data/couriers/amazon.json

@@ -7,8 +7,7 @@
       "regex": [
         "\\s*T\\s*B\\s*A\\s*(?<SerialNumber>([0-9]\\s*){12,12})\\s*"
       ],
-      "validation": {
-      },
+      "validation": {},
       "test_numbers": {
         "valid": [
           "TBA000000000000",
@@ -23,6 +22,22 @@
           "TBB000000000000"
         ]
       }
+    },
+    {
+      "name": "Amazon International",
+      "regex": [
+        "\\s*[AFC]\\s*(?<SerialNumber>([0-9]\\s*){10,10})\\s*"
+      ],
+      "validation": {},
+      "test_numbers": {
+        "valid": [
+          "C1004444443",
+          "C1004444444"
+        ],
+        "invalid": [
+          "D1234567890"
+        ]
+      }
     }
   ]
 }

data/lib/data/couriers/canadapost.json

@@ -0,0 +1,30 @@
+{
+  "name": "Canada Post",
+  "courier_code": "canada_post",
+  "tracking_numbers": [
+    {
+      "name": "Canada Post (16)",
+      "regex": "\\s*(?<SerialNumber>(?<OriginId>([0-9]\\s*){7})([0-9]\\s*){8})(?<CheckDigit>[0-9]\\s*)",
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 3,
+          "odds_multiplier": 1
+        }
+      },
+      "tracking_url": "https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=%s",
+      "test_numbers": {
+        "valid": [
+          "0073938000549297",
+          "7035114477138472",
+          "4002847016405018"
+        ],
+        "invalid": [
+          "0073938000549292",
+          "7035114477138471",
+          "5002847016405018"
+        ]
+      }
+    }
+  ]
+}

data/lib/data/couriers/dhl.json

@@ -45,6 +45,22 @@
           "73891051147"
         ]
       }
+    },
+    {
+      "name": "DHL E-Commerce",
+      "regex": "\\s*((G\\s*M\\s*)|(L\\s*X\\s*)|(R\\s*X\\s*)|(U\\s*V\\s*)|(C\\s*N\\s*)|(S\\s*G\\s*)|(T\\s*H\\s*)|(I\\s*N\\s*)|(H\\s*K\\s*)|(M\\s*Y\\s*))\\s*(?<SerialNumber>(\\w\\s*){10,39})",
+      "validation": {},
+      "tracking_url": "http://www.dhl.com/en/express/tracking.html?brand=DHL&AWB=%s",
+      "test_numbers": {
+        "valid": [
+          "GM2951173225174494",
+          "GM295117494011169042"
+        ],
+        "invalid": [
+          "GS295117494011169041",
+          "GR295117494011169045"
+        ]
+      }
     }
   ]
 }

data/lib/data/couriers/fedex.json

@@ -43,7 +43,7 @@
     {
       "name": "FedEx Express (34)",
       "regex": [
-        "\\s*1\\s*0\\s*0\\s*[0-9]\\s*[0-9]\\s*",
+        "\\s*1\\s*0\\s*[0-9]\\s*[0-9]\\s*[0-9]\\s*",
         "([0-9]\\s*){10}",
         "(?<DestinationZip>([0-9]\\s*){5})",
         "(?<SerialNumber>([0-9]\\s*){13})",
@@ -78,7 +78,8 @@
           "1001921380360001000300639585804382",
           "1001901781990001000300617767839437",
           " 1 0 0 1 9 0 1 7 8 1 9 9 0 0 0 1 0 0 0 3 0 0 6 1 7 7 6 7 8 3 9 4 3 7 ",
-          "1002297871540001000300790695517286"
+          "1002297871540001000300790695517286",
+          "1027590111820004833500785458233610"
         ],
         "invalid": [
           "1001901781990001000300617767839438"
@@ -89,7 +90,10 @@
       "name": "FedEx SmartPost",
       "description": "IMpb CO3 standard",
       "regex": [
-        "\\s*(?<ApplicationIdentifier>9\\s*2\\s*)?",
+        "\\s*(?:",
+        "(?:(?<RoutingApplicationId>4\\s*2\\s*0\\s*)(?<DestinationZip>([0-9]\\s*){5}))?",
+        "(?<ApplicationIdentifier>9\\s*2\\s*)",
+        ")?",
         "(?<SerialNumber>",
         "(?<ServiceType>([0-9]\\s*){3})",
         "(?<ShipperId>([0-9]\\s*){9})",
@@ -115,10 +119,16 @@
         "valid": [
           "61299998820821171811",
           " 6 1 2 9 9 9 9 8 8 2 0 8 2 1 1 7 1 8 1 1 ",
-          "9261292700768711948021"
+          "9261292700768711948021",
+          "420 11213 92 6129098349792366623 8",
+          "92 6129098349792366623 8",
+          "6129098349792366623 8"
         ],
         "invalid": [
-          "9261292700768711948020"
+          "9261292700768711948020",
+          "420 11213 6129098349792366623 8",
+          "420 92 6129098349792366623 8",
+          "11213 92 6129098349792366623 8"
         ]
       }
     },

data/lib/data/couriers/landmark.json

@@ -0,0 +1,25 @@
+{
+  "name": "Landmark Global LTN",
+  "courier_code": "landmark",
+  "tracking_numbers": [
+    {
+      "name": "Landmark Global LTN",
+      "regex": [
+        "\\s*L\\s*T\\s*N\\s*(?<SerialNumber>([0-9]\\s*){8})\\s*N\\s*1"
+      ],
+      "tracking_url": "https://track.landmarkglobal.com/?search=%s",
+      "validation": {},
+      "test_numbers": {
+        "valid": [
+          "LTN74207623N1",
+          "LTN74209518N1",
+          "LTN74224021N1"
+        ],
+        "invalid": [
+          "LSN74209518N2",
+          "LSN74209518N1"
+        ]
+      }
+    }
+  ]
+}

data/lib/data/couriers/lasership.json

@@ -0,0 +1,67 @@
+{
+  "name": "LaserShip",
+  "courier_code": "lasership",
+  "tracking_numbers": [
+    {
+      "name": "LaserShip LX",
+      "regex": [
+        "\\s*L\\s*X\\s*1\\s*[3-8]\\s*(?<SerialNumber>([0-9]\\s*){6,6})\\s*"
+      ],
+      "validation": {
+      },
+      "test_numbers": {
+        "valid": [
+          "LX17635036",
+          "LX 176 35035",
+          "LX17635034"
+        ],
+        "invalid": [
+          "LX1763503N",
+          "LC176350N6",
+          "LA17635036",
+          " L A 1 7 6 3 5 0 3 6 "
+        ]
+      }
+    },
+    {
+      "name": "LaserShip 1LS7 (15)",
+      "regex": [
+        "\\s*1\\s*L\\s*S\\s*7\\s*[12]\\s*([0-9]\\s*){4,4}",
+        "(?<SerialNumber>([0-9]\\s*){6,6})\\s*"
+      ],
+      "validation": {
+      },
+      "test_numbers": {
+        "valid": [
+          "1LS717793482164",
+          "1LS724505321754",
+          "1LS720000000000",
+          " 1 L S 7 2 0 0 0 0 0 0 0 0 0 0 "
+        ],
+        "invalid": [
+          "1LX734505321754"
+        ]
+      }
+    },
+    {
+      "name": "LaserShip 1LS7 (18)",
+      "regex": [
+        "\\s*1\\s*L\\s*S\\s*7\\s*",
+        "[12]\\s*([0-9]\\s*){2,2}\\s*0\\s*1\\s*[1234]\\s*",
+        "\\s*(?<SerialNumber>([0-9]\\s*){6,6})",
+        "-\\s*1\\s*"
+      ],
+      "validation": {
+      },
+      "test_numbers": {
+        "valid": [
+          "1LS7119013618127-1",
+          " 1 L S 7 1 1 9 0 1 3 6 1 8 1 2 7 - 1 "
+        ],
+        "invalid": [
+          "1LS7119013618127-2"
+        ]
+      }
+    }
+  ]
+}

data/lib/data/couriers/ontrac.json

@@ -23,13 +23,45 @@
         "valid": [
           "C11031500001879",
           " C 1 1 0 3 1 5 0 0 0 0 1 8 7 9 ",
-          "C10999911320231"
+          "C10999911320231",
+          "C11121552953069",
+          "C11121553156000",
+          "C11121552829468"
         ],
         "invalid": [
           "C10000000000000",
           "C11031500001889"
         ]
       }
+    },
+    {
+      "name": "OnTrac D",
+      "regex": "\\s*D\\s*(?<SerialNumber>([0-9]\\s*){13})(?<CheckDigit>[0-9]\\s*)",
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 1,
+          "odds_multiplier": 2
+        },
+        "serial_number_format": {
+          "prepend_if": {
+            "matches_regex": "^(?!5).+$",
+            "content": "5"
+          }
+        }
+      },
+      "tracking_url": "http://www.ontrac.com/trackingres.asp?tracking_number=%s",
+      "test_numbers": {
+        "valid": [
+          "D10011354453707",
+          "D10011345983010",
+          "D10011342332145"
+        ],
+        "invalid": [
+          "D10011345983012",
+          "D10011342332144"
+        ]
+      }
     }
   ]
 }

data/lib/data/couriers/ups.json

@@ -9,7 +9,7 @@
         "(?<ShipperId>(?:[A-Z0-9]\\s*){6,6})",
         "(?<ServiceType>(?:[A-Z0-9]\\s*){2,2})",
         "(?<PackageId>(?:[A-Z0-9]\\s*){7,7}))",
-        "(?<CheckDigit>[A-Z0-9]\\s*)"
+        "(?<CheckDigit>[0-9]\\s*)"
       ],
       "validation": {
         "checksum": {
@@ -134,6 +134,50 @@
           "1Z1111111111111111"
         ]
       }
+    },
+    {
+      "name": "UPS Waybill",
+      "regex": [
+        "\\s*(?<ServiceType>([A-Z]\\s*){1})",
+        "(?<SerialNumber>(?:[A-Z0-9]\\s*){9,9})",
+        "(?<CheckDigit>[A-Z0-9]\\s*)"
+      ],
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 1,
+          "odds_multiplier": 2
+        }
+      },
+      "additional": [
+        {
+          "name": "Service Type",
+          "regex_group_name": "ServiceType",
+          "lookup": [
+            {
+              "matches": "J",
+              "name": "UPS Next Day Express"
+            },
+            {
+              "matches": "K",
+              "name": "UPS Ground"
+            }
+          ]
+        }
+      ],
+      "tracking_url": "https://wwwapps.ups.com/WebTracking/track?track=yes&trackNums=%s",
+      "test_numbers": {
+        "valid": [
+          "K1506235620",
+          "K2479825491",
+          "J4603636537"
+        ],
+        "invalid": [
+          "K1506235622",
+          "K2479825492",
+          "J4603636538"
+        ]
+      }
     }
   ]
 }

data/lib/tracking_number/checksum_validations.rb

@@ -60,6 +60,32 @@ module TrackingNumber
         # standard mod 7 check
         return true if sequence.to_i % 7 == check_digit.to_i
       end
+
+      def validates_mod_37_36?(sequence, check_digit, extras = {})
+        # From https://esolutions.dpd.com/dokumente/DPD_Parcel_Label_Specification_2.4.1_EN.pdf
+
+        mod = 36
+        weights = {A: 10, B: 11, C: 12, D: 13, E: 14, F: 15, G: 16, H: 17, I: 18, J: 19, K: 20, L: 21, M: 22, N: 23, O: 24, P: 25, Q: 26, R: 27, S: 28, T: 29, U: 30, V: 31, W: 32, X: 33, Y: 34, Z: 35}
+        cd = mod
+        sequence.chars.to_a.each do |char, i|
+          val = (char =~ /[A-Za-z]/  ? weights[char.to_sym] : char.to_i)
+
+          cd = val + cd
+          cd = cd - mod if cd > mod
+          cd = cd * 2
+          cd = cd - (mod + 1) if cd > mod
+        end
+
+        cd = (mod + 1) - cd
+        cd = 0 if cd == mod
+        computed = if cd >= 10
+                     weights.find { |a, val| val == cd }[0].to_s
+                   else
+                     cd.to_s
+                   end
+
+        computed == check_digit
+      end
     end
   end
 end

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeff Keen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,8 +157,11 @@ files:
 - README.md
 - Rakefile
 - lib/data/couriers/amazon.json
+- lib/data/couriers/canadapost.json
 - lib/data/couriers/dhl.json
 - lib/data/couriers/fedex.json
+- lib/data/couriers/landmark.json
+- lib/data/couriers/lasership.json
 - lib/data/couriers/ontrac.json
 - lib/data/couriers/s10.json
 - lib/data/couriers/ups.json