acts_as_audited_customized 1.3.1 → 1.3.2

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/acts_as_audited.rb

@@ -121,7 +121,6 @@ module CollectiveIdea #:nodoc:
           # don't allow multiple calls
           return if self.included_modules.include?(CollectiveIdea::Acts::Audited::InstanceMethods)
 
-          reserved_options = [:protect, :on, :create, :update, :destroy, :only, :except, :if, :unless]
           options = {:protect => accessible_attributes.nil?}.merge(options)
 
           class_inheritable_reader :non_audited_columns
@@ -137,12 +136,13 @@ module CollectiveIdea #:nodoc:
               '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
           write_inheritable_attribute :manually_set_columns, options.reject {|k, v| reserved_options.include?(k) }
           write_inheritable_attribute :if_condition, options.delete(:if)
           write_inheritable_attribute :unless_condition, options.delete(:unless)
 
-          has_many :audits, :as => :auditable, :order => "#{Audit.quoted_table_name}.version"
+          has_many :audits, :as => :auditable, :order => "#{Audit.quoted_table_name}.version", :dependent => :nullify
           attr_protected :audit_ids if options[:protect]
           Audit.audited_class_names << self.to_s
 
@@ -157,6 +157,10 @@ module CollectiveIdea #:nodoc:
 
           write_inheritable_attribute :auditing_enabled, true
         end
+
+        def reserved_options
+          [:protect, :on, :create, :update, :destroy, :only, :except, :if, :unless]
+        end
       end
 
       module InstanceMethods
@@ -243,12 +247,8 @@ module CollectiveIdea #:nodoc:
           end
         end
 
-        def on_behalf_of_result
-          evaluate(on_behalf_of_call)
-        end
-
         def set_manually_set_columns
-          manually_set_columns.inject(set_current_user) do |attrs, (attrib, value)|
+          manually_set_columns.inject({}) do |attrs, (attrib, value)|
             attrs[attrib] = evaluate(value)
             attrs
           end
@@ -299,7 +299,8 @@ module CollectiveIdea #:nodoc:
         end
 
         def write_audit(attrs)
-          attrs = attrs.merge(set_manually_set_columns)
+          attrs = attrs.merge(set_current_user)
+          attrs = attrs.merge(set_manually_set_columns) unless attrs[:action] == 'destroy'
           self.audits.create attrs if auditing_enabled && eval_if_condition && eval_unless_condition
         end
       end # InstanceMethods

data/lib/acts_as_audited/audit.rb

@@ -10,8 +10,6 @@ require 'set'
 #
 class Audit < ActiveRecord::Base
   belongs_to :auditable, :polymorphic => true
-  # belongs_to :user, :polymorphic => true
-  # belongs_to :on_behalf_of, :class_name => 'User', :foreign_key => 'on_behalf_of_id'
 
   before_create :set_version_number, :set_audit_user
 
@@ -64,14 +62,10 @@ class Audit < ActiveRecord::Base
       self.user_as_model = user :
       self.username = user
   end
-  # alias_method :user_as_model=, :user=
-  # alias_method :user=, :user_as_string=
 
   def user_as_string #:nodoc:
     self.user_as_model || self.username
   end
-  # alias_method :user_as_model, :user
-  # alias_method :user, :user_as_string
 
   def revision
     clazz = auditable_type.constantize

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited_customized
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency