0
@@ -21,7 +21,7 @@ module When
0
                     if callback.class == Symbol
0
                       record.send callback
0
                     elsif callback.class == String
0
-                      eval(callback, binding)
0
+                      eval(callback, record.send(:binding))
0
                     elsif callback.class == Proc || callback.class == Method
0
                       callback.call(record)
0
                     else

0
@@ -182,120 +182,108 @@ class CallbacksTest < Test::Unit::TestCase
0
 
0
   conditions.each do |condition|
0
     basic_callbacks.each do |callback| 
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_true_should_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :if => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => true
0
+        company = Company.new :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :if => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => false
0
+        company = Company.new :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :unless => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => true
0
+        company = Company.new :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :unless => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => false
0
+        company = Company.new :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
     end
0
     
0
     update_callbacks.each do |callback| 
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_true_should_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :if => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
         company = Company.create :flag => true
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :if => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => false
0
+        company = Company.create :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :unless => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => true
0
+        company = Company.create :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        Company.send callback.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_name" do
0
+        Company.send callback.to_sym, 'change_name', :unless => condition
0
 
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => false
0
+        company = Company.create :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
     end
0
     
0
     destroy_callbacks.each do |callback|
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_toggle_class_flag" do
0
-        Company.send callback.to_sym, 'self.flag = ! flag; true;', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_true_should_toggle_flag" do
0
+        Company.send callback.to_sym, 'toggle_flag; true', :if => condition
0
 
0
-        Company.flag = true
0
         company = Company.new :flag => true
0
         assert company.save
0
         assert company.destroy
0
-        assert ! Company.flag
0
+        assert ! company.flag
0
       end
0
       
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_false_should_not_toggle_class_flag" do
0
-        Company.send callback.to_sym, 'self.flag = ! flag', :if => condition
0
+      define_method "test_#{callback}_with_string_callback_with_if_condition_#{condition.class}_which_returns_false_should_not_toggle_flag" do
0
+        Company.send callback.to_sym, 'toggle_flag', :if => condition
0
 
0
-        Company.flag = false
0
         company = Company.new :flag => false
0
         assert company.save
0
         assert company.destroy
0
-        assert ! Company.flag
0
+        assert ! company.flag
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_true_should_not_toggle_class_flag" do
0
-        Company.send callback.to_sym, 'self.flag = ! flag', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_true_should_not_toggle_flag" do
0
+        Company.send callback.to_sym, 'toggle_flag', :unless => condition
0
 
0
-        Company.flag = true
0
         company = Company.new :flag => true
0
         assert company.save
0
         assert company.destroy
0
-        assert Company.flag
0
+        assert company.flag
0
       end
0
       
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_toggle_class_flag" do
0
-        Company.send callback.to_sym, 'self.flag = ! flag', :unless => condition
0
+      define_method "test_#{callback}_with_string_callback_unless_condition_#{condition.class}_which_returns_false_should_toggle_flag" do
0
+        Company.send callback.to_sym, 'toggle_flag', :unless => condition
0
 
0
-        Company.flag = false
0
         company = Company.new :flag => false
0
         assert company.save
0
         assert company.destroy
0
-        assert Company.flag
0
+        assert company.flag
0
       end
0
     end
0
   end

0
@@ -1,15 +1,5 @@
0
 class CompaniesController < ActionController::Base
0
 
0
-  @@bio = nil
0
-  class << self
0
-    def bio
0
-      @@bio
0
-    end
0
-    def bio=(bio)
0
-      @@bio = bio
0
-    end
0
-  end
0
-
0
   attr_accessor :flag,
0
     :name
0
 

0
@@ -1,25 +1,5 @@
0
 class Company < ActiveRecord::Base
0
 
0
-  @@bio = nil
0
-  class << self
0
-    def bio
0
-      @@bio
0
-    end
0
-    def bio=(bio)
0
-      @@bio = bio
0
-    end
0
-  end
0
-
0
-  @@flag = nil
0
-  class << self
0
-    def flag
0
-      @@flag
0
-    end
0
-    def flag=(flag)
0
-      @@flag = flag
0
-    end
0
-  end
0
-    
0
   attr_accessor :flag
0
 
0
   def change_name

0
@@ -119,78 +119,70 @@ class ValidationsTest < Test::Unit::TestCase
0
   
0
   conditions.each do |condition|
0
     basic_validations.each do |validation| 
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{validation}_with_string_callback_with_if_condition_#{condition.class}_which_returns_true_should_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :if => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => true
0
+        company = Company.new :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
       
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{validation}_with_string_callback_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :if => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => false
0
+        company = Company.new :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{validation}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :unless => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => true
0
+        company = Company.new :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
 
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{validation}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :unless => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.new :flag => false
0
+        company = Company.new :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
     end
0
     
0
     update_validations.each do |validation|
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{validation}_with_string_callback_with_if_condition_#{condition.class}_which_returns_true_should_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :if => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => true
0
+        company = Company.create :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
       
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :if => condition
0
+      define_method "test_#{validation}_with_string_callback_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :if => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => false
0
+        company = Company.create :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
       
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{validation}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :unless => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => true
0
+        company = Company.create :name => 'thoughtbot', :flag => true
0
         assert company.save
0
-        assert_equal 'thoughtbot', Company.bio
0
+        assert_equal 'thoughtbot', company.name
0
       end
0
 
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        Company.send validation.to_sym, 'self.bio = "new bio"', :unless => condition
0
+      define_method "test_#{validation}_with_string_callback_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_name" do
0
+        Company.send validation.to_sym, 'change_name', :unless => condition
0
         
0
-        Company.bio = 'thoughtbot'
0
-        company = Company.create :flag => false
0
+        company = Company.create :name => 'thoughtbot', :flag => false
0
         assert company.save
0
-        assert_equal 'new bio', Company.bio
0
+        assert_equal 'new name', company.name
0
       end
0
     end
0
   end