activevalidators 1.2.4 → 1.3.0

data/Gemfile.lock

@@ -1,61 +1,57 @@
 PATH
   remote: .
   specs:
-    activevalidators (1.2.4)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      date_validator (= 0.5.9)
-      mail
+    activevalidators (1.3.0)
+      activemodel (~> 3.0.0)
+      activerecord (~> 3.0.0)
+      date_validator (~> 0.6.1)
+      mail (~> 2.2.15)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.4)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
-    date_validator (0.5.9)
-      activemodel (>= 3.0.0)
+    date_validator (0.6.1)
+      activemodel (~> 3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.4.2)
-    mail (2.2.10)
+    i18n (0.5.0)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.5.0)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.25)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activemodel (>= 3.0.0)
-  activerecord (>= 3.0.0)
   activevalidators!
   bundler
-  date_validator (= 0.5.9)
-  mail
   rspec
   rspec-core
   rspec-expectations

data/README.md

@@ -38,7 +38,7 @@ In your models, the gem provides new validators like `email`, or `url`:
 
     class Account
       validates :visa_card,     :credit_card => { :type => :visa }
-      validates :credit_card,   :credit_card => { :type => :all  }
+      validates :credit_card,   :credit_card => { :type => :any  }
     end
 
 
@@ -46,7 +46,7 @@ Exhaustive list of supported validators and their implementation:
 
 * `email` : based on the `mail` gem
 * `url`   : based on a regular expression
-* `phone` : based on a regular expression
+* `phone` : based on a set of predefined masks
 * `twitter` : based on a regular expression
 * `slug`  : based on `ActiveSupport::String#parameterize`
 * `ip`    : based on `Resolv::IPv[4|6]::Regex`

data/activevalidators.gemspec

@@ -4,9 +4,9 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.2.4'
+  s.version     = '1.3.0'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel"]
+  s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel", "Renato Riccieri Santos Zannon"]
   s.email       = ["franck@verrot.fr"]
   s.homepage    = "http://github.com/cesario/activevalidators"
   s.summary     = %q{Collection of ActiveModel/ActiveRecord validations}
@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-core"
   s.add_development_dependency "rspec-expectations"
-  s.add_dependency 'activerecord', '>= 3.0.0'
-  s.add_dependency 'activemodel', '>= 3.0.0'
-  s.add_dependency 'mail'
-  s.add_dependency 'date_validator', '0.5.9'
+  s.add_dependency 'activerecord'  , '~> 3.0.0'
+  s.add_dependency 'activemodel'   , '~> 3.0.0'
+  s.add_dependency 'mail'          , '~> 2.2.15'
+  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/phone_validator.rb

@@ -2,10 +2,32 @@ 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
+        @value = value
+        @formats = PhoneValidator.known_formats[options[:country]] || PhoneValidator.known_formats[:us]
+        unless matches_any?
           record.errors.add(attribute)
         end
       end
+
+      def self.known_formats
+        @@known_formats ||=
+        {:us     => ["###-###-####", "##########", "###.###.####", "### ### ####", "(###) ###-####"],
+         :brazil => ["## ####-####", "(##) ####-####", "##########"],
+         :france => ["## ## ## ## ##"],
+         :uk     => ["#### ### ####"]}
+      end
+
+      def matches_any?
+        false if @formats.nil? or not @formats.respond_to?(:detect)
+        @formats.detect { |format| @value.match(PhoneValidator.regexp_from format) }
+      end
+
+      private
+
+      def self.regexp_from(format)
+        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d')+"$"
+      end
+
     end
   end
-end
+end

data/spec/validations/phone_spec.rb

@@ -2,45 +2,68 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 describe "Phone Validation" do
 
-  before(:each) do
-    TestRecord.reset_callbacks(:validate)
-    TestRecord.validates :phone, :phone => true
-  end
-  
   subject { TestRecord.new }
 
-  it 'should validate format of phone with ###-###-####' do
-    subject.phone = '999-999-9999'
-    subject.should be_valid
-    subject.should have(0).errors
-  end
+  context "when no country is given" do
+    before(:each) do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :phone, :phone => true
+    end
 
-  it 'should validate format of phone with ##########' do
-    subject.phone = '9999999999'
-    subject.should be_valid
-    subject.should have(0).errors
-  end
+    it 'should validate format of phone with ###-###-####' do
+      subject.phone = '999-999-9999'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
 
-  it 'should validate format of phone with ###.###.####' do
-    subject.phone = '999.999.9999'
-    subject.should be_valid
-    subject.should have(0).errors
-  end
+    it 'should validate format of phone with ##########' do
+      subject.phone = '9999999999'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    it 'should validate format of phone with ###.###.####' do
+      subject.phone = '999.999.9999'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    it 'should validate format of phone with ### ### ####' do
+      subject.phone = '999 999 9999'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    it 'should validate format of phone with (###) ###-####' do
+      subject.phone = '(999) 999-9999'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
 
-  it 'should validate format of phone with ### ### ####' do
-    subject.phone = '999 999 9999'
-    subject.should be_valid
-    subject.should have(0).errors
   end
 
-  it 'should validate format of phone with (###) ###-####' do
-    subject.phone = '(999) 999-9999'
-    subject.should be_valid
-    subject.should have(0).errors
+  ActiveModel::Validations::PhoneValidator.known_formats.each do |country, formats|
+    context "when given a :#{country} country parameter" do
+      before(:each) do
+        TestRecord.reset_callbacks(:validate)
+        TestRecord.validates :phone, :phone => {:country => country}
+      end
+
+      formats.each do |format|
+        it "should validate format of phone with #{format}" do
+          subject.phone = format.gsub('#','9')
+          subject.should be_valid
+          subject.should have(0).errors
+        end
+      end
+    end
   end
 
+
   describe "for invalid formats" do
     before :each do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :phone, :phone => true
       subject.phone = '999'
     end
 

data/spec/validations/twitter_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 describe "Twitter Validation" do

metadata

@@ -1,24 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
+  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors: 
 - Franck Verrot
 - "Paco Guzm\xC3\xA1n"
 - Oriol Gual
 - Garrett Bjerkhoel
+- Renato Riccieri Santos Zannon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 +01:00
+date: 2011-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -43,9 +36,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -57,9 +47,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -71,9 +58,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -83,13 +67,8 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id005
@@ -99,13 +78,8 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id006
@@ -115,12 +89,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 2.2.15
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -129,14 +100,9 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 5
-        - 9
-        version: 0.5.9
+        version: 0.6.1
   type: :runtime
   version_requirements: *id008
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
@@ -192,23 +158,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations