tracking_number 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGE0NTZhOGFlYmY1MGViYTFhMTJmMWNiZDI1YjlhYmNhMWZkYTkxNQ==
-  data.tar.gz: !binary |-
-    MjQ5ZmMwMmY1ZTA4NWNmZjg5YzJmMWNlNWQ3MGZhNDlhNGQ1ZTY4MA==
+SHA1:
+  metadata.gz: a7a9c5677ad09e2aedac157290e596a26bff2fb7
+  data.tar.gz: a922ec482d27dc5fa2740bca7ef9971a7ce2f5cd
 SHA512:
-  metadata.gz: !binary |-
-    NWU1ODEyMTkxNzBmYjJmYzhjYmYxZDYxNjgxYWEwNmQzMzBlZGRhNGY2ZTA5
-    NDQ3OTBmMGQzZDIxNmIxNDc3ZTZlNzZiN2EzYWZhOTQ5NDJmYWExOWQ4Mjlk
-    ZjI4YzU5NGJhMGY3ZjUwNmQ5OGRhYjRiMWY1ZWQ5ZmRiYmZmYzA=
-  data.tar.gz: !binary |-
-    YTUzYTAxNzQyM2JhNDY2NTY2YmNmNjk1ZWY4MDMwOWJkODNjOGFlNDRkYjFh
-    ZTVmNWY1YzY0NzQ4NWUzZWU0MTNlZTk0NDNlMGJkZGI0MzA4MTJkMThmYjY0
-    MGZkODI1NjhiOWM0Y2FiNjBhN2E4YTE4ODA1N2E3MTNiM2YxZWQ=
+  metadata.gz: 6e80c241e53d78c3227f4303733c423aff038f4fee9c7116d734c7e3bd92b06a07ffd86021a017db755626d34b0e214fd86e3f51ee78ce1888c269ae083bfe41
+  data.tar.gz: 313f59b1e537cbe5ff0ab0916266ec63828f97b0a9bd1e4fc8194a47dda2276946b59d31cad36f4e268e017a1ff550a972dae4191dfa14933f004f2af8634f5c

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/tracking_number/active_model_validator.rb

@@ -1,7 +1,7 @@
 class TrackingNumberValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return unless value.present?
-    if options[:exception] == value
+    if options[:exception] == value || options[:except] == value
       # magic valid value (an exception that says "not really shipped" or something)
     elsif TrackingNumber.new(value).valid?
       # looks good to me
@@ -9,4 +9,4 @@ class TrackingNumberValidator < ActiveModel::EachValidator
       record.errors[attribute] << options[:message] || 'is not a valid tracking number'
     end
   end
-end
+end

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "0.7.0"
-end
+  VERSION = "0.8.0"
+end

data/test/active_model_validator_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TrackingNumberValidatorTest < Test::Unit::TestCase
+class TrackingNumberValidatorTest < Minitest::Test
   class Validatable
     include ActiveModel::Validations
     attr_accessor :tracking_number
@@ -8,11 +8,12 @@ class TrackingNumberValidatorTest < Test::Unit::TestCase
     validates :tracking_number, :presence => true,
               :tracking_number => {
                 :exception => 'magic',
+                :except => 'witchcraft',
                 :message => ERROR_MESSAGE
               }
   end
   def test_valid_numbers
-    %w(magic 790535312317).each do |valid_tracking_number|
+    %w(magic witchcraft 790535312317).each do |valid_tracking_number|
       obj = Validatable.new
       obj.tracking_number = valid_tracking_number
       assert obj.valid?, "should allow tracking_number #{valid_tracking_number}"
@@ -26,4 +27,4 @@ class TrackingNumberValidatorTest < Test::Unit::TestCase
       assert_equal obj.errors[:tracking_number], [Validatable::ERROR_MESSAGE]
     end
   end
-end
+end

data/test/dhl_tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DHLTrackingNumberTest < Test::Unit::TestCase
+class DHLTrackingNumberTest < Minitest::Test
   context "a DHL tracking number" do
     ["73891051146"].each do |valid_number|
       should "return dhl for #{valid_number}" do
@@ -12,4 +12,4 @@ class DHLTrackingNumberTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/fedex_tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FedExTrackingNumberTest < Test::Unit::TestCase
+class FedExTrackingNumberTest < Minitest::Test
   context "a FedEx tracking number" do
     ["986578788855", "477179081230", "799531274483", "790535312317", "974367662710"].each do |valid_number|
       should "return fedex express for #{valid_number}" do
@@ -43,4 +43,4 @@ class FedExTrackingNumberTest < Test::Unit::TestCase
     end
 
   end
-end
+end

data/test/ontrac_tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class OnTracTrackingNumberTest < Test::Unit::TestCase
+class OnTracTrackingNumberTest < Minitest::Test
   context "an OnTrac tracking number" do
     ["C11031500001879", "C10999911320231"].each do |valid_number|
       should "return ontrac for #{valid_number}" do

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
 SimpleCov.start
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda'
 require 'active_model'
 
@@ -9,7 +9,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'tracking_number'
 
-class Test::Unit::TestCase
+class Minitest::Test
   def possible_numbers(tracking)
     tracking = tracking.to_s
     possible_numbers = []

data/test/tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TrackingNumberTest < Test::Unit::TestCase
+class TrackingNumberTest < Minitest::Test
   context "a tracking number" do
     should "return unknown when given invalid number" do
       t = TrackingNumber.new("101")

data/test/ups_tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class UPSTrackingNumberTest < Test::Unit::TestCase
+class UPSTrackingNumberTest < Minitest::Test
   context "a UPS tracking number" do
     ["1Z5R89390357567127", "1Z879E930346834440", "1Z410E7W0392751591", "1Z8V92A70367203024"].each do |valid_number|
       should "return ups with valid number #{valid_number}" do
@@ -12,4 +12,4 @@ class UPSTrackingNumberTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/usps_tracking_number_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class USPSTrackingNumberTest < Test::Unit::TestCase
+class USPSTrackingNumberTest < Minitest::Test
   context "a USPS tracking number" do
     ["9101 1234 5678 9000 0000 13", "7196 9010 7560 0307 7385", "9400 1112 0108 0805 4830 16"].each do |valid_number|
       should "return usps with valid 22 digit number: #{valid_number}" do

data/tracking_number.gemspec

@@ -25,23 +25,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{Identifies valid tracking numbers}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<activemodel>, [">= 3"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
+  s.add_development_dependency('rake')
+  s.add_development_dependency('shoulda')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('activemodel')
+  s.add_development_dependency('minitest')
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracking_number
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jeff Keen
@@ -14,58 +14,72 @@ dependencies:
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: shoulda
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: Match tracking numbers to a service, and search blocks of text and pull
   out valid tracking numbers.
 email: jeff@keen.me
@@ -75,8 +89,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -110,19 +124,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Identifies valid tracking numbers
 test_files:
 - test/active_model_validator_test.rb