Pass the right binding when string is passed to :if with validations. [caspercg] Closes #9300

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 23 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index dcc8caa84d..f259c2bbb6 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -334,7 +334,7 @@ module ActiveRecord
       def evaluate_condition(condition, record)
         case condition
           when Symbol: record.send(condition)
-          when String: eval(condition, binding)
+          when String: eval(condition, record.send(:binding))
           else
             if condition_block?(condition)
               condition.call(record)
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index 847e11a747..47a4d4d034 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -1127,6 +1127,28 @@ class ValidationsTest < Test::Unit::TestCase
     assert !t.valid?
     assert_equal "can't be blank", t.errors.on("title").first
  end
+
+  # previous implementation of validates_presence_of eval'd the 
+  # string with the wrong binding, this regression test is to 
+  # ensure that it works correctly
+  def test_validation_with_if_as_string
+    Topic.validates_presence_of(:title)
+    Topic.validates_presence_of(:author_name, :if => "title.to_s.match('important')")
+
+    t = Topic.new
+    assert !t.valid?, "A topic without a title should not be valid"
+    assert !t.errors.invalid?("author_name"), "A topic without an 'important' title should not require an author"
+
+    t.title = "Just a title"
+    assert t.valid?, "A topic with a basic title should be valid"
+
+    t.title = "A very important title"
+    assert !t.valid?, "A topic with an important title, but without an author, should not be valid"
+    assert t.errors.invalid?("author_name"), "A topic with an 'important' title should require an author"
+
+    t.author_name = "Hubert J. Farnsworth"
+    assert t.valid?, "A topic with an important title and author should be valid"
+  end
 end