activevalidators 1.8.1 → 1.9.0

data/.travis.yml

@@ -5,6 +5,6 @@ rvm:
   - 1.9.3
   - ruby-head
   - ree
-  - rbx
-  - rbx-2.0
+  - rbx-18mode
+  - rbx-19mode
   - jruby

data/README.md

@@ -16,7 +16,7 @@ In your models, the gem provides new validators like `email`, or `url`:
 
 ```ruby
     class User
-      validates :email_address, :email => true
+      validates :email_address, :email => true # == :email => { :strict => false }
       validates :link_url,      :url   => true
       validates :user_phone,    :phone => true
       validates :password,      :password => { :strength => :medium }

data/activevalidators.gemspec

@@ -1,11 +1,7 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-require 'active_validators/version'
-
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = ActiveValidators::VERSION
+  s.version     = '1.9.0'
   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"]
@@ -22,6 +18,5 @@ Gem::Specification.new do |s|
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths      = ["lib"]
 end
 

data/lib/active_model/validations/email_validator.rb

@@ -2,10 +2,20 @@ require 'mail'
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
+      EMAIL_REGEXP = %r{\A[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}\z}
+
       def validate_each(record,attribute,value)
+        opts = options.dup
+        opts[:strict] ||= false
+
         begin
           address = Mail::Address.new(value)
-          valid = address.domain && value.include?(address.address)
+          valid   = address.domain && 
+                    value.include?(address.address) &&
+                    ( 
+                      !opts[:strict] || 
+                      address.domain.match(EMAIL_REGEXP) 
+                    )
         rescue Mail::Field::ParseError
           valid = false
         end

data/test/validations/email_test.rb

@@ -1,42 +1,83 @@
 require 'test_helper.rb'
 
 describe "Email Validation" do
-  it "accepts valid emails" do
-    subject = build_email_record :email => 'franck@verrot.fr'
-    subject.valid?.must_equal true
-    subject.errors.size.must_equal 0
-  end
+  describe "strict: true" do
+    
+    it "accepts valid emails" do
+      subject = build_email_record({:email => 'franck@verrot.fr'}, {:strict => true})
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
 
-  it "accepts complete emails" do
-    subject = build_email_record :email => 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'
-    subject.valid?.must_equal true
-    subject.errors.size.must_equal 0
+    it "accepts valid emails" do
+      subject = build_email_record({:email => 'franck@edu.verrot-gouv.fr'}, {:strict => true})
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+    
+    it "accepts complete emails" do
+      subject = build_email_record({:email => 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'}, {:strict => true})
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+    
+    it "accepts complete emails" do
+      subject = build_email_record({:email => 'franck@verrotfr'}, {:strict => true})
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
   end
-
+  
+  describe "strict: false (default)" do
+    it "accepts valid emails" do
+      subject = build_email_record :email => 'franck@verrot.fr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+      
+    it "accepts valid emails" do
+      subject = build_email_record :email => 'franck@edu.verrot-gouv.fr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+      
+    it "accepts complete emails" do
+      subject = build_email_record :email => 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+    
+    it "accepts complete emails" do
+      subject = build_email_record :email => 'franck@verrotfr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+  end
+  
   describe "for invalid emails" do
     it "rejects invalid emails" do
       subject = build_email_record :email => 'franck.fr'
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
-
+      
     it 'rejects local emails' do
       subject = build_email_record :email => 'franck.fr'
       subject.email = 'franck'
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
-
-    it "generates an error message of type invalid" do
+      
+    it 'generates an error message of type invalid' do
       subject = build_email_record :email => 'franck.fr'
       subject.valid?.must_equal false
       subject.errors[:email].include?(subject.errors.generate_message(:email, :invalid)).must_equal true
     end
   end
 
-  def build_email_record(attrs = {})
+  def build_email_record(attrs = {}, opts = {})
     TestRecord.reset_callbacks(:validate)
-    TestRecord.validates :email, :email => true
+    TestRecord.validates :email, :email => { :strict => opts[:strict] }
     TestRecord.new attrs
   end
 end

metadata

@@ -1,16 +1,12 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activevalidators
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 8
-  - 1
-  version: 1.8.1
+version: !ruby/object:Gem::Version
+  version: 1.9.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Franck Verrot
-- "Paco Guzm\xC3\xA1n"
+- Paco Guzmán
 - Oriol Gual
 - Garrett Bjerkhoel
 - Renato Riccieri Santos Zannon
@@ -18,96 +14,81 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-17 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70152419540700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70152419540700
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70152419540020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
+  version_requirements: *70152419540020
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70152419506560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+  version_requirements: *70152419506560
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70152419506060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70152419506060
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &70152419505620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: date_validator
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70152419505620
+- !ruby/object:Gem::Dependency
+  name: date_validator
+  requirement: &70152419504580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70152419504580
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
-email: 
+email:
 - franck@verrot.fr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -126,7 +107,6 @@ files:
 - lib/active_model/validations/tracking_number_validator.rb
 - lib/active_model/validations/twitter_validator.rb
 - lib/active_model/validations/url_validator.rb
-- lib/active_validators/version.rb
 - lib/activevalidators.rb
 - test/test_helper.rb
 - test/validations/credit_card_test.rb
@@ -141,37 +121,31 @@ files:
 - test/validations/tracking_number_test.rb
 - test/validations/twitter_test.rb
 - test/validations/url_test.rb
-has_rdoc: true
 homepage: http://github.com/cesario/activevalidators
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/validations/credit_card_test.rb
 - test/validations/date_test.rb

data/lib/active_validators/version.rb

@@ -1,4 +0,0 @@
-# encoding: utf-8
-module ActiveValidators
-  VERSION = '1.8.1'
-end