vjt-email_validator 1.5.1 → 1.5.2

data/lib/email_validator.rb

@@ -7,9 +7,14 @@ class EmailValidator < ActiveModel::EachValidator
   local_part_special_chars = Regexp.escape('!#$%&\'*-/=?+-^_`{|}~')
   local_part_unquoted      = '(?:[[:alnum:]'   + local_part_special_chars + ']+[\.\+])*[[:alnum:]' + local_part_special_chars + '+]'
   local_part_quoted        = '\"(?:[[:alnum:]' + local_part_special_chars + '\.]|\\\\[\x00-\xFF])*\"'
-  domain_part              = '@(?:(?:(?:\w+\-+[^_])|(?:\w+\.[a-z0-9-]*))*(?:[a-z0-9-]{1,63})\.[a-z]{2,6}(?:\.[a-z]{2,6})?'
-  Pattern   = Regexp.new('\A(?:' + local_part_unquoted + '+|' + local_part_quoted + '+)' + domain_part + '\Z)', Regexp::EXTENDED | Regexp::IGNORECASE, 'n').freeze
+  domain_part              = '@(?:(?:(?:\w+\-+[^_])|(?:\w+\.[a-z0-9-]*))*(?:[a-z0-9-]{1,63})\.[a-z]{2,6}(?:\.[a-z]{2,6})?)'
+
+  email_address_regexp     = '(?:' + local_part_unquoted + '+|' + local_part_quoted + '+)' + domain_part
+
+  Pattern   = Regexp.new('\A' + email_address_regexp + '\Z', Regexp::EXTENDED | Regexp::IGNORECASE, 'n').freeze
+  Scanner   = Regexp.new(       email_address_regexp,        Regexp::EXTENDED | Regexp::IGNORECASE, 'n').freeze
   Separator = /[;,\s]\s*/.freeze # for multiple e-mail addresses
+
   Defaults  = {
     :message          => I18n.t(:invalid_email_address,    :scope => [:activerecord, :errors, :messages], :default => 'does not appear to be a valid e-mail address'),
     :multiple_message => I18n.t(:invalid_multiple_email,   :scope => [:activerecord, :errors, :messages], :default => 'appears to contain an invalid e-mail address'),
@@ -49,6 +54,10 @@ class EmailValidator < ActiveModel::EachValidator
   end
 
   class << self
+    def extract(string)
+      string.scan(Scanner)
+    end
+
     def valid?(email, options = {})
       errors_on(email, options).nil?
     end

data/test/email_validator_test.rb

@@ -146,6 +146,17 @@ class EmailValidatorTest < TEST_CASE
     assert_equal false, EmailValidator.valid?('valid@example.com', :domain_length => 1)
   end
 
+  def test_scanning_of_addresses
+    assert_equal ['vjt@openssl.it', 'alex@dunae.ca'], EmailValidator.extract(%[
+      foo bar antani         tapioca   vjt@openssl.it
+                 blatantly@wrong    and.ano@ther-hey49039403.4930
+      alex@dunae.ca      hey man can I haz       chunky bacon?!
+      :-)
+    ])
+
+    assert_equal ['foo@example.org'], EmailValidator.extract('foo@example.org')
+  end
+
   protected
     def create_person(params)
       Person.new(params)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vjt-email_validator
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Marcello Barnaba
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +01:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: []