acts_as_audited 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/acts_as_audited.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_audited}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2009-11-01}
+  s.date = %q{2010-04-03}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/collectiveidea/acts_as_audited}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ActiveRecord extension that logs all changes to your models in an audits table}
   s.test_files = [
     "test/acts_as_audited_test.rb",
@@ -70,3 +70,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jnunemaker-matchy>, [">= 0"])
   end
 end
+

data/lib/acts_as_audited.rb

@@ -69,11 +69,12 @@ module CollectiveIdea #:nodoc:
 
           class_inheritable_reader :non_audited_columns
           class_inheritable_reader :auditing_enabled
-
+          
           if options[:only]
             except = self.column_names - options[:only].flatten.map(&:to_s)
           else
-            except = [self.primary_key, inheritance_column, 'lock_version', 'created_at', 'updated_at']
+            except = [self.primary_key, inheritance_column, 'lock_version',
+              'created_at', 'updated_at', 'created_on', 'updated_on']
             except |= Array(options[:except]).collect(&:to_s) if options[:except]
           end
           write_inheritable_attribute :non_audited_columns, except
@@ -82,9 +83,9 @@ module CollectiveIdea #:nodoc:
           attr_protected :audit_ids if options[:protect]
           Audit.audited_class_names << self.to_s
 
-          after_create  :audit_create
-          before_update :audit_update
-          after_destroy :audit_destroy
+          after_create  :audit_create if !options[:on] || (options[:on] && options[:on].include?(:create))
+          before_update :audit_update if !options[:on] || (options[:on] && options[:on].include?(:update))
+          after_destroy :audit_destroy if !options[:on] || (options[:on] && options[:on].include?(:destroy))
 
           attr_accessor :version
 

data/lib/acts_as_audited/audit.rb

@@ -23,9 +23,6 @@ class Audit < ActiveRecord::Base
     self.audited_class_names.map(&:constantize)
   end
 
-  cattr_accessor :audit_as_user
-  self.audit_as_user = nil
-
   # All audits made during the block called will be recorded as made
   # by +user+. This method is hopefully threadsafe, making it ideal
   # for background operations that require audit information.

data/test/acts_as_audited_test.rb

@@ -11,7 +11,7 @@ module CollectiveIdea
         User.should be_kind_of(CollectiveIdea::Acts::Audited::SingletonMethods)
       end
 
-      ['created_at', 'updated_at', 'lock_version', 'id', 'password'].each do |column|
+      ['created_at', 'updated_at', 'created_on', 'updated_on', 'lock_version', 'id', 'password'].each do |column|
         should "not audit #{column}" do
           User.non_audited_columns.should include(column)
         end
@@ -20,7 +20,7 @@ module CollectiveIdea
       should "not save non-audited columns" do
         create_user.audits.first.changes.keys.any?{|col| ['created_at', 'updated_at', 'password'].include? col}.should be(false)
       end
-
+      
       context "on create" do
         setup { @user = create_user }
 
@@ -37,8 +37,17 @@ module CollectiveIdea
         should "store all the audited attributes" do
           @user.audits.first.changes.should == @user.audited_attributes
         end
-      end
+        
+        should "not audit an attribute which is excepted if specified on create and on destroy" do
+          on_create_destroy_except_name = OnCreateDestroyExceptName.create(:name => 'Bart')
+          on_create_destroy_except_name.audits.first.changes.keys.any?{|col| ['name'].include? col}.should be(false)
+        end
 
+        should "not save an audit if only specified on update and on destroy" do
+          lambda { on_update_destroy = OnUpdateDestroy.create(:name => 'Bart') }.should_not change { Audit.count }
+        end
+      end
+      
       context "on update" do
         setup do
           @user = create_user(:name => 'Brandon')
@@ -73,6 +82,10 @@ module CollectiveIdea
           end
         end
 
+        should "not save an audit if only specified on create and on destroy" do
+           on_create_destroy = OnCreateDestroy.create(:name => 'Bart')
+          lambda { on_create_destroy.update_attributes :name => 'Changed' }.should_not change { Audit.count }
+        end
       end
 
       context "on destroy" do
@@ -101,6 +114,11 @@ module CollectiveIdea
           revision = @user.audits.first.revision
           revision.name.should == @user.name
         end
+        
+        should "not save an audit if only specified on create and on update" do
+          on_create_update = OnCreateUpdate.create(:name => 'Bart')
+          lambda { on_create_update.destroy }.should_not change { Audit.count }
+        end
       end
 
       context "dirty tracking" do

data/test/db/schema.rb

@@ -12,7 +12,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :companies, :force => true do |t|
     t.column :name, :string
   end
-  
+
   create_table :audits, :force => true do |t|
     t.column :auditable_id, :integer
     t.column :auditable_type, :string

data/test/test_helper.rb

@@ -30,10 +30,31 @@ class User < ActiveRecord::Base
     write_attribute(:name, CGI.escapeHTML(val))
   end
 end
+
 class Company < ActiveRecord::Base
   acts_as_audited
 end
 
+class OnUpdateDestroy < ActiveRecord::Base
+  set_table_name 'companies'
+  acts_as_audited :on => [:update, :destroy]
+end
+
+class OnCreateDestroy < ActiveRecord::Base
+  set_table_name 'companies'
+  acts_as_audited :on => [:create, :destroy]
+end
+
+class OnCreateDestroyExceptName < ActiveRecord::Base
+  set_table_name 'companies'
+  acts_as_audited :except => :name, :on => [:create, :destroy]
+end
+
+class OnCreateUpdate < ActiveRecord::Base
+  set_table_name 'companies'
+  acts_as_audited :on => [:create, :update]
+end
+
 class Test::Unit::TestCase
   # def change(receiver=nil, message=nil, &block)
   #   ChangeExpectation.new(self, receiver, message, &block)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,39 +14,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2010-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
         version: "2.1"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: 
 email: brandon@opensoul.org
 executables: []
@@ -86,18 +98,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension that logs all changes to your models in an audits table