audit_log 0.0.1 → 0.0.2

data/lib/audit_log.rb

@@ -1,6 +1,9 @@
 require "audit_log/version"
+require "audit_log/current_thread"
+require "audit_log/controller"
 require "audit_log/mapping"
 require "audit_log/observer"
+require "audit_log/logged_model"
 
 module AuditLog
   

data/lib/audit_log/controller.rb

@@ -0,0 +1,19 @@
+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
+    
+    def current_user_for_audit_log
+      current_user
+    end
+    
+  end
+  
+end

data/lib/audit_log/current_thread.rb

@@ -0,0 +1,23 @@
+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

data/lib/audit_log/logged_model.rb

@@ -0,0 +1,8 @@
+class LoggedModel < ActiveRecord::Base
+  attr_accessible :who, :what, :model_id, :model_name
+  
+  def when
+    created_at
+  end
+  
+end

data/lib/audit_log/mapping.rb

@@ -31,4 +31,8 @@ module AuditLog
     end
   end
   
+end
+
+ActiveSupport.on_load(:action_controller) do
+  include AuditLog::Controller
 end

data/lib/audit_log/observer.rb

@@ -1,6 +1,3 @@
-#require 'active_support/inflector'
-#require 'active_record'
-  
 class AuditedModelsObserver < ActiveRecord::Observer
 
   def self.observed_classes
@@ -14,6 +11,7 @@ class AuditedModelsObserver < ActiveRecord::Observer
   def after_create(model)
     if Thread.current[:auditing] == model
       logged_model = LoggedModel.new(
+        who: AuditLog::CurrentThread.who,
         what: {id: model.id, event: :create},
         model_name: model.class.name,
         model_id: model.id
@@ -23,9 +21,12 @@ class AuditedModelsObserver < ActiveRecord::Observer
   end
   
   
-  def after_destroy(model)
+  def before_destroy(model)
+    Thread.current[:auditing] ||= model
+    
     if Thread.current[:auditing] == model
       logged_model = LoggedModel.new(
+        who: AuditLog::CurrentThread.who,
         what: {id: model.id, event: :destroy},
         model_name: model.class.name,
         model_id: model.id
@@ -42,6 +43,7 @@ class AuditedModelsObserver < ActiveRecord::Observer
         what = WhatBuilder.new(changes).build
         
         logged_model = LoggedModel.new(
+          who: AuditLog::CurrentThread.who,
           what: what,
           model_name: model.class.name,
           model_id: model.id
@@ -51,19 +53,6 @@ class AuditedModelsObserver < ActiveRecord::Observer
     end
   end
   
-      # {
-      #   model: model,
-      #   fields_updates: {field_name: {from: "", to: ""}},
-      #   has_many: {
-      #     association_name: [
-      #       {
-      #         model: model,
-      #         event: :event_name,
-      #         fields_updates: {field_name: {from: "", to: ""}}
-      #       }
-      #     ]
-      #   }
-      # }
   def before_update(model)
     if Thread.current[:auditing] == model
       if (model.changed? && !(model.changed_attributes.keys.collect{|attr| attr.to_sym}.uniq.sort - ignored_fields(model).uniq.sort).empty?) || 

data/lib/audit_log/version.rb

@@ -1,3 +1,3 @@
 module AuditLog
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/generators/audit_log/install_generator.rb

@@ -0,0 +1,21 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record/migration'
+
+module AuditLog
+  
+  class InstallGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+    extend ActiveRecord::Generators::Migration
+    
+    source_root File.expand_path('../templates', __FILE__)
+    
+    desc 'Generates (but does not run) a migration to add a versions table.'
+
+    def create_migration_file
+      migration_template 'create_logged_models.rb', 'db/migrate/create_logged_models.rb'
+    end
+    
+  end
+  
+end

data/lib/generators/audit_log/templates/create_logged_models.rb

@@ -0,0 +1,14 @@
+class CreateLoggedModels < ActiveRecord::Migration
+  
+  def change
+    create_table :logged_models do |t|
+      t.integer :who
+      t.text :what
+      t.integer :model_id
+      t.string :model_name
+      
+      t.timestamps
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audit_log
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,8 +67,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/audit_log/version.rb
+- lib/audit_log/controller.rb
 - 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
 - lib/tasks/audit_log_tasks.rake
 - MIT-LICENSE
@@ -97,5 +102,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Logs of model changes, including nested attributesg.
+summary: Logs of model changes, including nested attributes.
 test_files: []