tracking_number 1.3.2 → 1.3.5

data/lib/data/couriers/ups.json

@@ -0,0 +1,191 @@
+{
+  "name": "UPS",
+  "courier_code": "ups",
+  "tracking_numbers": [
+    {
+      "name": "UPS",
+      "regex": [
+        "\\s*1\\s*Z\\s*(?<SerialNumber>",
+        "(?<ShipperId>(?:[A-Z0-9]\\s*){6,6})",
+        "(?<ServiceType>(?:[A-Z0-9]\\s*){2,2})",
+        "(?<PackageId>(?:[A-Z0-9]\\s*){7,7}))",
+        "(?<CheckDigit>[0-9]\\s*)"
+      ],
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 1,
+          "odds_multiplier": 2
+        }
+      },
+      "tracking_url": "https://wwwapps.ups.com/WebTracking/track?track=yes&trackNums=%s",
+      "additional": [
+        {
+          "name": "Service Type",
+          "regex_group_name": "ServiceType",
+          "lookup": [
+            {
+              "matches": "01",
+              "name": "UPS United States Next Day Air (Red)"
+            },
+            {
+              "matches": "02",
+              "name": "UPS United States Second Day Air (Blue)"
+            },
+            {
+              "matches": "03",
+              "name": "UPS United States Ground"
+            },
+            {
+              "matches": "12",
+              "name": "UPS United States Third Day Select"
+            },
+            {
+              "matches": "13",
+              "name": "UPS United States Next Day Air Saver (Red Saver)"
+            },
+            {
+              "matches": "15",
+              "name": "UPS United States Next Day Air Early A.M."
+            },
+            {
+              "matches": "22",
+              "name": "UPS United States Ground - Returns Plus - Three Pickup Attempts"
+            },
+            {
+              "matches": "32",
+              "name": "UPS United States Next Day Air Early A.M. - COD"
+            },
+            {
+              "matches": "33",
+              "name": "UPS United States Next Day Air Early A.M. - Saturday Delivery, COD"
+            },
+            {
+              "matches": "41",
+              "name": "UPS United States Next Day Air Early A.M. - Saturday Delivery"
+            },
+            {
+              "matches": "42",
+              "name": "UPS United States Ground - Signature Required"
+            },
+            {
+              "matches": "44",
+              "name": "UPS United States Next Day Air - Saturday Delivery"
+            },
+            {
+              "matches": "66",
+              "name": "UPS United States Worldwide Express"
+            },
+            {
+              "matches": "72",
+              "name": "UPS United States Ground - Collect on Delivery"
+            },
+            {
+              "matches": "78",
+              "name": "UPS United States Ground - Returns Plus - One Pickup Attempt"
+            },
+            {
+              "matches": "90",
+              "name": "UPS United States Ground - Returns - UPS Prints and Mails Label"
+            },
+            {
+              "matches": "A0",
+              "name": "UPS United States Next Day Air Early A.M. - Adult Signature Required"
+            },
+            {
+              "matches": "A1",
+              "name": "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required"
+            },
+            {
+              "matches": "A2",
+              "name": "UPS United States Next Day Air - Adult Signature Required"
+            },
+            {
+              "matches": "A8",
+              "name": "UPS United States Ground - Adult Signature Required"
+            },
+            {
+              "matches": "A9",
+              "name": "UPS United States Next Day Air Early A.M. - Adult Signature Required, COD"
+            },
+            {
+              "matches": "AA",
+              "name": "UPS United States Next Day Air Early A.M. - Saturday Delivery, Adult Signature Required, COD"
+            },
+            {
+              "matches": "YW",
+              "name": "UPS SurePost - Delivered by the USPS"
+            }
+          ]
+        }
+      ],
+      "test_numbers": {
+        "valid": [
+          "1Z5R89390357567127",
+          "1Z879E930346834440",
+          "1Z410E7W0392751591",
+          "1Z8V92A70367203024",
+          " 1 Z 8 V 9 2 A 7 0 3 6 7 2 0 3 0 2 4 ",
+          "1ZXX3150YW44070023"
+        ],
+        "invalid": [
+          "2Z5R89390357567127",
+          "1A5R89390357567127",
+          "1Z1111111111111111"
+        ]
+      }
+    },
+    {
+      "name": "UPS Waybill",
+      "regex": [
+        "\\s*(?<ServiceType>([A-Z]\\s*){1})",
+        "(?<SerialNumber>(?:[0-9]\\s*){9})",
+        "(?<CheckDigit>[0-9]\\s*){1}"
+      ],
+      "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"
+            },
+            {
+              "matches": "V",
+              "name": "UPS WorldWide Express Saver"
+            }
+          ]
+        }
+      ],
+      "tracking_url": "https://wwwapps.ups.com/WebTracking/track?track=yes&trackNums=%s",
+      "test_numbers": {
+        "valid": [
+          "K1506235620",
+          "K2479825491",
+          "J4603636537",
+          "V0490119172",
+          "V0431105627"
+        ],
+        "invalid": [
+          "K1506235622",
+          "K2479825492",
+          "J4603636538",
+          "V0411335627",
+          "V0423305841"
+        ]
+      }
+    }
+  ]
+}

data/lib/data/couriers/usps.json

@@ -0,0 +1,140 @@
+{
+  "name": "United States Postal Service",
+  "courier_code": "usps",
+  "tracking_numbers": [
+    {
+      "tracking_url": "https://tools.usps.com/go/TrackConfirmAction?tLabels=%s",
+      "name": "USPS 20",
+      "description": "20 digit USPS numbers",
+      "regex": [
+        "\\s*(?<SerialNumber>",
+        "(?<ServiceType>([0-9]\\s*){2})",
+        "(?<ShipperId>([0-9]\\s*){9})",
+        "(?<PackageId>([0-9]\\s*){8})",
+        ")",
+        "(?<CheckDigit>[0-9]\\s*)"
+      ],
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 3,
+          "odds_multiplier": 1
+        }
+      },
+      "test_numbers": {
+        "valid": [
+          "0307 1790 0005 2348 3741",
+          " 0 3 0 7   1 7 9 0   0 0 0 5   2 3 4 8   3 7 4 1 ",
+          "7112 3456 7891 2345 6787"
+        ],
+        "invalid": [
+          "0307 1790 0005 2348 3742"
+        ]
+      },
+      "additional": [
+        {
+          "name": "Service Type",
+          "regex_group_name": "ServiceType",
+          "lookup": [
+            {
+              "matches": "71",
+              "name": "Certified Mail"
+            },
+            {
+              "matches": "73",
+              "name": "Insured Mail"
+            },
+            {
+              "matches": "77",
+              "name": "Registered Mail"
+            },
+            {
+              "matches": "81",
+              "name": "Return Receipt For Merchanise"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "USPS 34v2",
+      "description": "variation on 34 digit USPS IMpd numbers",
+      "regex": [
+        "\\s*(?<RoutingApplicationId>4\\s*2\\s*0\\s*)(?<DestinationZip>([0-9]\\s*){5})",
+        "(?<RoutingNumber>([0-9]\\s*){4})",
+        "(?<SerialNumber>",
+        "(?<ApplicationIdentifier>9\\s*[2345]\\s*)?",
+        "(?<ShipperId>([0-9]\\s*){8})",
+        "(?<PackageId>([0-9]\\s*){11})",
+        ")",
+        "(?<CheckDigit>[0-9]\\s*)"
+      ],
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 3,
+          "odds_multiplier": 1
+        }
+      },
+      "tracking_url": "https://tools.usps.com/go/TrackConfirmAction?tLabels=%s",
+      "test_numbers": {
+        "valid": [
+          "4201002334249200190132607600833457",
+          "4201028200009261290113185417468510",
+          " 4 2 0 1 0 2 8 2 0 0 0 0 9 2 6 1 2 9 0 1 1 3 1 8 5 4 1 7 4 6 8 5 1 0 "
+        ],
+        "invalid": [
+          "4201028200009261290113185417468511"
+        ]
+      }
+    },
+    {
+      "name": "USPS 91",
+      "description": "USPS now calls this the IMpd barcode format",
+      "regex": [
+        "\\s*(?:(?<RoutingApplicationId>4\\s*2\\s*0\\s*)(?<DestinationZip>([0-9]\\s*){5}))?",
+        "(?<SerialNumber>",
+        "(?<ApplicationIdentifier>9\\s*[12345]\\s*)?",
+        "(?<SCNC>([0-9]\\s*){2})",
+        "(?<ServiceType>([0-9]\\s*){2})",
+        "(?<ShipperId>([0-9]\\s*){8})",
+        "(?<PackageId>([0-9]\\s*){11}|([0-9]\\s*){7})",
+        ")",
+        "(?<CheckDigit>[0-9]\\s*)"
+      ],
+      "validation": {
+        "checksum": {
+          "name": "mod10",
+          "evens_multiplier": 3,
+          "odds_multiplier": 1
+        },
+        "serial_number_format": {
+          "prepend_if": {
+            "matches_regex": "^(?!9[1-5]).+",
+            "content": "91"
+          }
+        }
+      },
+      "tracking_url": "https://tools.usps.com/go/TrackConfirmAction?tLabels=%s",
+      "test_numbers": {
+        "valid": [
+          "420 22153 9101026837331000039521",
+          "7196 9010 7560 0307 7385",
+          "9505 5110 6960 5048 6006 24",
+          "9101 1234 5678 9000 0000 13",
+          "92748931507708513018050063",
+          "9400 1112 0108 0805 4830 16",
+          "9361 2898 7870 0317 6337 95",
+          " 9 3 6 1   2 8 9 8   7 8 7 0   0 3 1 7   6 3 3 7   9 5 ",
+          "9405803699300124287899"
+        ],
+        "invalid": [
+          "61299998820821171811",
+          "9200000000000000000000",
+          "420000000000000000000000000000",
+          "420000009200000000000000000000"
+        ]
+      }
+    }
+  ]
+}

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "1.3.2"
+  VERSION = "1.3.5"
 end

data/tracking_number.gemspec

@@ -17,19 +17,28 @@ Gem::Specification.new do |s|
   ]
 
   s.files = `git ls-files`.split("\n")
-  gem_dir = "#{File.expand_path(File.join(__FILE__, '..'))}/"
 
+  gem_dir = "#{File.expand_path(File.join(__FILE__, '..'))}/"
   `git submodule --quiet foreach pwd`.split($OUTPUT_RECORD_SEPARATOR).each do |submodule_path|
     Dir.chdir(submodule_path.chomp) do
       submodule_relative_path = submodule_path.sub gem_dir, ''
-      # issue git ls-files in submodule's directory and
+
+      # issue git ls-files in submodule's directory
+      submodule_files = `git ls-files -- couriers/*`.split($OUTPUT_RECORD_SEPARATOR)
+
       # prepend the submodule path to create absolute file paths
+      submodule_files_fullpaths = submodule_files.map do |filename|
+        "#{submodule_path}/#{filename}"
+      end
 
-      `git ls-files -- couriers/*`.split($OUTPUT_RECORD_SEPARATOR).each do |filename|
-        file_path = "#{submodule_relative_path}/#{filename}"
-        puts "adding file #{file_path}"
-        s.files << file_path
+      # remove leading path parts to get paths relative to the gem's root dir
+      # (this assumes, that the gemspec resides in the gem's root dir)
+      submodule_files_paths = submodule_files_fullpaths.map do |filename|
+        filename.gsub gem_dir, ''
       end
+
+      # add relative paths to gem.files
+      s.files += submodule_files_paths
     end
   end