validates_as_email_address 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.1.1 / 2008-10-25
+
+* Fix major performance hit on long domains when in strict mode
+* Fix single-character/digit domains not being allowed in strict mode
+
 == 0.1.0 / 2008-09-07
 
 * Allow all options to be passed to format/length validations so that future options can be defined without changing this plugin

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'validates_as_email_address'
-  s.version           = '0.1.0'
+  s.version           = '0.1.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for validating the format/length of email addresses'
   

data/lib/validates_as_email_address/rfc_1035.rb

@@ -2,13 +2,14 @@ module PluginAWeek #:nodoc:
   module ValidatesAsEmailAddress
     # The standard describing the format of domains
     module RFC1035
-      # Matches domain according to the RFC 1035 standard
+      # Matches domain according to the RFC 1035 standard, with the exception
+      # that domains can start with a letter *or* digit
       Domain = begin
         digit = "[\\d]"
         letter = "[\\x61-\\x7a\\x41-\\x5a]"
         let_dig = "(?:#{letter}|#{digit})"
-        ldh_str = "(?:#{let_dig}|[\\x2d])+"
-        label = "#{let_dig}(?:(?:#{ldh_str})*#{let_dig})"
+        let_dig_hyp = "(?:#{let_dig}|[\\x2d])"
+        label = "#{let_dig}(?:#{let_dig_hyp}*#{let_dig})?"
         subdomain = "(?:#{label}\\.)*#{label}"
         domain = "(?:#{subdomain}|\\x20)"
         

data/test/factory.rb

@@ -13,12 +13,16 @@ module Factory
   def valid_attributes_for(model, attributes = {})
     name = model.to_s.underscore
     send("#{name}_attributes", attributes)
+    attributes.stringify_keys!
     attributes
   end
   
   # Build an unsaved record
   def new_record(model, *args)
-    model.new(valid_attributes_for(model, *args))
+    attributes = valid_attributes_for(model, *args)
+    record = model.new(attributes)
+    attributes.each {|attr, value| record.send("#{attr}=", value) if model.accessible_attributes && !model.accessible_attributes.include?(attr) || model.protected_attributes && model.protected_attributes.include?(attr)}
+    record
   end
   
   # Build and save/reload a record

data/test/test_helper.rb

@@ -8,6 +8,6 @@ ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
 
 # Mixin the factory helper
 require File.expand_path("#{File.dirname(__FILE__)}/factory")
-class Test::Unit::TestCase #:nodoc:
+Test::Unit::TestCase.class_eval do
   include Factory
 end

data/test/unit/validates_as_email_address_test.rb

@@ -9,10 +9,16 @@ class ValidatesAsEmailAddressByDefaultTest < Test::Unit::TestCase
     user = new_user(:email => 'a@')
     assert !user.valid?
     assert_equal 2, Array(user.errors.on(:email)).size
+    
+    user.email = 'a@a'
+    assert user.valid?
   end
   
   def test_should_not_allow_email_addresses_longer_than_320_characters
-    user = new_user(:email => 'a@' + 'a' * 315 + '.com')
+    user = new_user(:email => 'a@' + 'a' * 318)
+    assert user.valid?
+    
+    user.email += 'a'
     assert !user.valid?
     assert_equal 1, Array(user.errors.on(:email)).size
   end
@@ -45,8 +51,8 @@ class ValidatesAsEmailAddressByDefaultTest < Test::Unit::TestCase
   def test_should_not_allow_illegal_rfc1035_formats
     [
       'test@[127.0.0.1]',
-      'test@-domain_not_starting_with_letter.com',
-      'test@domain_not_ending_with_alphanum-.com'
+      'test@-domain-not-starting-with-letter.com',
+      'test@domain-not-ending-with-alphanum-.com'
     ].each do |address|
       user = new_user(:email => address)
       assert !user.valid?, "#{address} should be illegal."
@@ -66,34 +72,34 @@ class ValidatesAsEmailAddressTest < Test::Unit::TestCase
   def test_should_allow_minimum_length
     User.validates_as_email_address :email, :minimum => 8
     
-    user = new_user(:email => 'a@aa.com')
+    user = new_user(:email => 'a@' + 'a' * 6)
     assert user.valid?
     
-    user = new_user(:email => 'a@a.com')
+    user.email.chop!
     assert !user.valid?
   end
   
   def test_should_not_check_maximum_length_if_minimum_length_defined
     User.validates_as_email_address :email, :minimum => 10
     
-    user = new_user(:email => 'a@' + 'a' * 315 + '.com')
+    user = new_user(:email => 'a@' + 'a' * 319)
     assert user.valid?
   end
   
   def test_should_allow_maximum_length
     User.validates_as_email_address :email, :maximum => 8
     
-    user = new_user(:email => 'a@aa.com')
+    user = new_user(:email => 'a@' + 'a' * 6)
     assert user.valid?
     
-    user = new_user(:email => 'a@aaa.com')
+    user.email += 'a'
     assert !user.valid?
   end
   
   def test_should_not_check_minimum_length_if_maximum_length_defined
     User.validates_as_email_address :email, :maximum => 8
     
-    user = new_user(:email => 'a@a')
+    user = new_user(:email => 'a@')
     assert !user.valid?
     assert_equal 1, Array(user.errors.on(:email)).size
   end
@@ -101,52 +107,52 @@ class ValidatesAsEmailAddressTest < Test::Unit::TestCase
   def test_should_allow_exact_length
     User.validates_as_email_address :email, :is => 8
     
-    user = new_user(:email => 'a@aa.com')
+    user = new_user(:email => 'a@' + 'a' * 6)
     assert user.valid?
     
-    user = new_user(:email => 'a@a.com')
+    user.email.chop!
     assert !user.valid?
     
-    user = new_user(:email => 'a@aaa.com')
+    user.email += 'aa'
     assert !user.valid?
   end
   
   def test_should_allow_within_range
-    User.validates_as_email_address :email, :within => 8..10
+    User.validates_as_email_address :email, :within => 8..9
     
-    user = new_user(:email => 'a@a.com')
+    user = new_user(:email => 'a@' + 'a' * 5)
     assert !user.valid?
     
-    user = new_user(:email => 'a@aa.com')
+    user.email += 'a'
     assert user.valid?
     
-    user = new_user(:email => 'a@aaaa.com')
+    user.email += 'a'
     assert user.valid?
     
-    user = new_user(:email => 'a@aaaaa.com')
+    user.email += 'a'
     assert !user.valid?
   end
   
   def test_should_allow_in_range
-    User.validates_as_email_address :email, :in => 8..10
+    User.validates_as_email_address :email, :in => 8..9
     
-    user = new_user(:email => 'a@a.com')
+    user = new_user(:email => 'a@' + 'a' * 5)
     assert !user.valid?
     
-    user = new_user(:email => 'a@aa.com')
+    user.email += 'a'
     assert user.valid?
     
-    user = new_user(:email => 'a@aaaa.com')
+    user.email += 'a'
     assert user.valid?
     
-    user = new_user(:email => 'a@aaaaa.com')
+    user.email += 'a'
     assert !user.valid?
   end
   
   def test_should_allow_too_long_message
     User.validates_as_email_address :email, :too_long => 'custom'
     
-    user = new_user(:email => 'a@' + 'a' * 315 + '.com')
+    user = new_user(:email => 'a@' + 'a' * 319)
     user.valid?
     
     assert_equal 'custom', Array(user.errors.on(:email)).last
@@ -171,9 +177,9 @@ class ValidatesAsEmailAddressTest < Test::Unit::TestCase
   end
   
   def test_should_allow_wrong_format_message
-    User.validates_as_email_address :email, :is => 8, :wrong_format => 'custom'
+    User.validates_as_email_address :email, :wrong_format => 'custom'
     
-    user = new_user(:email => 'a@a')
+    user = new_user(:email => 'a@!')
     user.valid?
     
     assert_equal 'custom', Array(user.errors.on(:email)).first
@@ -224,8 +230,8 @@ class ValidatesAsEmailAddressUnrestrictedTest < Test::Unit::TestCase
   def test_should_allow_illegal_rfc1035_formats
     [
       'test@[127.0.0.1]',
-      'test@-domain_not_starting_with_letter.com',
-      'test@domain_not_ending_with_alphanum-.com'
+      'test@-domain-not-starting-with-letter.com',
+      'test@domain-not-ending-with-alphanum-.com'
     ].each do |address|
       user = new_user(:email => address)
       assert user.valid?, "#{address} should be legal."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_as_email_address
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: []