email_validation 1.0.0 → 1.1.0

data/.rspec

@@ -0,0 +1 @@
+-cfs

data/Gemfile

@@ -1,10 +1,10 @@
 source :rubygems
 
-# DEPENDENCIES
 gem 'localized_each_validator', '>= 1.0.1'
 
-# DEVELOPMENT
-gem 'jeweler'
-gem 'yard'
-gem 'RedCloth', require: 'redcloth'
-
+group :development do
+  gem 'jeweler'
+  gem 'yard'
+  gem 'RedCloth', require: 'redcloth'
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -1,35 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    RedCloth (4.2.7)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
-    gemcutter (0.6.1)
+    diff-lcs (1.1.2)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
+      rake
     localized_each_validator (1.0.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
-    yard (0.6.1)
+    rake (0.8.7)
+    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.5.0)
+    tzinfo (0.3.25)
+    yard (0.6.5)
 
 PLATFORMS
   ruby
@@ -38,4 +43,5 @@ DEPENDENCIES
   RedCloth
   jeweler
   localized_each_validator (>= 1.0.1)
+  rspec
   yard

data/README.textile

@@ -1,7 +1,7 @@
 h1. email_validation -- Simple email validator for Rails 3
 
 | *Author* | Tim Morgan |
-| *Version* | 1.0 (Oct 30, 2010) |
+| *Version* | 1.1 (Mar 23, 2011) |
 | *License* | Released under the MIT license. |
 
 h2. About

data/Rakefile

@@ -1,13 +1,15 @@
-require 'rake'
+require 'rubygems'
+require 'bundler'
 begin
-  require 'bundler'
-rescue LoadError
-  puts "Bundler is not installed; install with `gem install bundler`."
-  exit 1
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-Bundler.require :default
-
+require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "email_validation"
   gem.summary = %Q{Simple email validation in Rails 3}
@@ -15,10 +17,10 @@ Jeweler::Tasks.new do |gem|
   gem.email = "git@timothymorgan.info"
   gem.homepage = "http://github.com/riscfuture/email_validation"
   gem.authors = [ "Tim Morgan" ]
-  gem.add_dependency 'localized_each_validator', '>= 1.0.1'
 end
-Jeweler::GemcutterTasks.new
+Jeweler::RubygemsDotOrgTasks.new
 
+require 'yard'
 YARD::Rake::YardocTask.new('doc') do |doc|
   doc.options << "-m" << "textile"
   doc.options << "--protected"
@@ -28,3 +30,8 @@ YARD::Rake::YardocTask.new('doc') do |doc|
   
   doc.files = [ 'lib/*_validator.rb', 'README.textile' ]
 end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+task(default: :spec)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/email_validation.gemspec

@@ -1,50 +1,66 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{email_validation}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2011-03-23}
   s.description = %q{A simple, localizable EachValidator for email address fields in ActiveRecord 3.0.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "email_validation.gemspec",
-     "lib/email_validation.rb"
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "email_validation.gemspec",
+    "lib/email_validation.rb",
+    "spec/email_validator_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/riscfuture/email_validation}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Simple email validation in Rails 3}
+  s.test_files = [
+    "spec/email_validator_spec.rb",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<localized_each_validator>, [">= 1.0.1"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<localized_each_validator>, [">= 1.0.1"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<localized_each_validator>, [">= 1.0.1"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

data/lib/email_validation.rb

@@ -11,10 +11,13 @@ require 'localized_each_validator'
 # | @:allow_nil@ | If true, @nil@ values are allowed. |
 
 class EmailValidator < LocalizedEachValidator
+  # Regular expression describing valid emails
+  EMAIL_REGEX = "[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}"
+  
   error_key :invalid_email
 
   # @private
   def valid?(_, _, value)
-    value =~ /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
+    value =~ /^#{EMAIL_REGEX}$/i || value =~ /^.+\s+<#{EMAIL_REGEX}>$/i
   end
 end

data/spec/email_validator_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe EmailValidator do
+  before :each do
+    @validator = EmailValidator.new({ attributes: [ :foo, :bar ] })
+  end
+  
+  it "should validate an email address" do
+    @validator.valid?(nil, nil, 'foo@bar.com').should be_true
+  end
+  
+  it "should validate a name and email pair" do
+    @validator.valid?(nil, nil, 'Foo Bar <foo@bar.com>').should be_true
+  end
+  
+  it "should not validate an improper email address" do
+    @validator.valid?(nil, nil, 'foo@bar').should be_false
+    @validator.valid?(nil, nil, 'fo oo@bar.com').should be_false
+    @validator.valid?(nil, nil, 'foo@bar@bar.com').should be_false
+    @validator.valid?(nil, nil, 'foo@.com').should be_false
+  end
+  
+  it "should not validate an improper name and email pair" do
+    @validator.valid?(nil, nil, 'Foo Bar <foo@bar>').should be_false
+    @validator.valid?(nil, nil, 'Foo Bar <fo oo@bar.com>').should be_false
+    @validator.valid?(nil, nil, 'Foo Bar <foo@bar@bar.com>').should be_false
+    @validator.valid?(nil, nil, 'Foo Bar <foo@.com>').should be_false
+    @validator.valid?(nil, nil, '<foo@bar.com> Foo Bar').should be_false
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+Bundler.require :default, :test
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'email_validation'
+
+RSpec.configure do |c|
+  c.mock_with :rspec
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: email_validation
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -07:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +20,54 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: A simple, localizable EachValidator for email address fields in ActiveRecord 3.0.
 email: git@timothymorgan.info
 executables: []
@@ -43,7 +79,7 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .document
-- .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -52,13 +88,15 @@ files:
 - VERSION
 - email_validation.gemspec
 - lib/email_validation.rb
+- spec/email_validator_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/riscfuture/email_validation
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -66,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2013038120930311290
+      hash: 318508982850022341
       segments: 
       - 0
       version: "0"
@@ -75,15 +113,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple email validation in Rails 3
-test_files: []
-
+test_files: 
+- spec/email_validator_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,25 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.bundle
-.rvmrc
-
-## PROJECT::DOCUMENTATION
-.yardoc
-doc