tracking_number 1.0.2 → 1.0.3

data/lib/data/couriers/ups.json

@@ -0,0 +1,139 @@
+{
+  "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>[A-Z0-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"
+        ]
+      }
+    }
+  ]
+}

data/lib/data/couriers/usps.json

@@ -0,0 +1,140 @@
+{
+  "name": "United States Postal Service",
+  "courier_code": "usps",
+  "tracking_numbers": [
+    {
+      "tracking_url": "https://m.usps.com/m/TrackConfirmAction_detail?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://m.usps.com/m/TrackConfirmAction_detail?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://m.usps.com/m/TrackConfirmAction_detail?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.0.2"
+  VERSION = "1.0.3"
 end

data/tracking_number.gemspec

@@ -13,8 +13,25 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [
     "LICENSE.txt",
   ]
+
   s.files         = `git ls-files`.split("\n")
+
+  gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
+
+  `git submodule --quiet foreach pwd`.split($\).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
+      # prepend the submodule path to create absolute file paths
+
+      `git ls-files -- couriers/*`.split($\).each do |filename|
+        s.files << "#{submodule_relative_path}/#{filename}"
+      end
+    end
+  end
+
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.homepage = %q{http://github.com/jkeen/tracking_number}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jeff Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,7 +140,13 @@ files:
 - README.md
 - Rakefile
 - lib/checksum_validations.rb
-- lib/tasks/stats.rake
+- lib/data/couriers/amazon.json
+- lib/data/couriers/dhl.json
+- lib/data/couriers/fedex.json
+- lib/data/couriers/ontrac.json
+- lib/data/couriers/s10.json
+- lib/data/couriers/ups.json
+- lib/data/couriers/usps.json
 - lib/tracking_number.rb
 - lib/tracking_number/active_model_validator.rb
 - lib/tracking_number/base.rb

data/lib/tasks/stats.rake

@@ -1,90 +0,0 @@
-require 'terminal-table'
-
-def courier_data
-  courier_data = Dir.glob(File.join(File.dirname(__FILE__), "../../lib/data/couriers/*.json")).collect do |file|
-    JSON.parse(File.read(file)).deep_symbolize_keys!
-  end
-end
-
-def all_number_groups
-  number_groups = []
-  courier_data.each do |courier_info|
-    courier_info[:tracking_numbers].each do |tracking_info|
-      test_number = tracking_info[:test_numbers][:valid].first
-      t = TrackingNumber.new(test_number)
-      # keys = t.decode.keys.select { |s| ![:serial_number, :check_digit].include?(s) }
-      number_groups << t.decode.keys
-    end
-  end
-  groups = number_groups.flatten.uniq.sort
-end
-
-def has_key?(tracking_numbers, key)
-  tracking_numbers = [tracking_numbers].flatten
-  tracking_numbers.first.decode[key]
-end
-
-def has_additional_key_info?(tracking_numbers, key)
-  tracking_numbers = [tracking_numbers].flatten
-
-  if key == :service_type
-    tracking_numbers.any? { |t| t.service_type }
-  elsif key == :shipping_container_type
-    tracking_numbers.any? { |t| t.package_type }
-  elsif key == :destination_zip
-    tracking_numbers.any? { |t| t.destination_zip }
-  end
-end
-
-
-  desc "show stats for tracking number types"
-  task :stats do
-    rows = []
-
-    courier_data.each do |courier_info|
-      courier_name = courier_info[:name]
-      courier_code = courier_info[:courier_code].to_sym
-
-      courier_info[:tracking_numbers].each do |tracking_info|
-        tracking_type = tracking_info[:name]
-
-        if tracking_type == "S10"
-          country_count = tracking_info[:additional].detect { |r| r[:regex_group_name] == "CountryCode" }[:lookup].size
-          tracking_type = "S10 (#{country_count} types)"
-        end
-
-        tracking_numbers = tracking_info[:test_numbers][:valid].collect { |n| TrackingNumber.new(n) }
-
-        checksum_status = tracking_numbers.first.valid_checksum? &&
-
-        checksum = tracking_numbers.first.class.const_get(:VALIDATION)[:checksum]
-        if checksum
-          checksum_status = '✓'
-        else
-          checksum_status = ''
-        end
-
-
-        status = all_number_groups.collect do |key|
-           s = has_key?(tracking_numbers, key) ? '✓' : ''
-           s = has_additional_key_info?(tracking_numbers, key) ? '✓+' : s
-
-           s
-        end
-
-        rows << [tracking_type, checksum_status, *status]
-      end
-    end
-
-    additional_headers = all_number_groups.collect { |g|
-      if g.length > 10
-        g.to_s.split('_').join("_\n")
-      else
-        g
-      end
-    }
-
-    table = Terminal::Table.new :title => "Tracking Number Stats [✓ = information present in number, ✓+ = additional information available]", :headings => ['Tracking Number', 'Checksum', *additional_headers], :rows => rows
-
-    puts table
-  end