0
@@ -17,9 +17,13 @@ module When
0
                       (! options[:unless].nil? && evaluate_condition(options[:unless], record))
0
                     if callback.class == Symbol
0
                       record.send callback
0
+                    elsif callback.class == String
0
+                      eval(callback, binding)
0
+                    elsif callback.class == Proc || callback.class == Method
0
+                      callback.call(record)
0
                     else
0
                       raise ActiveRecord::ActiveRecordError, 
0
-                        'When only supports Symbol callbacks, refactor to use a Symbol or remove When'
0
+                        "Callbacks must be a symbol denoting the method to call, a string to be evaluated, a block to be invoked, or an object responding to the callback method."
0
                     end
0
                   end
0
                 end

0
@@ -50,8 +50,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         assert_equal 'new name', company.name
0
       end
0
 
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :if => condition
0
+      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :if => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => true
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -59,8 +59,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :unless => condition
0
+      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :unless => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => false
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -102,8 +102,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         assert_equal 'new name', company.name
0
       end
0
 
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :if => condition
0
+      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :if => condition
0
 
0
         company = Company.create :name => 'thoughtbot', :flag => true
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -111,8 +111,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :unless => condition
0
+      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :unless => condition
0
 
0
         company = Company.create :name => 'thoughtbot', :flag => false
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -158,8 +158,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         assert company.flag
0
       end
0
 
0
-      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :if => condition
0
+      define_method "test_#{callback}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :if => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => true
0
         assert company.save
0
@@ -168,8 +168,8 @@ class CallbacksTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send callback.to_sym, "'puts #{callback}'", :unless => condition
0
+      define_method "test_#{callback}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send callback.to_sym, [], :unless => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => false
0
         assert company.save

0
@@ -45,8 +45,8 @@ class ValidationsTest < Test::Unit::TestCase
0
         assert_equal 'new name', company.name
0
       end
0
 
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send validation.to_sym, "'puts #{validation}'", :if => condition
0
+      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send validation.to_sym, [], :if => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => true
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -54,8 +54,8 @@ class ValidationsTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send validation.to_sym, "'puts #{validation}'", :unless => condition
0
+      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send validation.to_sym, [], :unless => condition
0
 
0
         company = Company.new :name => 'thoughtbot', :flag => false
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -97,8 +97,8 @@ class ValidationsTest < Test::Unit::TestCase
0
         assert_equal 'new name', company.name
0
       end
0
 
0
-      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send validation.to_sym, "'puts #{validation}'", :if => condition
0
+      define_method "test_#{validation}_with_if_condition_#{condition.class}_which_returns_true_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send validation.to_sym, [], :if => condition
0
 
0
         company = Company.create :name => 'thoughtbot', :flag => true
0
         assert_raises(ActiveRecord::ActiveRecordError) do 
0
@@ -106,8 +106,8 @@ class ValidationsTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_symbol" do
0
-        Company.send validation.to_sym, "'puts #{validation}'", :unless => condition
0
+      define_method "test_#{validation}_with_unless_condition_#{condition.class}_which_returns_false_should_raise_an_exception_if_its_callback_is_not_a_supported_type" do
0
+        Company.send validation.to_sym, [], :unless => condition
0
 
0
         company = Company.create :name => 'thoughtbot', :flag => false
0
         assert_raises(ActiveRecord::ActiveRecordError) do