0
@@ -1 +1 @@
0
-require 'when'
0
+require File.join(File.dirname(__FILE__), 'lib', 'when')

0
@@ -30,18 +30,19 @@ module ActiveRecordHook
0
         def execute_callback(callback, record, method)
0
           if callback.class == Symbol
0
             record.send callback
0
-          # elsif callback.class == String
0
-          #   eval callback, record.send(:binding)
0
-          # elsif callback.class == Proc ||
0
-          #     callback.class == Method
0
-          #   callback.call record
0
-          # else
0
-          #   if callback.respond_to?(method)
0
-          #     callback.send method, record
0
-          #   else
0
-          #     raise ActiveRecordError, 
0
-          #     'Callbacks must be a symbol denoting the message to send, a string to be evaluated, a block to be invoked or a class object responding to the callback message (#before_create, #after_create, etc).'
0
-          #   end
0
+          elsif callback.class == String
0
+            eval callback, record.send(:binding)
0
+          elsif callback.class == Proc || callback.class == Method
0
+            callback.call record
0
+          else
0
+            if callback.respond_to?(method)
0
+              callback.send method, record
0
+            else
0
+              raise ActiveRecordError, 'Callbacks must be a symbol denoting the message to send, 
0
+                                        a string to be evaluated, a block to be invoked or a 
0
+                                        class object responding to the callback message 
0
+                                        (#before_create, #after_create, etc).'
0
+            end
0
           end
0
         end
0
  

0
@@ -3,7 +3,7 @@ module ActiveRecordHook
0
  
0
     def self.included(klass)
0
       class << klass
0
- 
0
+
0
         validations = ActiveRecord::Validations::VALIDATIONS
0
       
0
         validations.each do |validation|

0
@@ -1,8 +1,7 @@
0
-require 'callbacks'
0
-require 'validations'
0
-require 'filters'
0
+require File.join(File.dirname(__FILE__), 'validations')
0
+require File.join(File.dirname(__FILE__), 'filters')
0
+require File.join(File.dirname(__FILE__), 'callbacks')
0
 
0
 ActiveRecord::Base.send :include, ActiveRecordHook::Callbacks
0
 ActiveRecord::Base.send :include, ActiveRecordHook::Validations
0
-
0
 ActionController::Base.send :include, ActionControllerHook::Filters

0
@@ -1,918 +1,926 @@
0
 class Company < ActiveRecord::Base
0
 
0
-  (1..114).each do |each|
0
-    attr_accessor :"attribute_#{each}"
0
-  end
0
-
0
-  before_create :before_create_if_with_proc_condition,
0
-  :if => lambda {|company| company.attribute_1 == 'before_create_if_with_proc_condition'} 
0
-  before_create :before_create_unless_with_proc_condition,
0
-  :unless => lambda {|company| company.attribute_2 == 'before_create_unless_with_proc_condition'}
0
-
0
-  def before_create_if_with_proc_condition
0
-    self.attribute_1 = 'attribute_1'
0
-  end
0
-
0
-  def before_create_unless_with_proc_condition
0
-    self.attribute_2 = 'attribute_2'
0
-  end
0
-
0
-  after_create :after_create_if_with_proc_condition,
0
-  :if => lambda {|company| company.attribute_3 == 'after_create_if_with_proc_condition'} 
0
-  after_create :after_create_unless_with_proc_condition,
0
-  :unless => lambda {|company| company.attribute_4 == 'after_create_unless_with_proc_condition'}
0
-
0
-  def after_create_if_with_proc_condition
0
-    self.attribute_3 = 'attribute_3'
0
-  end
0
-
0
-  def after_create_unless_with_proc_condition
0
-    self.attribute_4 = 'attribute_4'
0
-  end
0
-
0
-  before_save :before_save_if_with_proc_condition,
0
-  :if => lambda {|company| company.attribute_5 == 'before_save_if_with_proc_condition'} 
0
-  before_save :before_save_unless_with_proc_condition,
0
-  :unless => lambda {|company| company.attribute_6 == 'before_save_unless_with_proc_condition'}
0
-
0
-  def before_save_if_with_proc_condition
0
-    self.attribute_5 = 'attribute_5'
0
-  end
0
-
0
-  def before_save_unless_with_proc_condition
0
-    self.attribute_6 = 'attribute_6'
0
-  end
0
-
0
-  after_save :after_save_if_with_proc_condition,
0
-  :if => lambda {|company| company.attribute_7 == 'after_save_if_with_proc_condition'} 
0
-  after_save :after_save_unless_with_proc_condition,
0
-  :unless => lambda {|company| company.attribute_8 == 'after_save_unless_with_proc_condition'}
0
-
0
-  def after_save_if_with_proc_condition
0
-    self.attribute_7 = 'attribute_7'
0
-  end
0
-
0
-  def after_save_unless_with_proc_condition
0
-    self.attribute_8 = 'attribute_8'
0
-  end
0
-
0
-  before_destroy :before_destroy_if_with_proc_condition,
0
-  :if => lambda {|company| company.attribute_9 == 'before_destroy_if_with_proc_condition'}
0
-  before_destroy :before_destroy_unless_with_proc_condition,
0
-  :unless => lambda {|company| company.attribute_10 == 'be