acts_as_audited 1.0.1 → 1.0.2

data/README

@@ -9,8 +9,7 @@ The purpose of this fork is to store both the previous values and the changed va
 * acts_as_audited can be installed as a gem:
     
     # config/environment.rb
-    config.gem 'collectiveidea-acts_as_audited', :lib => false,
-      :source => 'http://gems.github.com'
+    config.gem 'acts_as_audited', :lib => false, :source => 'http://gemcutter.org'
 
   or a plugin:
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/acts_as_audited.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_audited}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2009-09-28}
+  s.date = %q{2009-10-29}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/acts_as_audited/audit_sweeper.rb

@@ -27,7 +27,7 @@ module CollectiveIdea #:nodoc:
         # You can also specify an options hash which will be passed on to
         # Rails' cache_sweeper call:
         #
-        #    audit User, :only => [:create, :edit, :destroy]
+        #    audit User, :only => [:create, :edit, :destroy],
         #
         def audit(*models)
           options = models.extract_options!
@@ -39,16 +39,12 @@ module CollectiveIdea #:nodoc:
 
           models.each do |(model, model_options)|
             model.send :acts_as_audited, model_options || {}
-
-            # disable ActiveRecord callbacks, which are replaced by the AuditSweeper
-            model.send :disable_auditing_callbacks
-            
-            # prevent observer from being registered multiple times
-            model.delete_observer(AuditSweeper.instance)
-            model.add_observer(AuditSweeper.instance)      
           end
 
           class_eval do
+            # prevent observer from being registered multiple times
+            Audit.delete_observer(AuditSweeper.instance)
+            Audit.add_observer(AuditSweeper.instance)      
             cache_sweeper :audit_sweeper, options
           end
         end
@@ -59,21 +55,11 @@ module CollectiveIdea #:nodoc:
 end
 
 class AuditSweeper < ActionController::Caching::Sweeper #:nodoc:
-
-  def after_create(record)
-    record.send(:audit_create, current_user)
-  end
-
-  def after_destroy(record)
-    record.send(:audit_destroy, current_user)
-  end
-
-  def before_update(record)
-    record.send(:audit_update, current_user)
+  def before_create(record)
+    record.user ||= current_user
   end
 
   def current_user
     controller.send :current_user if controller.respond_to?(:current_user, true)
   end
-
 end

data/lib/acts_as_audited.rb

@@ -183,18 +183,18 @@ module CollectiveIdea #:nodoc:
           audits.find(:all, :conditions => ['version <= ?', version])
         end
 
-        def audit_create(user = nil)
-          write_audit(:action => 'create', :changes => audited_attributes, :user => user)
+        def audit_create
+          write_audit(:action => 'create', :changes => audited_attributes)
         end
 
-        def audit_update(user = nil)
+        def audit_update
           unless (changes = audited_changes).empty?
-            write_audit(:action => 'update', :changes => changes, :user => user)
+            write_audit(:action => 'update', :changes => changes)
           end
         end
 
-        def audit_destroy(user = nil)
-          write_audit(:action => 'destroy', :user => user, :changes => audited_attributes)
+        def audit_destroy
+          write_audit(:action => 'destroy', :changes => audited_attributes)
         end
 
         def write_audit(attrs)

data/test/audit_sweeper_test.rb

@@ -1,13 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class AuditsController < ActionController::Base
-  audit Company
+  audit Company, User
   
   def audit
     @company = Company.create
     render :nothing => true
   end
   
+  def update_user
+    current_user.update_attributes({:password => 'foo'})
+    render :nothing => true
+  end
+  
 private
   attr_accessor :current_user
 end
@@ -26,4 +31,9 @@ class AuditsControllerTest < ActionController::TestCase
     assigns(:company).audits.last.user.should == user
   end
   
+  should "not save blank audits" do
+    user = @controller.send(:current_user=, create_user)
+    lambda { post :update_user }.should_not change { Audit.count }
+  end
+  
 end

data/test/test_helper.rb

@@ -31,6 +31,7 @@ class User < ActiveRecord::Base
   end
 end
 class Company < ActiveRecord::Base
+  acts_as_audited
 end
 
 class Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency