audit_log 0.0.3 → 0.0.4

data/lib/audit_log.rb

@@ -1,5 +1,4 @@
 require "audit_log/version"
-require "audit_log/current_thread"
 require "audit_log/controller"
 require "audit_log/mapping"
 require "audit_log/observer"

data/lib/audit_log/controller.rb

@@ -2,13 +2,7 @@ module AuditLog
   
   module Controller
 
-    def self.included(controller)
-      controller.before_filter :user_for_audit_log
-    end
-  
-    def user_for_audit_log
-      AuditLog::CurrentThread.who = current_user_for_audit_log
-    end
+    attr_accessor :audited_model
     
     def current_user_for_audit_log
       current_user

data/lib/audit_log/observer.rb

@@ -1,17 +1,20 @@
 class AuditedModelsObserver < ActiveRecord::Observer
 
+  attr_accessor :controller
+  
   def self.observed_classes
     AuditLog::Mapping.instance.audit_mappings.keys.collect{|model_as_symbol| model_as_symbol.to_s.camelize.constantize}
   end
   
+  
   def before_validation(model)
-    Thread.current[:auditing] ||= model
+    self.controller.audited_model ||= model
   end
 
   def after_create(model)
-    if Thread.current[:auditing] == model
+    if self.controller.audited_model == model
       logged_model = LoggedModel.new(
-        who: AuditLog::CurrentThread.who,
+        who: self.controller.current_user_for_audit_log,
         what: {id: model.id, event: :create},
         model_name: model.class.name,
         model_id: model.id
@@ -22,11 +25,11 @@ class AuditedModelsObserver < ActiveRecord::Observer
   
   
   def before_destroy(model)
-    Thread.current[:auditing] ||= model
+    self.controller.audited_model ||= model
     
-    if Thread.current[:auditing] == model
+    if self.controller.audited_model == model
       logged_model = LoggedModel.new(
-        who: AuditLog::CurrentThread.who,
+        who: self.controller.current_user_for_audit_log,
         what: {id: model.id, event: :destroy},
         model_name: model.class.name,
         model_id: model.id
@@ -36,14 +39,14 @@ class AuditedModelsObserver < ActiveRecord::Observer
   end
   
   def after_update(model)
-    if Thread.current[:auditing] == model
+    if self.controller.audited_model == model
       changes = Thread.current[:audited_model_changes]
       
       if changes
         what = WhatBuilder.new(changes).build
         
         logged_model = LoggedModel.new(
-          who: AuditLog::CurrentThread.who,
+          who: self.controller.current_user_for_audit_log,
           what: what,
           model_name: model.class.name,
           model_id: model.id
@@ -54,7 +57,7 @@ class AuditedModelsObserver < ActiveRecord::Observer
   end
   
   def before_update(model)
-    if Thread.current[:auditing] == model
+    if self.controller.audited_model == model
       if (model.changed? && !(model.changed_attributes.keys.collect{|attr| attr.to_sym}.uniq.sort - ignored_fields(model).uniq.sort).empty?) || 
           has_some_association_changed?(model)
         changes = {model: model, fields_updates: {}, has_many: {}, has_one: {}}
@@ -199,3 +202,26 @@ class AuditedModelsObserver < ActiveRecord::Observer
   end
   
 end
+
+require 'singleton'
+
+class ControllerInterceptor
+  include Singleton
+  
+  def before(controller)
+    AuditedModelsObserver.instance.controller = controller
+    true
+  end
+  
+  def after(controller)
+    AuditedModelsObserver.instance.controller = nil
+  end
+end
+
+
+
+if defined?(ActionController) and defined?(ActionController::Base)
+  ActionController::Base.class_eval do
+    around_filter ControllerInterceptor.instance
+  end
+end

data/lib/audit_log/version.rb

@@ -1,3 +1,3 @@
 module AuditLog
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audit_log
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000Z
+date: 2012-07-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &83520670 !ruby/object:Gem::Requirement
+  requirement: &82838150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83520670
+  version_requirements: *82838150
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83520460 !ruby/object:Gem::Requirement
+  requirement: &82837940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83520460
+  version_requirements: *82837940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83520230 !ruby/object:Gem::Requirement
+  requirement: &82837710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83520230
+  version_requirements: *82837710
 description: 
 email:
 - ti@connectere.agr.br
@@ -56,7 +56,6 @@ files:
 - lib/audit_log/observer.rb
 - lib/audit_log/logged_model.rb
 - lib/audit_log/mapping.rb
-- lib/audit_log/current_thread.rb
 - lib/generators/audit_log/templates/create_logged_models.rb
 - lib/generators/audit_log/install_generator.rb
 - lib/audit_log.rb

data/lib/audit_log/current_thread.rb

@@ -1,23 +0,0 @@
-module AuditLog
-  
-  class CurrentThread
-    
-    class << self
-      def who=(user)
-        auditing_data[:who] = user
-      end
-      
-      def who
-        auditing_data[:who]
-      end
-    end
-    
-    private
-    
-    def self.auditing_data
-      Thread.current[:auditing_log] ||= {}
-    end
-  
-  end
-  
-end