0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 [tonka]
0
+
0
 * Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 [Nicholas Seckar]
0
 
0
 * Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 [daniel@nightrunner.com]

0
@@ -228,6 +228,7 @@ module ActiveRecord
0
       def validates_confirmation_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
 
0
         for attr_name in attr_names
0
           attr_accessor "#{attr_name}_confirmation"
0
@@ -253,10 +254,11 @@ module ActiveRecord
0
       def validates_acceptance_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
 
0
         for attr_name in attr_names
0
           attr_accessor(attr_name)
0
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', '#{configuration[:message]}') unless #{attr_name}.nil? or #{attr_name} == "1"}))
0
+          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name}.nil? or #{attr_name} == "1"}))
0
         end
0
       end
0
 
0
@@ -268,6 +270,7 @@ module ActiveRecord
0
       def validates_presence_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:empty], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
 
0
         for attr_name in attr_names
0
           class_eval(%(#{validation_method(configuration[:on])} %{errors.add_on_empty('#{attr_name}', "#{configuration[:message]}")}))
0
@@ -411,12 +414,13 @@ module ActiveRecord
0
       def validates_uniqueness_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
 
0
         for attr_name in attr_names
0
           if scope = configuration[:scope]
0
-            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
0
+            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
0
           else
0
-            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ?", #{attr_name}, id])}))
0
+            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ?", #{attr_name}, id])}))
0
           end
0
         end
0
       end
0
@@ -437,6 +441,7 @@ module ActiveRecord
0
       def validates_format_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save, :with => nil }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
 
0
         raise(ArgumentError, "A regular expression must be supplied as the :with option of the configuration hash") unless configuration[:with].is_a?(Regexp)
0
 
0
@@ -459,6 +464,8 @@ module ActiveRecord
0
       def validates_inclusion_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
+
0
         enum = configuration[:in] || configuration[:within]
0
         allow_nil = configuration[:allow_nil]
0
 
0
@@ -497,6 +504,7 @@ module ActiveRecord
0
       def validates_associated(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
+        configuration[:message].gsub!(/\"/, '\\\\\"')
0
         
0
         for attr_name in attr_names
0
           class_eval(%(#{validation_method(configuration[:on])} %{

0
@@ -522,4 +522,86 @@ class ValidationsTest < Test::Unit::TestCase
0
     assert_equal 100, d.salary
0
     assert_equal "100,000", d.salary_before_type_cast
0
   end
0
+
0
+  def test_validates_acceptance_of_with_custom_error_using_quotes
0
+    Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.salary = "0"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_confirmation_of_with_custom_error_using_quotes
0
+    Developer.validates_confirmation_of :name, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "John"
0
+    d.name_confirmation = "Johnny"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_format_of_with_custom_error_using_quotes
0
+    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "John 32"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_inclusion_of_with_custom_error_using_quotes
0
+    Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.salary = "90,000"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_length_of_with_custom_too_long_using_quotes
0
+    Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "Jeffrey"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_length_of_with_custom_too_short_using_quotes
0
+    Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "Joe"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_length_of_with_custom_message_using_quotes
0
+    Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "Joe"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_presence_of_with_custom_message_using_quotes
0
+    Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "Joe"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:non_existent), "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_uniqueness_of_with_custom_message_using_quotes
0
+    Developer.validates_uniqueness_of :name, :message=> "This string contains 'single' and \"double\" quotes"
0
+    d = Developer.new
0
+    d.name = "David"
0
+    assert !d.valid?
0
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
+
0
+  def test_validates_associated_with_custom_message_using_quotes
0
+    Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
0
+    Topic.validates_presence_of :content
0
+    r = Reply.create("title" => "A reply", "content" => "with content!")
0
+    r.topic = Topic.create("title" => "uhohuhoh")
0
+    assert !r.valid?
0
+    assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
0
+  end
0
 end