email_validator 1.2.3 → 1.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    email_validator (1.2.3)
+    email_validator (1.2.4)
       activemodel
 
 GEM

data/email_validator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{email_validator}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
   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,11 +1,7 @@
 # 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('@', 2) : ["", ""]
-
-    unless address and domain and address.size <= 64 and domain.to_s.size <= 254 and value =~ VALID_EMAIL_PATTERN
+    unless value =~ /^\s*([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*$/i
       record.errors.add(attribute, options[:message] || :invalid)
     end
   end

data/spec/email_validator_spec.rb

@@ -20,14 +20,16 @@ describe EmailValidator do
 
   describe "validation" do
     context "given the valid emails" do
-      [ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@letters-in-local.org",
+      [ "user@example.com",
+        " user@example.com ",
+        "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",
+        # "\"quoted-at-sign@sld.org\"@sld.com",
         "\"escaped\\\"quote\"@sld.com",
         "\"back\\slash\"@sld.com",
         "one-character-third-level@a.example.com",
@@ -41,9 +43,14 @@ describe EmailValidator do
         "country-code-tld@sld.uk",
         "country-code-tld@sld.rw",
         "local@sld.newTLD",
-        "punycode-numbers-in-tld@sld.xn--3e0b707e",
+        # "punycode-numbers-in-tld@sld.xn--3e0b707e",
         "local@sub.domains.com",
-        "bracketed-IP-instead-of-domain@[127.0.0.1]" ].each do |email|
+        # "bracketed-IP-instead-of-domain@[127.0.0.1]",
+        "aaa@bbb.co.jp",
+        "nigel.worthington@big.co.uk",
+        "f@c.com",
+        "areallylongnameaasdfasdfasdfasdf@asdfasdfasdfasdfasdf.ab.cd.ef.gh.co.ca"
+      ].each do |email|
 
         it "#{email.inspect} should be valid" do
           TestUser.new(:email => email).should be_valid
@@ -55,24 +62,28 @@ describe EmailValidator do
 
     context "given the invalid emails" do
       [ "",
+        "f@s",
+        "f@s.c",
+        "@bar.com",
         "test@example.com@example.com",
+        "test@",
         "@missing-local.org",
         "! \#$%\`|@invalid-characters-in-local.org",
-        "(),:;\`|@more-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",
+        # ".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",
+        # "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",
+        # "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",

metadata

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