validates_email_format_of 1.4.3 → 1.4.5

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== Version 1.4.4
+
+* https://github.com/alexdunae/validates_email_format_of/compare/1.4.3...1.4.4
+
 == Version 1.4.3
 
 * https://github.com/alexdunae/validates_email_format_of/compare/1.4.2...1.4.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-10 Alex Dunae
+Copyright (c) 2006-11 Alex Dunae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -55,6 +55,11 @@ e-mail address or an array of error messages for invalid addresses.
      proc or string should return or evaluate to a true or false value. 
   :unless
      See :if option.
+  :local_length
+    Maximum number of characters allowed in the local part (default is 64)
+  :domain_length
+    Maximum number of characters allowed in the domain part (default is 255)
+
 
 == Testing
 
@@ -68,7 +73,7 @@ The unit tests for this plugin use an in-memory sqlite3 database.
 
 == Credits
 
-Written by Alex Dunae (dunae.ca), 2006-10.
+Written by Alex Dunae (dunae.ca), 2006-11.
 
 Many thanks to the plugin's recent contributors: https://github.com/alexdunae/validates_email_format_of/contributors
 

data/lib/validates_email_format_of.rb

@@ -3,8 +3,8 @@ module ValidatesEmailFormatOf
   require 'resolv'
   
   LocalPartSpecialChars = Regexp.escape('!#$%&\'*-/=?+-^_`{|}~')
-  LocalPartUnquoted = '([[:alnum:]' + LocalPartSpecialChars + ']+[\.\+]+)*[[:alnum:]' + LocalPartSpecialChars + '+]+'
-  LocalPartQuoted = '\"([[:alnum:]' + LocalPartSpecialChars + '\.\+]|\\\\[\x00-\xFF])*\"'
+  LocalPartUnquoted = '([[:alnum:]' + LocalPartSpecialChars + ']+[\.]+)*[[:alnum:]' + LocalPartSpecialChars + '+]+'
+  LocalPartQuoted = '\"([[:alnum:]' + LocalPartSpecialChars + '\.]|\\\\[\x00-\xFF])*\"'
   Regex = Regexp.new('\A(' + LocalPartUnquoted + '|' + LocalPartQuoted + '+)@(((\w+\-+[^_])|(\w+\.[a-z0-9-]*))*([a-z0-9-]{1,63})\.[a-z]{2,6}(?:\.[a-z]{2,6})?\Z)', Regexp::EXTENDED | Regexp::IGNORECASE, 'n')
 
   def self.validate_email_domain(email)
@@ -23,11 +23,16 @@ module ValidatesEmailFormatOf
   # * <tt>check_mx</tt> - Check for MX records (default is false)
   # * <tt>mx_message</tt> - A custom error message when an MX record validation fails (default is: "is not routable.")
   # * <tt>with</tt> The regex to use for validating the format of the email address (default is ValidatesEmailFormatOf::Regex)</tt>
+  # * <tt>local_length</tt> Maximum number of characters allowed in the local part (default is 64)
+  # * <tt>domain_length</tt> Maximum number of characters allowed in the domain part (default is 255)
   def self.validate_email_format(email, options={})
       default_options = { :message => I18n.t(:invalid_email_address, :scope => [:activerecord, :errors, :messages], :default => 'does not appear to be a valid e-mail address'),
                           :check_mx => false,
                           :mx_message => I18n.t(:email_address_not_routable, :scope => [:activerecord, :errors, :messages], :default => 'is not routable'),
-                          :with => ValidatesEmailFormatOf::Regex }
+                          :with => ValidatesEmailFormatOf::Regex ,
+                          :domain_length => 255,
+                          :local_length => 64
+                          }
       options.merge!(default_options) {|key, old, new| old}  # merge the default options into the specified options, retaining all specified options
 
       email.strip!
@@ -40,7 +45,7 @@ module ValidatesEmailFormatOf
         return [ options[:message] ]
       end
 
-      unless email =~ options[:with] and not email =~ /\.\./ and domain.length <= 255 and local.length <= 64
+      unless email =~ options[:with] and not email =~ /\.\./ and domain.length <= options[:domain_length] and local.length <= options[:local_length]
         return [ options[:message] ]
       end
       

data/test/validates_email_format_of_test.rb

@@ -66,7 +66,9 @@ class ValidatesEmailFormatOfTest < TEST_CASE
      'invalid@example.c',
      'invali d@example.com',
   # unclosed quote
-      "\"a-17180061943-10618354-1993365053",
+     "\"a-17180061943-10618354-1993365053",
+  # too many special chars used to cause the regexp to hang
+     "-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++@foo",
      'invalidexample.com',
   # should not allow special chars after a period in the domain
      'local@sub.)domain.com',
@@ -110,6 +112,11 @@ class ValidatesEmailFormatOfTest < TEST_CASE
       save_fails(p, email)
     end
   end
+  
+  def test_overriding_length_checks
+    assert_not_nil ValidatesEmailFormatOf::validate_email_format('valid@example.com', :local_length => 1)
+    assert_not_nil ValidatesEmailFormatOf::validate_email_format('valid@example.com', :domain_length => 1)
+  end
 
   def test_should_respect_validate_on_option
     p = create_person(:email => @valid_email)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: validates_email_format_of
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 5
+  version: 1.4.5
 platform: ruby
 authors: 
 - Alex Dunae
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -57,7 +56,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -66,7 +64,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"