tracking_number 0.10.5 → 3.0.0

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,198 @@ 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
+
+    should "return tracking numbers entered as lowercase" do
+      s = TrackingNumber.search("hello 1z879E930346834440 bye")
+      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
+
+    should "have valid tracking url" do
+      assert tracking_number.tracking_url, "Tracking url should not be blank"
+      assert tracking_number.tracking_url.include?(tracking_number.tracking_number), "Should include tracking number in the url"
+    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_equal "Delivery Confirmation", tracking_number.service_type
+    end
+
+    should "report correct shipper_id" do
+      assert_equal "071790000", 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
+
+    should "have valid tracking url" do
+      assert tracking_number.tracking_url, "Tracking url should not be blank"
+      assert tracking_number.tracking_url.include?(tracking_number.tracking_number), "Should include tracking number in the url"
+    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 "901326076", 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
+
+    should "report no partnership" do
+      assert_equal false, tracking_number.partnership?
+    end
+
+    should "report no partners" do
+      assert_nil tracking_number.partners
+    end
+
+    should "report as shipper and carrier" do
+      assert_equal true, tracking_number.shipper?
+      assert_equal true, tracking_number.carrier?
+    end
+
+    should "have valid tracking url" do
+      assert tracking_number.tracking_url, "Tracking url should not be blank"
+      assert tracking_number.tracking_url.include?(tracking_number.tracking_number), "Should include tracking number in the url"
+    end
+  end
+
+  context "tracking number additional data for USPS Parcel Select" do
+    tracking_number = TrackingNumber.new("420 11213 92 6129098349792366623 8")
+
+    should "report correct courier name" do
+      assert_equal "United States Postal Service", tracking_number.courier_name
+    end
+
+    should "report correct courier code" do
+      assert_equal :usps, tracking_number.courier_code
+    end
+
+    should "report correct service type" do
+      assert_equal "Parcel Select", tracking_number.service_type
+    end
+
+    should "report no partnership" do
+      assert_equal false, tracking_number.partnership?
+    end
+
+    should "report as shipper and carrier" do
+      assert_equal true, tracking_number.shipper?
+      assert_equal true, tracking_number.carrier?
+    end
+
+    should "report no partners" do
+      assert_nil tracking_number.partners
+    end
+  end
+
+  context "searching for numbers" do
+    parcel_select_number = "420 11213 92 6129098349792366623 8"
+    single_number = "92001903060085300042901077"
+
+    search_string = ["number that matches two services", parcel_select_number, " number that matches only one: ", single_number, "let's see if that does it"].join(' ')
+
+    should "match only carriers by default" do
+      matches = TrackingNumber.search(search_string)
+      assert_equal 2, matches.size
+      assert_equal [true, true], matches.collect { |t| t.carrier? }
+    end
+
+    should "match all if specified" do
+      matches = TrackingNumber.search(search_string, match: :all)
+      assert_equal 2, matches.size
+    end
+
+    should "match only shippers if specified" do
+      matches = TrackingNumber.search(search_string, match: :shipper)
+      assert_equal 2, matches.size
+    end
   end
 end

data/tracking_number.gemspec

@@ -1,32 +1,63 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "tracking_number/version"
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'tracking_number/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{tracking_number}
+  s.name = '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.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
+  s.authors = ['Jeff Keen']
+  s.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."
+  s.email = 'jeff@keen.me'
   s.extra_rdoc_files = [
-    "LICENSE.txt",
+    'LICENSE.txt'
   ]
-  s.files         = `git ls-files`.split("\n")
+
+  s.files = `git ls-files`.split("\n")
+
+  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
+      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
+
+      # 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
+
   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}
-  s.licenses = ["MIT"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Identifies valid tracking numbers}
-
-  s.add_development_dependency('rake', '~> 10.4.2')
+
+  s.require_paths = ['lib']
+  s.homepage = 'http://github.com/jkeen/tracking_number'
+  s.licenses = ['MIT']
+  s.summary = 'Identifies valid tracking numbers'
+
+  s.add_runtime_dependency('activesupport', '>= 4.2.5')
+  s.add_runtime_dependency('json', '>= 1.8.3')
+  s.add_development_dependency('activemodel', '> 4.2.5.1')
+  s.add_development_dependency('irb')
+  s.add_development_dependency('minitest', '~> 5.5')
+  s.add_development_dependency('minitest-reporters', '~> 1.1')
+  s.add_development_dependency('rake', '~> 13.0')
   s.add_development_dependency('shoulda')
   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('terminal-table')
 end