@@ -82,9 +82,9 @@ module CollectiveIdea #:nodoc:
attr_protected :audit_ids if options[:protect]
Audit.audited_class_names << self.to_s
- after_create :audit_create_callback
- before_update :audit_update_callback
- after_destroy :audit_destroy_callback
+ after_create :audit_create
+ before_update :audit_update
+ after_destroy :audit_destroy
attr_accessor :version
@@ -200,14 +200,6 @@ module CollectiveIdea #:nodoc:
def write_audit(attrs)
self.audits.create attrs if auditing_enabled
end
-
- CALLBACKS.each do |attr_name|
- alias_method "#{attr_name}_callback".to_sym, attr_name
- end
-
- def empty_callback #:nodoc:
- end
-
end # InstanceMethods
module SingletonMethods
@@ -236,22 +228,6 @@ module CollectiveIdea #:nodoc:
write_inheritable_attribute :auditing_enabled, true
end
- def disable_auditing_callbacks
- class_eval do
- CALLBACKS.each do |attr_name|
- alias_method "#{attr_name}_callback", :empty_callback
- end
- end
- end
-
- def enable_auditing_callbacks
- class_eval do
- CALLBACKS.each do |attr_name|
- alias_method "#{attr_name}_callback".to_sym, attr_name
- end
- end
- end
-
# All audit operations during the block are recorded as being
# made by +user+. This is not model specific, the method is a
# convenience wrapper around #Audit.as_user.
lib/acts_as_audited.rb
@@ -295,15 +295,6 @@ module CollectiveIdea
User.without_auditing { User.create(:name => 'Brandon') }
end.should_not change { Audit.count }
end
-
- should "not save an audit when callbacks are disabled" do
- begin
- User.disable_auditing_callbacks
- lambda { create_user }.should_not change { Audit.count }
- ensure
- User.enable_auditing_callbacks
- end
- end
end
context "attr_protected and attr_accessible" do
test/acts_as_audited_test.rb
4ba50a9035d8a9a1b34dba072a75a15d1b246a24
Brandon Keepers
brandon@collectiveidea.com
http://github.com/collectiveidea/acts_as_audited/commit/21148d7568c293eb4fc4f9d93a793ac6a924ff91
21148d7568c293eb4fc4f9d93a793ac6a924ff91
2009-11-01T09:18:06-08:00
2009-11-01T08:48:39-08:00
Remove unnecessary aliasing of callbacks that is no longer used internally
dd3d1132e8ee09c1f3060c6fe35ea709a1ce05a8
Brandon Keepers
brandon@collectiveidea.com