validate_email 0.1.5 → 0.1.6

data/README.markdown

@@ -39,8 +39,17 @@ The gem only supports Rails 3 (has dependencies in ActiveModel and ActiveSupport
 
 #### I18n
 
-The default error message `is not a valid email address`.  
-You can pass the `:message => "my custom error"` option to your validation to define your own, custom message.
+The error message will be looked up according to the standard ActiveModel::Errors scheme.
+For the above Unicorn class this would be:
+
+ * activemodel.errors.models.unicorn.attributes.email_address.email
+ * activemodel.errors.models.unicorn.email
+ * activemodel.errors.messages.email
+ * errors.attributes.email_address.email
+ * errors.messages.email
+
+A default errors.messages.email of `is not a valid email address` is provided.
+You can also pass the `:message => "my custom error"` option to your validation to define your own custom message.
 
 ## Authors
 
@@ -49,4 +58,3 @@ You can pass the `:message => "my custom error"` option to your validation to de
 
 ## License
 Copyright 2010 by PerfectLine LLC (<http://www.perfectline.co.uk>) and is released under the MIT license.
-

data/lib/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      email: is not a valid email address

data/lib/validate_email.rb

@@ -1,3 +1,5 @@
+require 'active_support/i18n'
+I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
 require 'active_model'
 require 'mail'
 
@@ -6,12 +8,11 @@ module ActiveModel
     class EmailValidator < ActiveModel::EachValidator
       
       def initialize(options)
-        options.reverse_merge!(:message => "is not a valid email address")
+        options.reverse_merge!(:message => :email)
         super(options)
       end
 
       def validate_each(record, attribute, value)
-        return if options[:allow_nil] && value.nil?
 
         begin
           mail = Mail::Address.new(value)

metadata

@@ -1,169 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validate_email
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tanel Suurhans
 - Tarmo Lehtpuu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: active_record
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: active_record
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Library for validating email addresses in Rails 3 models.
-email: 
+email:
 - tanel.suurhans@perfectline.ee
 - tarmo.lehtpuu@perfectline.ee
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - init.rb
 - install.rb
+- lib/locale/en.yml
 - lib/validate_email.rb
-- spec/resources/user.rb
-- spec/resources/user_with_ar.rb
-- spec/resources/user_with_ar_legacy.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_legacy.rb
-- spec/resources/user_with_nil.rb
-- spec/spec_helper.rb
-- spec/validate_email_spec.rb
-has_rdoc: true
 homepage: http://github.com/perfectline/validates_email/tree/master
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for validating email addresses in Rails 3 models.
-test_files: 
-- spec/resources/user.rb
-- spec/resources/user_with_ar.rb
-- spec/resources/user_with_ar_legacy.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_legacy.rb
-- spec/resources/user_with_nil.rb
-- spec/spec_helper.rb
-- spec/validate_email_spec.rb
+test_files: []

data/spec/resources/user.rb

@@ -1,7 +0,0 @@
-class User
-  include ActiveModel::Validations
-
-  attr_accessor :email_address
-
-  validates :email_address, :email => true
-end

data/spec/resources/user_with_ar.rb

@@ -1,5 +0,0 @@
-class UserWithAr < ActiveRecord::Base
-  self.table_name = "users"
-
-  validates :email_address, :email => true
-end

data/spec/resources/user_with_ar_legacy.rb

@@ -1,5 +0,0 @@
-class UserWithArLegacy < ActiveRecord::Base
-  self.table_name = "users"
-
-  validates_email :email_address
-end

data/spec/resources/user_with_blank.rb

@@ -1,7 +0,0 @@
-class UserWithBlank
-  include ActiveModel::Validations
-
-  attr_accessor :email_address
-
-  validates :email_address, :email => {:allow_blank => true}
-end

data/spec/resources/user_with_legacy.rb

@@ -1,7 +0,0 @@
-class UserWithLegacy
-  include ActiveModel::Validations
-
-  attr_accessor :email_address
-
-  validates_email :email_address, :allow_blank => true
-end

data/spec/resources/user_with_nil.rb

@@ -1,7 +0,0 @@
-class UserWithNil
-  include ActiveModel::Validations
-
-  attr_accessor :email_address
-
-  validates :email_address, :email => {:allow_nil => true}
-end

data/spec/spec_helper.rb

@@ -1,24 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/resources')
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rspec'
-require 'sqlite3'
-require 'active_record'
-require 'active_record/base'
-require 'active_record/migration'
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.establish_connection(
-    "adapter"   => "sqlite3",
-    "database"  => ":memory:"
-)
-
-require File.join(File.dirname(__FILE__), '..', 'init')
-
-autoload :User,             'resources/user'
-autoload :UserWithNil,      'resources/user_with_nil'
-autoload :UserWithBlank,    'resources/user_with_blank'
-autoload :UserWithLegacy,   'resources/user_with_legacy'
-autoload :UserWithAr,       'resources/user_with_ar'
-autoload :UserWithArLegacy, 'resources/user_with_ar_legacy'

data/spec/validate_email_spec.rb

@@ -1,150 +0,0 @@
-require 'spec_helper'
-
-describe "Email validation" do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-
-      create_table :users, :force => true do |t|
-        t.column :email_address, :string
-      end
-
-    end
-  end
-
-  after(:all) do
-    ActiveRecord::Base.connection.drop_table(:users)
-  end
-
-  context "with regular validator" do
-    before do
-      @user = User.new
-    end
-
-    it "should not allow nil as email" do
-      @user.email_address = nil
-      @user.should_not be_valid
-    end
-
-    it "should not allow blank as email" do
-      @user.email_address = ""
-      @user.should_not be_valid
-    end
-
-    it "should not allow an email without domain extension" do
-      @user.email_address = "user@example"
-      @user.should_not be_valid
-    end
-
-    it "should not allow an email without @" do
-      @user.email_address = "user"
-      @user.should_not be_valid
-    end
-
-    it "should not allow an email without prefix" do
-      @user.email_address = "@example.com"
-      @user.should_not be_valid
-    end
-
-    it "should not allow an email without domain" do
-      @user.email_address = "user@.com"
-      @user.should_not be_valid
-    end
-
-    it "should accept a valid email address" do
-      @user.email_address = "user@example.com"
-      @user.should be_valid
-    end
-  end
-
-  context "with allow nil" do
-    before do
-      @user = UserWithNil.new
-    end
-
-    it "should allow nil as email" do
-      @user.email_address = nil
-      @user.should be_valid
-    end
-
-    it "should not allow blank as email" do
-      @user.email_address = ""
-      @user.should_not be_valid
-    end
-
-    it "shoild allow a valid email address" do
-      @user.email_address = "user@example.com"
-      @user.should be_valid
-    end
-  end
-
-  context "with allow blank" do
-    before do
-      @user = UserWithBlank.new
-    end
-
-    it "should allow nil as email" do
-      @user.email_address = nil
-      @user.should be_valid
-    end
-
-    it "should allow blank as email" do
-      @user.email_address = ""
-      @user.should be_valid
-    end
-
-    it "should allow a valid email address" do
-      @user.email_address = "user@example.com"
-      @user.should be_valid
-    end
-  end
-
-  context "with legacy syntax" do
-    before do
-      @user = UserWithLegacy.new
-    end
-
-    it "should allow nil as email" do
-      @user.email_address = nil
-      @user.should be_valid
-    end
-
-    it "should allow blank as email" do
-      @user.email_address = ""
-      @user.should be_valid
-    end
-
-    it "should allow a valid email address" do
-      @user.email_address = "user@example.com"
-      @user.should be_valid
-    end
-
-    it "should not allow invalid email" do
-      @user.email_address = "random"
-      @user.should_not be_valid
-    end
-  end
-
-  context "with ActiveRecord" do
-    before do
-      @user = UserWithAr.new
-    end
-
-    it "should not allow invalid email" do
-      @user.email_address = ""
-      @user.should_not be_valid
-    end
-  end
-
-  context "with ActiveRecord and legacy syntax" do
-    before do
-      @user = UserWithArLegacy.new
-    end
-
-    it "should not allow invalid email" do
-      @user.email_address = ""
-      @user.should_not be_valid
-    end
-  end
-
-end