email_validator 1.2.4 → 1.3.0

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby

data/Gemfile.lock

@@ -7,26 +7,30 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   email_validator!
+  rake
   rspec

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/balexand/email_validator.png" />}[http://travis-ci.org/balexand/email_validator]
+
 == Usage
 
 Add to your Gemfile:
@@ -12,7 +14,18 @@ Then add the following to your model:
 
   validates :my_email_attribute, :email => true
 
+== Strict mode
+
+In order to have stricter validation (according to http://www.remote.org/jochen/mail/info/chars.html) enable strict mode. You can do this globally by adding the following to your Gemfile:
+
+  gem 'email_validator', :require => 'email_validator/strict'
+
+Or you can do this in a specific `validates` call:
+
+  validates :my_email_attribute, :email => {:strict_mode => true}
+
 == Credit
 
 Based on http://thelucid.com/2010/01/08/sexy-validation-in-edge-rails-rails-3
 Regular Expression based on http://fightingforalostcause.net/misc/2006/compare-email-regex.php tests.
+

data/Rakefile

@@ -1,6 +1,10 @@
 require 'bundler'
 require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask' # deprecated in Ruby 1.9.3 but needed for Ruby 1.8.7 and JRuby
+end
 require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks

data/email_validator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{email_validator}
-  s.version = "1.2.4"
+  s.version = "1.3.0"
   s.authors = ["Brian Alexander"]
   s.date = %q{2011-07-23}
   s.description = %q{An email validator for Rails 3. See homepage for details: http://github.com/balexand/email_validator}
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
   s.summary = %q{An email validator for Rails 3.}
   s.add_dependency("activemodel", ">= 0")
+  s.add_development_dependency("rake")
   s.add_development_dependency("rspec", ">= 0")
 end
 

data/lib/email_validator.rb

@@ -1,7 +1,15 @@
 # Based on work from http://thelucid.com/2010/01/08/sexy-validation-in-edge-rails-rails-3/
 class EmailValidator < ActiveModel::EachValidator
+  @@default_options = {}
+
+  def self.default_options
+    @@default_options
+  end
+
   def validate_each(record, attribute, value)
-    unless value =~ /^\s*([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*$/i
+    options = @@default_options.merge(self.options)
+    name_validation = options[:strict_mode] ? "-a-z0-9+._" : "^@\\s"
+    unless value =~ /^\s*([#{name_validation}]{1,64})@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*$/i
       record.errors.add(attribute, options[:message] || :invalid)
     end
   end

data/lib/email_validator/strict.rb

@@ -0,0 +1,5 @@
+# require this file to enable :strict_mode by default
+
+require 'email_validator'
+
+EmailValidator::default_options[:strict_mode] = true

data/spec/email_validator_spec.rb

@@ -4,6 +4,10 @@ class TestUser < TestModel
   validates :email, :email => true
 end
 
+class StrictUser < TestModel
+  validates :email, :email => {:strict_mode => true}
+end
+
 class TestUserAllowsNil < TestModel
   validates :email, :email => {:allow_nil => true}
 end
@@ -20,18 +24,14 @@ describe EmailValidator do
 
   describe "validation" do
     context "given the valid emails" do
-      [ "user@example.com",
+      [
+        "a+b@plus-in-local.com",
+        "a_b@underscore-in-local.com",
+        "user@example.com",
         " user@example.com ",
         "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@letters-in-local.org",
         "01234567890@numbers-in-local.net",
-        "&'*+-./=?^_{}~@other-valid-characters-in-local.net",
-        "mixed-1234-in-{+^}-local@sld.net",
         "a@single-character-in-local.org",
-        "\"quoted\"@sld.com",
-        "\"\\e\\s\\c\\a\\p\\e\\d\"@sld.com",
-        # "\"quoted-at-sign@sld.org\"@sld.com",
-        "\"escaped\\\"quote\"@sld.com",
-        "\"back\\slash\"@sld.com",
         "one-character-third-level@a.example.com",
         "single-character-in-sld@x.org",
         "local@dash-in-sld.com",
@@ -43,9 +43,7 @@ describe EmailValidator do
         "country-code-tld@sld.uk",
         "country-code-tld@sld.rw",
         "local@sld.newTLD",
-        # "punycode-numbers-in-tld@sld.xn--3e0b707e",
         "local@sub.domains.com",
-        # "bracketed-IP-instead-of-domain@[127.0.0.1]",
         "aaa@bbb.co.jp",
         "nigel.worthington@big.co.uk",
         "f@c.com",
@@ -56,44 +54,68 @@ describe EmailValidator do
           TestUser.new(:email => email).should be_valid
         end
 
+        it "#{email.inspect} should be valid in strict_mode" do
+          StrictUser.new(:email => email).should be_valid
+        end
+
       end
 
     end
 
     context "given the invalid emails" do
-      [ "",
+      [
+        "",
         "f@s",
         "f@s.c",
         "@bar.com",
         "test@example.com@example.com",
         "test@",
         "@missing-local.org",
+        "a b@space-in-local.com",
         "! \#$%\`|@invalid-characters-in-local.org",
-        # "(),:;\`|@more-invalid-characters-in-local.org",
         "<>@[]\`|@even-more-invalid-characters-in-local.org",
-        # ".local-starts-with-dot@sld.com",
-        # "local-ends-with-dot.@sld.com",
-        # "two..consecutive-dots@sld.com",
-        # "partially.\"quoted\"@sld.com",
-        # "the-local-part-is-invalid-if-it-is-longer-than-sixty-four-characters@sld.net",
         "missing-sld@.com",
-        # "sld-starts-with-dashsh@-sld.com",
-        # "sld-ends-with-dash@sld-.com",
         "invalid-characters-in-sld@! \"\#$%(),/;<>_[]\`|.org",
         "missing-dot-before-tld@com",
         "missing-tld@sld.",
         " ",
-        # "the-total-length@of-an-entire-address-cannot-be-longer-than-two-hundred-and-fifty-four-characters-and-this-address-is-255-characters-exactly-so-it-should-be-invalid-and-im-going-to-add-some-more-words-here-to-increase-the-lenght-blah-blah-blah-blah-blah-blah-blah-blah.org",
         "missing-at-sign.net",
         "unbracketed-IP@127.0.0.1",
         "invalid-ip@127.0.0.1.26",
         "another-invalid-ip@127.0.0.256",
-        "IP-and-port@127.0.0.1:25" ].each do |email|
+        "IP-and-port@127.0.0.1:25",
+        "the-local-part-is-invalid-if-it-is-longer-than-sixty-four-characters@sld.net"
+      ].each do |email|
 
         it "#{email.inspect} should not be valid" do
           TestUser.new(:email => email).should_not be_valid
         end
 
+        it "#{email.inspect} should not be valid in strict_mode" do
+          StrictUser.new(:email => email).should_not be_valid
+        end
+
+      end
+    end
+
+    context "given the emails that should be invalid in strict_mode but valid in normal mode" do
+      [
+        "hans,peter@example.com",
+        "hans(peter@example.com",
+        "hans)peter@example.com",
+        "partially.\"quoted\"@sld.com",
+        "&'*+-./=?^_{}~@other-valid-characters-in-local.net",
+        "mixed-1234-in-{+^}-local@sld.net"
+      ].each do |email|
+
+        it "#{email.inspect} should be valid" do
+          TestUser.new(:email => email).should be_valid
+        end
+
+        it "#{email.inspect} should not be valid in strict_mode" do
+          StrictUser.new(:email => email).should_not be_valid
+        end
+
       end
     end
   end
@@ -131,4 +153,14 @@ describe EmailValidator do
       TestUserAllowsNilFalse.new(:email => nil).should_not be_valid
     end
   end
-end
+
+  describe "default_options" do
+    context "when 'email_validator/strict' has been required" do
+      before { require 'email_validator/strict' }
+
+      it "should validate using strict mode" do
+        TestUser.new(:email => "&'*+-./=?^_{}~@other-valid-characters-in-local.net").should_not be_valid
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_validator
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-23 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70129050140280 !ruby/object:Gem::Requirement
+  requirement: &70351238018900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129050140280
+  version_requirements: *70351238018900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70351238018180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70351238018180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129050139800 !ruby/object:Gem::Requirement
+  requirement: &70351238017440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129050139800
+  version_requirements: *70351238017440
 description: ! 'An email validator for Rails 3. See homepage for details: http://github.com/balexand/email_validator'
 email: balexand@gmail.com
 executables: []
@@ -44,6 +54,7 @@ extra_rdoc_files:
 files:
 - .document
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -51,9 +62,9 @@ files:
 - Rakefile
 - email_validator.gemspec
 - lib/email_validator.rb
+- lib/email_validator/strict.rb
 - spec/email_validator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/balexand/email_validator
 licenses: []
 post_install_message: 
@@ -74,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An email validator for Rails 3.