activevalidators 1.0.0 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ActiveValidators (1.0.0)
+    activevalidators (1.0.2)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       mail
@@ -46,9 +46,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ActiveValidators!
   activemodel (>= 3.0.0)
   activerecord (>= 3.0.0)
+  activevalidators!
   bundler
   mail
   rspec

data/README.md

@@ -22,14 +22,14 @@ Exhaustive list of supported validators:
 
 * `email` : checks the email based on the `mail` gem
 * `url`   : checks the url based on a regular expression
-
+* `phone` : checks the phone number based on a regular expression
 
 Todo
 ----
 
 Lots of improvements can be made:
 
-* Add I18n of error messages
+* Add I18n specific types of error messages for each validator
 * Implement new validators
 * ...
 

data/activevalidators.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.0.0'
+  s.version     = '1.0.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot"]
   s.email       = ["franck@verrot.fr"]

data/lib/active_model/validations/email_validator.rb

@@ -11,7 +11,7 @@ module ActiveModel
         rescue Exception => e
           r = false
         end
-        record.errors[attribute] << (options[:message] || "is invalid") unless r
+        record.errors.add(attribute) unless r
       end
     end
   end

data/lib/active_model/validations/phone_validator.rb

@@ -0,0 +1,11 @@
+module ActiveModel
+  module Validations
+    class PhoneValidator < EachValidator
+      def validate_each(record, attribute, value)
+        unless value =~ /^\d{3}-\d{3}-\d{4}|\d{3}\.\d{3}\.\d{4}|\d{10}|\d{3}\s\d{3}\s\d{4}|\(\d{3}\)\s\d{3}-\d{4}$/i
+          record.errors.add(attribute)
+        end
+      end
+    end
+  end
+end

data/lib/active_model/validations/respond_to_validator.rb

@@ -6,7 +6,7 @@ module ActiveModel
         responders = options.dup
         RESERVED_OPTIONS.each do |opt,should_apply| responders.delete(opt) end
         responders.each do |method,dummy|
-          record.errors[attribute] << (options[:message] || "is invalid") unless value.respond_to? method
+          record.errors.add(attribute) unless value.respond_to? method
         end
       end
     end

data/lib/active_model/validations/url_validator.rb

@@ -3,7 +3,7 @@ module ActiveModel
     class UrlValidator < EachValidator
       def validate_each(record, attribute, value)
         unless value =~ /^https?:\/\/(?i)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/
-          record.errors[attribute] << (options[:message] || "is invalid") 
+          record.errors.add(attribute)
         end
       end
     end

data/lib/active_validators.rb

@@ -10,5 +10,6 @@ module ActiveModel
     autoload :EmailValidator
     autoload :UrlValidator
     autoload :RespondToValidator
+    autoload :PhoneValidator
   end
 end

data/spec/models/phone_validator_model.rb

@@ -0,0 +1,7 @@
+module Models
+  class PhoneValidatorModel
+    include ActiveModel::Validations
+    attr_accessor :phone
+    validates :phone, :phone => true
+  end
+end

data/spec/specs/email_spec.rb

@@ -4,14 +4,25 @@ describe "Email Validation" do
   it "accepts valid emails" do
     model = Models::EmailValidatorModel.new
     model.email = 'franck@verrot.fr'
-    model.valid?.should == true
+    model.valid?.should be(true)
     model.should have(0).errors
   end
 
-  it "rejected invalid emails" do
-    model = Models::EmailValidatorModel.new
-    model.email = 'franck.fr'
-    model.valid?.should == false
-    model.should have(1).errors
+  describe "for invalid emails" do
+    let(:model) do
+      Models::EmailValidatorModel.new.tap do |m|
+        m.email = 'franck.fr'
+      end
+    end
+
+    it "rejects invalid emails" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
+
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:email].should == [model.errors.generate_message(:email, :invalid)]
+    end
   end
 end

data/spec/specs/phone_spec.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Phone Validation" do
+
+  it 'should validate format of phone with ###-###-####' do
+    model = Models::PhoneValidatorModel.new
+    model.phone = '999-999-9999'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  it 'should validate format of phone with ##########' do
+    model = Models::PhoneValidatorModel.new
+    model.phone = '9999999999'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  it 'should validate format of phone with ###.###.####' do
+    model = Models::PhoneValidatorModel.new
+    model.phone = '999.999.9999'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  it 'should validate format of phone with ### ### ####' do
+    model = Models::PhoneValidatorModel.new
+    model.phone = '999 999 9999'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  it 'should validate format of phone with (###) ###-####' do
+    model = Models::PhoneValidatorModel.new
+    model.phone = '(999) 999-9999'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  describe "for invalid formats" do
+    let(:model) do
+      Models::PhoneValidatorModel.new.tap do |m|
+        m.phone = '999'
+      end
+    end
+
+    it "rejects invalid formats" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
+
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:phone].should == [model.errors.generate_message(:phone, :invalid)]
+    end
+  end
+end

data/spec/specs/respond_to_spec.rb

@@ -7,17 +7,27 @@ describe "Respond To Validation" do
     model.global_condition = true
     model.local_condition = true
 
-    model.valid?.should == true
+    model.valid?.should be(true)
     model.should have(0).errors
   end
 
-  it "does not respond_to?" do
-    model = Models::RespondToValidatorModel.new
-    model.responder = 42
-    model.global_condition = true
-    model.local_condition = true
+  describe "when does not respond_to?" do
+    let(:model) do
+      Models::RespondToValidatorModel.new.tap do |m|
+        m.responder        = 42
+        m.global_condition = true
+        m.local_condition  = true
+      end
+    end
+
+    it "rejects the responder" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
 
-    model.valid?.should == false
-    model.should have(1).errors
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:responder].should == [model.errors.generate_message(:responder, :invalid)]
+    end
   end
 end

data/spec/specs/url_spec.rb

@@ -8,10 +8,21 @@ describe "Url Validation" do
     model.should have(0).errors
   end
 
-  it "rejected invalid urls" do
-    model = Models::UrlValidatorModel.new
-    model.url = 'http://^^^^.fr'
-    model.valid?.should be(false)
-    model.should have(1).errors
+  describe "for invalid emails" do
+    let(:model) do
+      Models::UrlValidatorModel.new.tap do |m|
+        m.url = 'http://^^^^.fr'
+      end
+    end
+
+    it "rejects invalid emails" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
+
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:url].should == [model.errors.generate_message(:url, :invalid)]
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Franck Verrot
@@ -132,14 +132,17 @@ files:
 - activevalidators.gemspec
 - autotest/discover.rb
 - lib/active_model/validations/email_validator.rb
+- lib/active_model/validations/phone_validator.rb
 - lib/active_model/validations/respond_to_validator.rb
 - lib/active_model/validations/url_validator.rb
 - lib/active_validators.rb
 - spec/models/email_validator_model.rb
+- spec/models/phone_validator_model.rb
 - spec/models/respond_to_validator_model.rb
 - spec/models/url_validator_model.rb
 - spec/spec_helper.rb
 - spec/specs/email_spec.rb
+- spec/specs/phone_spec.rb
 - spec/specs/respond_to_spec.rb
 - spec/specs/url_spec.rb
 has_rdoc: true
@@ -176,9 +179,11 @@ specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations
 test_files: 
 - spec/models/email_validator_model.rb
+- spec/models/phone_validator_model.rb
 - spec/models/respond_to_validator_model.rb
 - spec/models/url_validator_model.rb
 - spec/spec_helper.rb
 - spec/specs/email_spec.rb
+- spec/specs/phone_spec.rb
 - spec/specs/respond_to_spec.rb
 - spec/specs/url_spec.rb