auditor 2.0.0 → 2.0.1

data/lib/auditor/audit.rb

@@ -11,7 +11,7 @@ class Audit < ActiveRecord::Base
   serialize :audited_changes
 
   default_scope order(:version, :created_at)
-  scope :modifying, lambda { where('action in (?)', Auditor::Config.modifying_actions) }
+  scope :modifying, lambda { where('audited_changes is not null') }
   scope :trail, lambda { |audit|
     where('auditable_id = ? and auditable_type = ? and version <= ?',
     audit.auditable_id, audit.auditable_type, audit.version) 
@@ -43,7 +43,7 @@ private
       :auditable_type => auditable_type
     ).maximum(:version) || 0
 
-    self.version = Auditor::Config.modifying_actions.include?(self.action.to_sym) ? max + 1 : max
+    self.version = self.audited_changes == nil ? max : max + 1
   end
 
   def set_user

data/lib/auditor/config.rb

@@ -7,10 +7,6 @@ module Auditor
       @valid_actions ||= [:create, :find, :update, :destroy]
     end
 
-    def self.modifying_actions
-      @modifying_actions ||= [:create, :update, :destroy]
-    end
-
     def initialize(*args)
       @options = (args.pop if args.last.kind_of?(Hash)) || {}
       normalize_options(@options)

data/lib/auditor/recorder.rb

@@ -22,7 +22,8 @@ module Auditor
       user = Auditor::User.current_user
 
       audit = Audit.new
-      audit.auditable = model
+      audit.auditable_id = model.id
+      audit.auditable_type = model.class.name
       audit.audited_changes = prepare_changes(model.changes) if changes_available?(action)
       audit.action = action
       audit.comment = @blk.call(model, user) if @blk
@@ -32,8 +33,8 @@ module Auditor
 
     def prepare_changes(changes)
       chg = changes.dup
-      chg = chg.delete_if { |key, value| @options[:except].include?(key) } unless @options[:except].empty?
-      chg = chg.delete_if { |key, value| !@options[:only].include?(key) } unless @options[:only].empty?
+      chg = chg.delete_if { |key, value| @options[:except].include?(key) } unless @options[:except].blank?
+      chg = chg.delete_if { |key, value| !@options[:only].include?(key) } unless @options[:only].blank?
       chg.empty? ? nil : chg
     end
 

data/lib/auditor/version.rb

@@ -1,3 +1,3 @@
 module Auditor
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/audit_spec.rb

@@ -8,7 +8,7 @@ describe Audit do
   end
 
   it 'should set the version number on save' do
-    audit = Audit.create(:auditable => @auditable, :user => @user, :action => :create)
+    audit = Audit.create(:auditable => @auditable, :audited_changes => { :name => [nil, 'new']}, :user => @user, :action => :create)
     audit.version.should == 1
   end
 
@@ -35,8 +35,8 @@ describe Audit do
 
   describe 'modifying scope' do
     it 'should return all audit records that were a result of modifying the audited object attributes' do
-      audit1 = Audit.create(:auditable => @auditable, :user => @user, :action => :create)
-      audit2 = Audit.create(:auditable => @auditable, :user => @user, :action => :update, :audited_changes => {'name' => [nil, 'n1'], 'value' => [nil, 'v1']})
+      audit1 = Audit.create(:auditable => @auditable, :user => @user, :action => :create, :audited_changes  => {'name' => [nil, 'n0']})
+      audit2 = Audit.create(:auditable => @auditable, :user => @user, :action => :update, :audited_changes => {'name' => ['n0', 'n1'], 'value' => [nil, 'v1']})
       audit3 = Audit.create(:auditable => @auditable, :user => @user, :action => :find)
       audit4 = Audit.create(:auditable => @auditable, :user => @user, :action => :update, :audited_changes => {'value' => [nil, 'v2']})
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auditor
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Jeff Kunkle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -04:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency