validates_as_email_address 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.2.1 / 2008-01-11
+
+* Ensure correct encoding for regular expressions to be compatible with Ruby 1.9+
+
 == 0.2.0 / 2008-12-14
 
 * Remove the PluginAWeek namespace

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.2.0'
+  s.version           = '0.2.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for validating the format/length of email addresses'
   

data/lib/validates_as_email_address.rb

@@ -14,25 +14,35 @@ module ValidatesAsEmailAddress
   # limits, i.e. between 3 and 320 characters in length.
   # 
   # Configuration options for length:
-  # * +minimum+ - The minimum size of the attribute
-  # * +maximum+ - The maximum size of the attribute
-  # * +is+ - The exact size of the attribute
-  # * +within+ - A range specifying the minimum and maximum size of the attribute
-  # * +in+ - A synonym(or alias) for :within
-  # * +too_long+ - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %d characters)")
-  # * +too_short+ - The error message if the attribute goes under the minimum (default is: "is too short (minimum is %d characters)")
-  # * +wrong_length+ - The error message if using the :is method and the attribute is the wrong size (default is: "is the wrong length (should be %d characters)")
+  # * <tt>:minimum</tt> - The minimum size of the attribute
+  # * <tt>:maximum</tt> - The maximum size of the attribute
+  # * <tt>:is</tt> - The exact size of the attribute
+  # * <tt>:within</tt> - A range specifying the minimum and maximum size of the
+  #   attribute
+  # * <tt>:in</tt> - A synonym (or alias) for <tt>:within</tt>
+  # * <tt>:too_long</tt> - The error message if the attribute goes over the
+  #   maximum (default is: "is too long (maximum is %d characters)")
+  # * <tt>:too_short</tt> - The error message if the attribute goes under the
+  #   minimum (default is: "is too short (minimum is %d characters)")
+  # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt>
+  #   method and the attribute is the wrong size (default is:
+  #   "is the wrong length (should be %d characters)")
   # 
   # Configuration options for format:
-  # * +wrong_format+ - A custom error message (default is: "is an invalid email address")
+  # * <tt>:wrong_format</tt> - A custom error message (default is:
+  #   "is an invalid email address")
   # 
   # Miscellaneous configuration options:
-  # * +allow_nil+ - Attribute may be nil; skip validation.
-  # * +on+ - Specifies when this validation is active (default is :save, other options :create, :update)
-  # * +if+ - Specifies a method, proc or string to call to determine if the validation should
-  # occur (e.g. :if => :allow_validation, or :if => lambda { |user| user.signup_step > 2 }).  The
-  # method, proc or string should return or evaluate to a true or false value.
-  # * +strict+ - Specifies if the domain part of the email should be compliant to RFC 1035 (default is true). If set to false domains such as '-online.com', '[127.0.0.1]' become valid.
+  # * <tt>:allow_nil</tt> - Attribute may be nil; skip validation.
+  # * <tt>:on</tt> - Specifies when this validation is active (default is
+  #   :save, other options :create, :update)
+  # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
+  #   the validation should occur (e.g. :if => :allow_validation, or
+  #   :if => lambda { |user| user.signup_step > 2 }).  The method, proc or
+  #   string should return or evaluate to a true or false value.
+  # * <tt>:strict</tt> - Specifies if the domain part of the email should be
+  #   compliant to RFC 1035 (default is true). If set to false domains such as
+  #   '-online.com', '[127.0.0.1]' become valid.
   def validates_as_email_address(*attr_names)
     configuration = attr_names.last.is_a?(Hash) ? attr_names.pop : {}
     configuration.reverse_merge!(

data/lib/validates_as_email_address/rfc_1035.rb

@@ -4,8 +4,8 @@ module ValidatesAsEmailAddress
     # 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]"
+      digit = '[\\d]'
+      letter = '[\\x61-\\x7a\\x41-\\x5a]'
       let_dig = "(?:#{letter}|#{digit})"
       let_dig_hyp = "(?:#{let_dig}|[\\x2d])"
       label = "#{let_dig}(?:#{let_dig_hyp}*#{let_dig})?"
@@ -20,6 +20,7 @@ module ValidatesAsEmailAddress
       local_part = RFC822::LocalPart.source
       domain = Domain.source
       addr_spec = "(#{local_part})\\x40(#{domain})"
+      addr_spec.force_encoding('binary') if addr_spec.respond_to?(:force_encoding)
       
       /\A#{addr_spec}\z/
     end

data/lib/validates_as_email_address/rfc_822.rb

@@ -14,11 +14,13 @@ module ValidatesAsEmailAddress
       # Local part
       word = "(?:#{atom}|#{quoted_string})"
       local_part = "#{word}(?:\\x2e#{word})*"
+      local_part.force_encoding('binary') if local_part.respond_to?(:force_encoding)
       
       # Domain
       domain_ref = atom
       sub_domain = "(?:#{domain_ref}|#{domain_literal})"
       domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
+      domain.force_encoding('binary') if domain.respond_to?(:force_encoding)
       
       [/#{local_part}/, /#{domain}/]
     end
@@ -28,6 +30,7 @@ module ValidatesAsEmailAddress
       local_part = LocalPart.source
       domain = Domain.source
       addr_spec = "(#{local_part})\\x40(#{domain})"
+      addr_spec.force_encoding('binary') if addr_spec.respond_to?(:force_encoding)
       
       /\A#{addr_spec}\z/
     end

data/test/unit/validates_as_email_address_test.rb

@@ -186,28 +186,28 @@ class ValidatesAsEmailAddressTest < Test::Unit::TestCase
   end
   
   def test_should_validate_if_if_is_true
-    User.validates_as_email_address :email, :if => lambda {true}
+    User.validates_as_email_address :email, :if => lambda {|user| true}
     
     user = new_user(:email => 'a')
     assert !user.valid?
   end
   
   def test_should_not_validate_if_if_is_false
-    User.validates_as_email_address :email, :if => lambda {false}
+    User.validates_as_email_address :email, :if => lambda {|user| false}
     
     user = new_user(:email => 'a')
     assert user.valid?
   end
   
   def test_should_validate_if_unless_is_false
-    User.validates_as_email_address :email, :unless => lambda {false}
+    User.validates_as_email_address :email, :unless => lambda {|user| false}
     
     user = new_user(:email => 'a')
     assert !user.valid?
   end
   
   def test_should_not_validate_if_unless_is_true
-    User.validates_as_email_address :email, :unless => lambda {true}
+    User.validates_as_email_address :email, :unless => lambda {|user| true}
     
     user = new_user(:email => 'a')
     assert user.valid?
@@ -237,4 +237,12 @@ class ValidatesAsEmailAddressUnrestrictedTest < Test::Unit::TestCase
       assert user.valid?, "#{address} should be legal."
     end
   end
+  
+  def teardown
+    User.class_eval do
+      @validate_callbacks = ActiveSupport::Callbacks::CallbackChain.new
+      @validate_on_create_callbacks = ActiveSupport::Callbacks::CallbackChain.new
+      @validate_on_update_callbacks = ActiveSupport::Callbacks::CallbackChain.new
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_as_email_address
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -05:00
+date: 2009-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: []