activevalidators 1.5.0 → 1.5.1

data/activevalidators.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.5.0'
+  s.version     = '1.5.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel", "Renato Riccieri Santos Zannon", "Brian Moseley"]
   s.email       = ["franck@verrot.fr"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemodel'   , '~> 3.0.0'
   s.add_dependency 'mail'          , '~> 2.2.15'
   s.add_dependency 'date_validator', '~> 0.6.1'
+  s.add_dependency 'date_validator', '~> 0.6.1'
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/active_model/validations/tracking_number_validator.rb

@@ -13,7 +13,7 @@ module ActiveModel
       def self.known_formats
         @@known_formats ||= {
           # see https://www.ups.com/content/us/en/tracking/help/tracking/tnh.html
-          :ups => ['1Z################', '############', 'T##########', '#########'],
+          :ups => ['1Z................', '............', 'T..........', '.........'],
         }
       end
 
@@ -25,7 +25,7 @@ module ActiveModel
       private
 
       def self.regexp_from(format)
-        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d')+"$"
+        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d').gsub('\.','[a-zA-Z0-9]')+"$"
       end
     end
   end

data/spec/validations/tracking_number_spec.rb

@@ -21,26 +21,26 @@ describe "Tracking Number Validation" do
       TestRecord.validates :tracking_number, :tracking_number => {:carrier => :ups}
     end
 
-    it 'should validate format of tracking number with 1Z################' do
-      subject.tracking_number = '1Z9999999999999999'
+    it 'should validate format of tracking number with 1Z................' do
+      subject.tracking_number = '1Z12345E0205271688'
       subject.should be_valid
       subject.should have(0).errors
     end
 
-    it 'should validate format of tracking number with ############' do
-      subject.tracking_number = '999999999999'
+    it 'should validate format of tracking number with ............' do
+      subject.tracking_number = '9999V999J999'
       subject.should be_valid
       subject.should have(0).errors
     end
 
-    it 'should validate format of tracking number with T##########' do
-      subject.tracking_number = 'T9999999999'
+    it 'should validate format of tracking number with T..........' do
+      subject.tracking_number = 'T99F99E9999'
       subject.should be_valid
       subject.should have(0).errors
     end
 
-    it 'should validate format of tracking number with #########' do
-      subject.tracking_number = '999999999'
+    it 'should validate format of tracking number with .........' do
+      subject.tracking_number = '990728071'
       subject.should be_valid
       subject.should have(0).errors
     end
@@ -50,7 +50,7 @@ describe "Tracking Number Validation" do
     before :each do
       TestRecord.reset_callbacks(:validate)
       TestRecord.validates :tracking_number, :tracking_number => {:carrier => :ups}
-      subject.tracking_number = '999'
+      subject.tracking_number = '1Z12345E020_271688'
     end
 
     it "rejects invalid formats" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Franck Verrot
@@ -143,6 +143,22 @@ dependencies:
         version: 0.6.1
   type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: date_validator
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id009
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
 email: 
 - franck@verrot.fr