email_validator 1.2.1 → 1.2.2

data/email_validator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{email_validator}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
   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}

data/lib/email_validator.rb

@@ -1,9 +1,11 @@
 # Based on work from http://thelucid.com/2010/01/08/sexy-validation-in-edge-rails-rails-3/
 class EmailValidator < ActiveModel::EachValidator
+  VALID_EMAIL_PATTERN = /^([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
+
   def validate_each(record, attribute, value)
-    address, domain = value ? value.split('@') : ["", ""]
+    address, domain = value ? value.split('@', 2) : ["", ""]
 
-    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
+    unless address and domain and address.size <= 64 and domain.to_s.size <= 254 and value =~ VALID_EMAIL_PATTERN
       record.errors.add(attribute, options[:message] || :invalid)
     end
   end

data/spec/email_validator_spec.rb

@@ -4,6 +4,14 @@ class TestUser < TestModel
   validates :email, :email => true
 end
 
+class TestUserAllowsNil < TestModel
+  validates :email, :email => {:allow_nil => true}
+end
+
+class TestUserAllowsNilFalse < TestModel
+  validates :email, :email => {:allow_nil => false}
+end
+
 class TestUserWithMessage < TestModel
   validates :email_address, :email => {:message => 'is not looking very good!'}
 end
@@ -46,7 +54,8 @@ describe EmailValidator do
     end
 
     context "given the invalid emails" do
-      [ nil,
+      [ "",
+        "test@example.com@example.com",
         "@missing-local.org",
         "! \#$%\`|@invalid-characters-in-local.org",
         "(),:;\`|@more-invalid-characters-in-local.org",
@@ -97,4 +106,18 @@ describe EmailValidator do
       end
     end
   end
+
+  describe "nil email" do
+    it "should not be valid when :allow_nil option is missing" do
+      TestUser.new(:email => nil).should_not be_valid
+    end
+
+    it "should be valid when :allow_nil options is set to true" do
+      TestUserAllowsNil.new(:email => nil).should be_valid
+    end
+
+    it "should not be valid when :allow_nil option is set to false" do
+      TestUserAllowsNilFalse.new(:email => nil).should_not be_valid
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_validator
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70178441880860 !ruby/object:Gem::Requirement
+  requirement: &70356959914220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178441880860
+  version_requirements: *70356959914220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70178441880380 !ruby/object:Gem::Requirement
+  requirement: &70356959913740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70178441880380
+  version_requirements: *70356959913740
 description: ! 'An email validator for Rails 3. See homepage for details: http://github.com/balexand/email_validator'
 email: balexand@gmail.com
 executables: []