0
@@ -11,9 +11,9 @@ module When
0
           src = <<-END
0
             def #{callback}_with_conditions(*callbacks, &block)
0
               options = callbacks.extract_options!
0
-              if block_given?
0
-                callbacks << block
0
-              end
0
+#               if block_given?
0
+#                 callbacks << block
0
+#               end
0
               callbacks.each do |callback|
0
                 #{callback}_without_conditions do |record|
0
                   unless (! options[:if].nil? && ! evaluate_condition(options[:if], record)) ||
0
@@ -22,8 +22,8 @@ module When
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
+#                     elsif callback.class == Proc || callback.class == Method
0
+#                       callback.call(record)
0
                     else
0
                       raise ActiveRecord::ActiveRecordError, 
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
@@ -9,9 +9,9 @@ module When
0
           src = <<-END
0
             def #{filter}_with_conditions(*filters, &block)
0
               options = filters.extract_options!
0
-              if block_given?
0
-                options << block
0
-              end
0
+#               if block_given?
0
+#                 options << block
0
+#               end
0
               filters.each do |filter|
0
                 #{filter}_without_conditions(options) do |controller|
0
                   unless (! options[:if].nil? && ! ActiveRecord::Base.evaluate_condition(options[:if], controller)) ||
0
@@ -20,8 +20,8 @@ module When
0
                       controller.send filter
0
                     elsif filter.class == String
0
                       eval(filter, binding)
0
-                    elsif filter.class == Proc || filter.class == Method
0
-                      filter.call(controller)
0
+#                     elsif filter.class == Proc || filter.class == Method
0
+#                       filter.call(controller)
0
                     else
0
                       raise ActionController::ActionControllerError, 
0
                         "Filters 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
@@ -180,6 +180,126 @@ class CallbacksTest < Test::Unit::TestCase
0
     end
0
   end
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => true
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => false
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => true
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => false
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+
0
+        Company.flag = true
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert company.destroy
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
+
0
+        Company.flag = false
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert company.destroy
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
+
0
+        Company.flag = true
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert company.destroy
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
+
0
+        Company.flag = false
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert company.destroy
0
+        assert Company.flag
0
+      end
0
+    end
0
+  end
0
+
0
   def teardown
0
     Object.class_eval do
0
       remove_const Company.to_s if const_defined? Company.to_s

0
@@ -195,6 +195,154 @@ class FiltersTest < ActionController::TestCase
0
     end
0
   end
0
 
0
+  conditions.each do |condition|
0
+    basic_filters.each do |filter|
0
+      define_method "test_#{filter}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :index
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :index
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+
0
+      define_method "test_#{filter}_with_only_option_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :show
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_only_option_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_only_option_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_only_option_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :show
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+
0
+      define_method "test_#{filter}_with_except_option_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :index
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_except_option_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :if => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_except_option_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = true
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :index
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+      end
0
+      
0
+      define_method "test_#{filter}_with_except_option_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
+        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :unless => condition
0
+
0
+        CompaniesController.bio = 'thoughtbot'
0
+        @controller.flag = false
0
+
0
+        get :show
0
+        assert_equal 'thoughtbot', CompaniesController.bio
0
+
0
+        get :index
0
+        assert_equal 'new bio', CompaniesController.bio
0
+      end
0
+    end
0
+  end
0
+
0
   def teardown
0
     Object.class_eval do
0
       remove_const CompaniesController.to_s if const_defined? CompaniesController.to_s

0
@@ -1,5 +1,15 @@
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,5 +1,25 @@
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
@@ -72,7 +72,7 @@ class ValidationsTest < Test::Unit::TestCase
0
         assert company.save
0
         assert_equal 'new name', company.name
0
       end
0
-    
0
+      
0
       define_method "test_#{validation}_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
@@ -80,7 +80,7 @@ class ValidationsTest < Test::Unit::TestCase
0
         assert company.save
0
         assert_equal 'thoughtbot', company.name
0
       end
0
-    
0
+      
0
       define_method "test_#{validation}_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
@@ -117,6 +117,84 @@ class ValidationsTest < Test::Unit::TestCase
0
     end
0
   end
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => true
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.new :flag => false
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => true
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => false
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => true
0
+        assert company.save
0
+        assert_equal 'thoughtbot', Company.bio
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
+        
0
+        Company.bio = 'thoughtbot'
0
+        company = Company.create :flag => false
0
+        assert company.save
0
+        assert_equal 'new bio', Company.bio
0
+      end
0
+    end
0
+  end
0
+
0
   def teardown
0
     Object.class_eval do
0
       remove_const Company.to_s if const_defined? Company.to_s