email_validator 1.1.0 → 1.2.1

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    email_validator (1.2.1)
+      activemodel
+
+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)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  email_validator!
+  rspec

data/README.rdoc

@@ -15,3 +15,4 @@ Then add the following to your model:
 == 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,49 +1,14 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "email_validator"
-    gem.summary = %Q{An email validator for Rails 3.}
-    gem.description = %Q{An email validator for Rails 3. See homepage for details: http://github.com/balexand/email_validator}
-    gem.email = "balexand@gmail.com"
-    gem.homepage = "http://github.com/balexand/email_validator"
-    gem.authors = ["Brian Alexander"]
-    gem.add_development_dependency "activerecord", ">= 0"
-    gem.add_development_dependency "sqlite3", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
+require 'bundler'
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
+require 'rake/rdoctask'
+require 'rspec/core/rake_task'
 
-task :test => :check_dependencies
+Bundler::GemHelper.install_tasks
 
-task :default => :test
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(--format documentation --colour)
+end
 
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -52,3 +17,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => 'spec'

data/email_validator.gemspec

@@ -1,13 +1,6 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{email_validator}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "1.2.1"
   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}
@@ -16,36 +9,12 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "email_validator.gemspec",
-    "init.rb",
-    "lib/email_validator.rb",
-    "test/helper.rb",
-    "test/test_email_validator.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {spec}/*`.split("\n")
   s.homepage = %q{http://github.com/balexand/email_validator}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = %w(lib)
   s.summary = %q{An email validator for Rails 3.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-  end
+  s.add_dependency("activemodel", ">= 0")
+  s.add_development_dependency("rspec", ">= 0")
 end
 

data/lib/email_validator.rb

@@ -1,8 +1,10 @@
 # Based on work from http://thelucid.com/2010/01/08/sexy-validation-in-edge-rails-rails-3/
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-      record.errors.add(attribute, options[:message] || "is not valid")
+    address, domain = value ? value.split('@') : ["", ""]
+
+    unless address.size <= 64 and domain.to_s.size <= 254 and value =~ /^([a-z0-9!\#$%&'*+\/=?^_`{|}~-]+(\.[a-z0-9!\#$%&'*+\/=?^_`{|}~-]+)*|"([\040-\041\043-\133\135-\176]|\134[\040-\176])*")@(\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\]|((((([a-z0-9]{1}[a-z0-9-]+[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6}))|[a-z0-9]+\.xn\-\-[a-f0-9]+)$/i
+      record.errors.add(attribute, options[:message] || :invalid)
     end
   end
 end

data/spec/email_validator_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+class TestUser < TestModel
+  validates :email, :email => true
+end
+
+class TestUserWithMessage < TestModel
+  validates :email_address, :email => {:message => 'is not looking very good!'}
+end
+
+describe EmailValidator do
+
+  describe "validation" do
+    context "given the valid emails" do
+      [ "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",
+        "letters-in-sld@123.com",
+        "one-letter-sld@x.org",
+        "uncommon-tld@sld.museum",
+        "uncommon-tld@sld.travel",
+        "uncommon-tld@sld.mobi",
+        "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]" ].each do |email|
+
+        it "#{email.inspect} should be valid" do
+          TestUser.new(:email => email).should be_valid
+        end
+
+      end
+
+    end
+
+    context "given the invalid emails" do
+      [ nil,
+        "@missing-local.org",
+        "! \#$%\`|@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|
+
+        it "#{email.inspect} should not be valid" do
+          TestUser.new(:email => email).should_not be_valid
+        end
+
+      end
+    end
+  end
+
+  describe "error messages" do
+    context "when the message is not defined" do
+      subject { TestUser.new :email => 'invalidemail@' }
+      before { subject.valid? }
+
+      it "should add the default message" do
+        subject.errors[:email].should include "is invalid"
+      end
+    end
+
+    context "when the message is defined" do
+      subject { TestUserWithMessage.new :email_address => 'invalidemail@' }
+      before { subject.valid? }
+
+      it "should add the customized message" do
+        subject.errors[:email_address].should include "is not looking very good!"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'rspec'
+require 'active_model'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'email_validator'
+
+class TestModel
+  include ActiveModel::Validations
+
+  def initialize(attributes = {})
+    @attributes = attributes
+  end
+  
+  def read_attribute_for_validation(key)
+    @attributes[key]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_validator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,19 +13,19 @@ date: 2011-07-23 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70106156075480 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: &70178441880860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70106156075480
+  version_requirements: *70178441880860
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70106156074440 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70178441880380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106156074440
+  version_requirements: *70178441880380
 description: ! 'An email validator for Rails 3. See homepage for details: http://github.com/balexand/email_validator'
 email: balexand@gmail.com
 executables: []
@@ -43,15 +43,16 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - email_validator.gemspec
-- init.rb
 - lib/email_validator.rb
-- test/helper.rb
-- test/test_email_validator.rb
+- spec/email_validator_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/balexand/email_validator
 licenses: []

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/init.rb

@@ -1 +0,0 @@
-require 'email_validator'

data/test/helper.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_record'
-
-# connect to in memory sqlite DB
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :test_users do |t|
-    t.string :email
-  end
-
-  create_table :test_user_with_messages do |t|
-    t.string :email
-  end
-end
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'email_validator'
-
-class Test::Unit::TestCase
-end

data/test/test_email_validator.rb

@@ -1,51 +0,0 @@
-require 'helper'
-
-class TestUser < ActiveRecord::Base
-  attr_accessor :email
-  validates :email, :email => true
-end
-
-class TestUserWithMessage < ActiveRecord::Base
-  attr_accessor :email_address
-  validates :email_address, :email => {:message => 'is not looking very good!'}
-end
-
-class TestEmailValidator < Test::Unit::TestCase
-  def email(email)
-    TestUser.new :email => email
-  end
-
-  def test_should_accept_valid_email_addresses
-    email_addresses = %W{
-      foo@bar.com f@c.com nigel.worthington@big.co.uk f@s.co s@gmail.com foo@g-mail.com -@foo.com
-      areallylongnameaasdfasdfasdfasdf@asdfasdfasdfasdfasdf.ab.cd.ef.gh.co.ca
-    }
-    email_addresses.each do |email_address|
-      user = TestUser.new :email => email_address
-      assert user.valid?, "'#{email_address}' should be a valid address"
-    end
-  end
-
-  def test_should_reject_invalid_email_addresses
-    email_addresses = %W{
-      asdfasdf f@s f@s.c foo@bar@foo.com @bar.com foo@
-    }
-    email_addresses += [' foo@bar.com', 'foo@bar.com ', '', '   ', 'foo bar@gmail.com', 'foobar@g mail.com']
-    email_addresses.each do |email_address|
-      user = TestUser.new :email => email_address
-      assert !user.valid?, "'#{email_address}' should NOT be a valid address"
-    end
-  end
-
-  def test_should_properly_set_message
-    user = TestUser.new :email => 'invalidemail@'
-    assert !user.valid?
-    assert user.errors.full_messages.count == 1
-    assert user.errors.full_messages[0] == "Email is not valid"
-
-    user = TestUserWithMessage.new :email_address => 'invalidemail@'
-    assert !user.valid?
-    assert user.errors.full_messages.count == 1
-    assert user.errors.full_messages[0] == "Email address is not looking very good!"
-  end
-end