tracking_number 0.10.5 → 1.0.0.pre1

data/test/tracking_number_test.rb

@@ -6,6 +6,9 @@ class TrackingNumberTest < Minitest::Test
       t = TrackingNumber.new("101")
       assert_equal TrackingNumber::Unknown, t.class
       assert_equal :unknown, t.carrier
+      assert_equal :unknown, t.courier_code
+      assert_equal "Unknown", t.courier_name
+
       assert !t.valid?
     end
 
@@ -26,10 +29,112 @@ class TrackingNumberTest < Minitest::Test
       assert_equal 2, s.size
     end
 
+    should "return two ups tracking numbers when given string with two ups tracking numbers" do
+      s = TrackingNumber.search("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 1Z5R89390357567127 nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute 1Z879E930346834440 dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+      assert_equal 2, s.size
+      assert_equal [TrackingNumber::UPS, TrackingNumber::UPS], s.collect { |t| t.class }
+    end
+
     should "return tracking numbers without trailing whitespace" do
       s = TrackingNumber.search("hello 1Z879E930346834440\nbye")
       assert_equal 1, s.size
       assert_equal "1Z879E930346834440", s.first.tracking_number
     end
   end
+
+  context "tracking number additional data for ups" do
+    tracking_number = TrackingNumber.new("1Z5R89390357567127")
+
+    should "report correct courier name" do
+      assert_equal "UPS", tracking_number.courier_name
+    end
+
+    should "report correct service" do
+      assert_equal "UPS United States Ground", tracking_number.service_type
+    end
+
+    should "report correct shipper_id" do
+      assert_equal "5R8939", tracking_number.shipper_id
+    end
+
+    should "report correct no destination" do
+      assert_nil tracking_number.destination_zip
+    end
+
+    should "report correct no package info" do
+      assert_nil tracking_number.package_type
+    end
+  end
+
+  context "tracking number additional data for s10" do
+    tracking_number = TrackingNumber.new("RB123456785GB")
+
+    should "report correct courier name" do
+      assert_equal "Royal Mail Group plc", tracking_number.courier_name
+    end
+
+    should "report correct service" do
+      assert_equal "Letter Post Registered", tracking_number.service_type
+    end
+
+    should "report correct shipper_id" do
+      assert_nil tracking_number.shipper_id
+    end
+
+    should "report correct no destination" do
+      assert_nil tracking_number.destination_zip
+    end
+
+    should "report correct no package info" do
+      assert_nil tracking_number.package_type
+    end
+  end
+
+  context "tracking number additional data for USPS 20" do
+    tracking_number = TrackingNumber.new("0307 1790 0005 2348 3741")
+
+    should "report correct courier name" do
+      assert_equal "United States Postal Service", tracking_number.courier_name
+    end
+
+    should "report correct service" do
+      assert_nil tracking_number.service_type
+    end
+
+    should "report correct shipper_id" do
+      assert_nil tracking_number.shipper_id
+    end
+
+    should "report correct no destination" do
+      assert_nil tracking_number.destination_zip
+    end
+
+    should "report correct no package info" do
+      assert_nil tracking_number.package_type
+    end
+  end
+
+  context "tracking number additional data for USPS 34v2" do
+    tracking_number = TrackingNumber.new("4201002334249200190132607600833457")
+
+    should "report correct courier name" do
+      assert_equal "United States Postal Service", tracking_number.courier_name
+    end
+
+    should "report correct service" do
+      assert_nil tracking_number.service_type
+    end
+
+    should "report correct shipper_id" do
+      assert_equal "00190132", tracking_number.shipper_id
+    end
+
+    should "report correct no destination" do
+      assert_equal "10023", tracking_number.destination_zip
+    end
+
+    should "report correct no package info" do
+      assert_nil tracking_number.package_type
+    end
+  end
 end

data/tracking_number.gemspec

@@ -6,10 +6,8 @@ Gem::Specification.new do |s|
   s.name = %q{tracking_number}
   s.version = TrackingNumber::VERSION
   s.platform = Gem::Platform::RUBY
-
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Keen"]
-  s.date = %q{2017-02-21}
   s.description = %q{This gem identifies valid tracking numbers and the service they're associated with. It can also tell you a little bit about the package purely from the number—there's quite a bit of info tucked away into those numbers, it turns out.}
   s.email = %q{jeff@keen.me}
   s.extra_rdoc_files = [
@@ -26,7 +24,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake', '~> 10.4.2')
   s.add_development_dependency('shoulda')
+  s.add_development_dependency('minitest-reporters', '~> 1.1')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('activemodel', '~> 4.2.5.1')
   s.add_development_dependency('minitest','~> 5.5')
+  s.add_development_dependency('awesome_print','~> 1.8')
+  s.add_development_dependency('terminal-table')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Jeff Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem identifies valid tracking numbers and the service they're associated
   with. It can also tell you a little bit about the package purely from the number—there's
   quite a bit of info tucked away into those numbers, it turns out.
@@ -91,29 +133,24 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- ".gitmodules"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
+- lib/checksum_validations.rb
+- lib/tasks/stats.rake
 - lib/tracking_number.rb
 - lib/tracking_number/active_model_validator.rb
 - lib/tracking_number/base.rb
-- lib/tracking_number/dhl.rb
-- lib/tracking_number/fedex.rb
-- lib/tracking_number/ontrac.rb
-- lib/tracking_number/ups.rb
-- lib/tracking_number/usps.rb
+- lib/tracking_number/info.rb
+- lib/tracking_number/unknown.rb
 - lib/tracking_number/version.rb
 - test/active_model_validator_test.rb
-- test/dhl_tracking_number_test.rb
-- test/fedex_tracking_number_test.rb
-- test/ontrac_tracking_number_test.rb
 - test/test_helper.rb
+- test/tracking_number_data_test.rb
 - test/tracking_number_test.rb
-- test/ups_tracking_number_test.rb
-- test/usps_tracking_number_test.rb
 - tracking_number.gemspec
 homepage: http://github.com/jkeen/tracking_number
 licenses:
@@ -135,16 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Identifies valid tracking numbers
-test_files:
-- test/active_model_validator_test.rb
-- test/dhl_tracking_number_test.rb
-- test/fedex_tracking_number_test.rb
-- test/ontrac_tracking_number_test.rb
-- test/test_helper.rb
-- test/tracking_number_test.rb
-- test/ups_tracking_number_test.rb
-- test/usps_tracking_number_test.rb
+test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.10.5

data/lib/tracking_number/dhl.rb

@@ -1,34 +0,0 @@
-module TrackingNumber
-  class DHL < Base
-    def carrier
-      :dhl
-    end
-
-    def valid_checksum?
-      # standard mod 7 check
-      sequence, check_digit = matches
-      return true if sequence.to_i % 7 == check_digit.to_i
-    end
-  end
-
-  #DHL Air (a division of DHL Express) have 11 digit numbers
-  class DHLExpressAir < DHL
-    SEARCH_PATTERN = /(\b([0-9]\s*){11,11}\b)/
-    VERIFY_PATTERN = /^([0-9]{10,10})([0-9])$/
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-  end
-
-  #DHL Express numbers are 10 digits long
-  # http://www.dhl.co.uk/content/dam/downloads/uk/Express/PDFs/developer_centre/dhlis9_shipment_and_piece_ranges_v1.3.pdf
-  class DHLExpress < DHL
-    SEARCH_PATTERN = /(\b([0-9]\s*){10,10}\b)/
-    VERIFY_PATTERN = /^([0-9]{9,9})([0-9])$/
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-  end
-end

data/lib/tracking_number/fedex.rb

@@ -1,156 +0,0 @@
-module TrackingNumber
-  class FedEx < Base
-    def carrier
-      :fedex
-    end
-  end
-
-  class FedExExpress < FedEx
-    SEARCH_PATTERN = /(\b([0-9]\s*){12,12}\b)/
-    VERIFY_PATTERN = /^([0-9]{11,11})([0-9])$/
-    LENGTH = 12
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-
-    def valid_checksum?
-      sequence, check_digit = matches
-      total = 0
-      sequence.chars.to_a.zip([3,1,7,3,1,7,3,1,7,3,1]).each do |(a,b)|
-        total += a.to_i * b
-      end
-      return (total % 11 % 10) == check_digit.to_i
-    end
-  end
-
-  class FedExSmartPost < FedEx
-    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
-    end
-
-    def valid_checksum?
-      # http://stackoverflow.com/questions/15744704/how-to-calculate-a-fedex-smartpost-tracking-number-check-digit
-
-      @tracking_number = "92#{tracking_number}" unless tracking_number =~ /^92/
-      sequence = @tracking_number.chars.map(&:to_i)
-      check_digit = sequence.pop
-
-      total = 0
-      sequence.reverse.each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-
-      return true if check == check_digit.to_i
-    end
-  end
-
-  class FedExGround96 < FedEx
-    SEARCH_PATTERN = /(\b9\s*6\s*([0-9]\s*){20,20}\b)/
-    VERIFY_PATTERN = /^96[0-9]{5,5}([0-9]{14,14})([0-9])$/
-    LENGTH = 22
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-
-    def decode
-      {:application_id => self.tracking_number.to_s.slice(0...2),
-       :serial_container =>  self.tracking_number.to_s.slice(2...4),
-       :service_code => self.tracking_number.to_s.slice(4...7),
-       :shipper_id =>  self.tracking_number.to_s.slice(7...14),
-       :package_identifier =>  self.tracking_number.to_s.slice(14...21),
-       :check_digit => self.tracking_number.slice(21...22)
-      }
-    end
-
-    def valid_checksum?
-      # 22 numbers
-      # http://fedex.com/us/solutions/ppe/FedEx_Ground_Label_Layout_Specification.pdf
-      # 96 - UCC/EAN Application Identifier
-
-      # [0-9]{2,2} - SCNC
-      # [0-9]{3,3} - Class Of Service
-      # [0-9]{7,7} - RPS Shipper ID (used in calculation)
-      # [0-9]{7,7} - Package Number (used in calculation)
-      # [0-9]      - Check Digit
-      sequence, check_digit = matches
-
-      total = 0
-      sequence.chars.to_a.map(&:to_i).reverse.each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
-  end
-
-  class FedExGround < FedEx
-    SEARCH_PATTERN = /(\b([0-9]\s*){15,15}\b)/
-    VERIFY_PATTERN = /^([0-9]{15,15})$/
-    LENGTH = 15
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-
-    def valid_checksum?
-      sequence = tracking_number.chars.to_a.map(&:to_i)
-      check_digit = sequence.pop
-      total = 0
-      sequence.reverse.each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
-  end
-
-  class FedExGround18 < FedEx
-    SEARCH_PATTERN = /(\b([0-9]\s*){18,18}\b)/
-    VERIFY_PATTERN = /^[0-9]{2,2}([0-9]{15,15})([0-9])$/
-    LENGTH = 20
-
-    def matches
-      self.tracking_number.scan(VERIFY_PATTERN).flatten
-    end
-
-    def decode
-      {:application_id => self.tracking_number.to_s.slice(0...2),
-       :serial_container =>  self.tracking_number.to_s.slice(1...2),
-       :service_code => self.tracking_number.to_s.slice(2...3),
-       :shipper_id =>  self.tracking_number.to_s.slice(3...10),
-       :package_identifier =>  self.tracking_number.to_s.slice(10...17),
-       :check_digit => self.tracking_number.slice(17...18)
-      }
-    end
-
-    def valid_checksum?
-      # [0-9]{2,2} - Not used
-      # [0-9]{15, 15} - used for calculation
-
-      sequence = tracking_number.chars.to_a.map(&:to_i)
-      check_digit = sequence.pop
-      total = 0
-      sequence.reverse.each_with_index do |x, i|
-        x *= 3 if i.even?
-        total += x
-      end
-      check = total % 10
-      check = (10 - check) unless (check.zero?)
-      return true if check == check_digit.to_i
-    end
-  end
-end