email_format_validator 1.0.3 → 1.0.4

data/README.md

@@ -14,24 +14,24 @@ Usage
 
 Add the following to one of your models:
 
-    validates :email, :email_format => true
+    validates :email, email_format: true
     
 You can turn on RFC 822 compliant email verification by passing on:
 
-    validates :email, :email_format => { :rfc => true }
+    validates :email, email_format: { rfc: true }
 
 Be aware that this is disabled by default as websites will often need a less permissive email check than the RFC one (check out tests for more details).
 
 You can also modify the default message ("is improperly formatted") if validation fails:
 
-    validates :email, :email_format => { :message => "is not well formatted" }
+    validates :email, email_format: { message: "is not well formatted" }
 
 I18n
 ----
 
 If you use I18n, the default key to translate is :improperly_formatted. So if you add to your User model:
 
-    validates :email, :email_format => true
+    validates :email, email_format: true
 
 You can translate (or overload) the default message via for e.g. (in english): "en.activerecord.errors.models.user.attributes.email.improperly_formatted"
 
@@ -40,7 +40,12 @@ Tests
 
     cd test
     ruby email_format_validator_test.rb
-    
+
+Compatibility
+-------------
+
+Ruby 1.8 is not supported.
+
 Credits
 -------
 

data/email_format_validator.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "email_format_validator"
-  s.version     = "1.0.3"
+  s.version     = "1.0.4"
   s.authors     = ["Axel Vergult"]
   s.email       = ["axel.vergult@gmail.com"]
   s.homepage    = "https://github.com/episko/email_format_validator"

data/lib/email_format_validator.rb

@@ -23,13 +23,20 @@ class EmailFormatValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     pattern_choosed = options[:rfc] ? Patterns::EMAIL : Patterns::LESS_RFC_COMPLIANT_EMAIL
     unless value =~ pattern_choosed
-      record.errors.add(
-        attribute,
-        options[:message] || I18n.t(:improperly_formatted,
-                                    :scope    => "#{record.class.i18n_scope}.errors.models.#{record.class.model_name.i18n_key}.attributes.#{attribute}",
-                                    :default => "is improperly formatted")
-      )
+      record.errors.add(attribute, options[:message] || invalid_message(record, attribute))
     end
   end
 
+  #######################
+  ### Private methods ###
+  #######################
+
+  private
+
+  def invalid_message(record, attribute)
+    I18n.t  :improperly_formatted,
+            scope:    "#{record.class.i18n_scope}.errors.models.#{record.class.model_name.i18n_key}.attributes.#{attribute}",
+            default:  "is improperly formatted"
+  end
+
 end

data/test/email_format_validator_test.rb

@@ -3,26 +3,73 @@
 require_relative 'test_helper'
 
 class TestUser < TestModel
-  validates :email, :email_format => true
+  validates :email, email_format: true
 end
 
 class TestUserWithRfcCompliantEmail < TestModel
-  validates :email, :email_format => { :rfc => true }
+  validates :email, email_format: { rfc: true }
 end
 
 class TestUserAllowsNilToTrue < TestModel
-  validates :email, :email_format => { :allow_nil => true }
+  validates :email, email_format: { allow_nil: true }
 end
 
 class TestUserAllowsNilToFalse < TestModel
-  validates :email, :email_format => { :allow_nil => false }
+  validates :email, email_format: { allow_nil: false }
 end
 
 class TestUserWithMessage < TestModel
-  validates :email, :email_format => { :message => 'is not well formatted' }
+  validates :email, email_format: { message: 'is not well formatted' }
 end
 
 class TestEmailFormatValidator < MiniTest::Unit::TestCase
+
+  def test_valid_emails
+    valid_emails.each { |email| assert TestUser.new(email: email).valid? }
+  end
+
+  def test_invalid_emails
+    invalid_emails.each { |email| refute TestUser.new(email: email).valid? }
+  end
+
+  def test_valid_emails_with_rfc_compliant
+    rfc_valid_emails.each { |email| assert TestUserWithRfcCompliantEmail.new(email: email).valid? }
+  end
+
+  def test_invalid_emails_with_rfc_compliant
+    rfc_invalid_emails.each { |email| refute TestUserWithRfcCompliantEmail.new(email: email).valid? }
+  end
+
+  def test_default_message_on_error
+    test_user = TestUser.new(email: "invalid_email@")
+    refute test_user.valid?
+    assert test_user.errors[:email].include?("is improperly formatted")
+  end
+
+  def test_custom_message_on_error
+    test_user = TestUserWithMessage.new(email: "invalid_email@")
+    refute test_user.valid?
+    assert test_user.errors[:email].include?("is not well formatted")
+  end
+
+  def test_nil_email_when_allow_nil_option_is_not_set
+    refute TestUser.new(email: nil).valid?
+  end
+
+  def test_nil_email_when_allow_nil_option_is_set_to_true
+    assert TestUserAllowsNilToTrue.new(email: nil).valid?
+  end
+
+  def test_nil_email_when_allow_nil_option_is_set_to_false
+    refute TestUserAllowsNilToFalse.new(email: nil).valid?
+  end
+
+  #######################
+  ### Private methods ###
+  #######################
+
+  private
+
   def rfc_valid_emails
     [
       'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@letters-in-local.org',
@@ -153,44 +200,4 @@ class TestEmailFormatValidator < MiniTest::Unit::TestCase
     ]
   end
 
-  def test_valid_emails
-    valid_emails.each { |email| assert TestUser.new(:email => email).valid? }
-  end
-
-  def test_invalid_emails
-    invalid_emails.each { |email| refute TestUser.new(:email => email).valid? }
-  end
-
-  def test_valid_emails_with_rfc_compliant
-    rfc_valid_emails.each { |email| assert TestUserWithRfcCompliantEmail.new(:email => email).valid? }
-  end
-
-  def test_invalid_emails_with_rfc_compliant
-    rfc_invalid_emails.each { |email| refute TestUserWithRfcCompliantEmail.new(:email => email).valid? }
-  end
-
-  def test_default_message_on_error
-    test_user = TestUser.new(:email => "invalid_email@")
-    refute test_user.valid?
-    assert test_user.errors[:email].include?("is improperly formatted")
-  end
-
-  def test_custom_message_on_error
-    test_user = TestUserWithMessage.new(:email => "invalid_email@")
-    refute test_user.valid?
-    assert test_user.errors[:email].include?("is not well formatted")
-  end
-
-  def test_nil_email_when_allow_nil_option_is_not_set
-    refute TestUser.new(:email => nil).valid?
-  end
-
-  def test_nil_email_when_allow_nil_option_is_set_to_true
-    assert TestUserAllowsNilToTrue.new(:email => nil).valid?
-  end
-
-  def test_nil_email_when_allow_nil_option_is_set_to_false
-    refute TestUserAllowsNilToFalse.new(:email => nil).valid?
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_format_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70145218413060 !ruby/object:Gem::Requirement
+  requirement: &70357357707720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70145218413060
+  version_requirements: *70357357707720
 description: A Rails 3 email format validator with RFC 822 compliant option
 email:
 - axel.vergult@gmail.com