audit_log 0.0.7 → 0.0.8

data/lib/audit_log/mapping.rb

@@ -18,7 +18,8 @@ module AuditLog
     def audit(model_name, options = {})
       @audit_mappings[model_name] = {
         ignored_fields: options[:ignore] || [],
-        nested_audited_models: []
+        nested_audited_models: [],
+        controllers: options[:controllers] || [model_name]
       }  
       
       @current = @audit_mappings[model_name]

data/lib/audit_log/observer.rb

@@ -28,13 +28,18 @@ class AuditedModelsObserver < ActiveRecord::Observer
     set_model_to_audit(model)
     
     if self.controller && self.controller.audited_model == model
+      what = {id: model.id, event: :destroy}
+      what = what.merge(ActiveSupport::JSON.decode(model.to_json(root: false, include: association_audit_loggers(model))))
+      
       logged_model = LoggedModel.new(
         who: self.controller.current_user_for_audit_log ? self.controller.current_user_for_audit_log.id : nil,
-        what: {id: model.id, event: :destroy},
+        what: what,
         model_name: model.class.name,
         model_id: model.id
       )    
       logged_model.save
+      
+      self.controller.audited_model = nil
     end
   end
   
@@ -53,6 +58,8 @@ class AuditedModelsObserver < ActiveRecord::Observer
         )    
         logged_model.save
       end
+      
+      self.controller.audited_model = nil
     end
   end
   
@@ -132,11 +139,18 @@ class AuditedModelsObserver < ActiveRecord::Observer
   private 
   
   def set_model_to_audit(model)
-    if self.controller && self.controller.params[:controller].sub("Controller", "").underscore.split("/").last.singularize == model.class.to_s.underscore
+    if self.controller && is_controller_mapped_to_model(model) 
       self.controller.audited_model ||= model 
     end  
   end
   
+  def is_controller_mapped_to_model(model)
+    controller_name = self.controller.params[:controller].sub("Controller", "").underscore.split("/").last
+    mapped_controller_names = AuditLog::Mapping.instance.audit_mappings[model.class.to_s.underscore.to_sym][:controllers]  
+    
+    mapped_controller_names.collect{|e| e.to_s.singularize}.include?(controller_name.to_s.singularize)
+  end
+  
   def has_some_association_changed?(model)
     changed = false
         

data/lib/audit_log/version.rb

@@ -1,3 +1,3 @@
 module AuditLog
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audit_log
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000Z
+date: 2012-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &83467150 !ruby/object:Gem::Requirement
+  requirement: &69592980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83467150
+  version_requirements: *69592980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83466940 !ruby/object:Gem::Requirement
+  requirement: &69592560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83466940
+  version_requirements: *69592560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83466710 !ruby/object:Gem::Requirement
+  requirement: &69592330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83466710
+  version_requirements: *69592330
 description: 
 email:
 - ti@connectere.agr.br