activeaudit 0.1.2 → 0.1.3

data/README.md

@@ -25,6 +25,14 @@ and execute migration
 rake db:migrate
 ```
 
+### Update from 0.1.2 to 0.1.3
+
+You have to installa new migration:
+```
+rake active_audit_rails_engine:install:migrations
+rake db:migrate
+```
+
 ## Usage
 
 In your model you have to include the mixin

data/app/models/active_audit/audit.rb

@@ -1,14 +1,15 @@
 class ActiveAudit::Audit < ActiveRecord::Base
 
-  attr_accessible :obj_id, :obj_type, :activity, :user_id
+  attr_accessible :obj_id, :obj_type, :activity, :user_id, :extras
   validates_presence_of :obj_id, :obj_type, :activity
+  serialize :extras, Hash
 
   if defined?(::Rails)
     if File.exists?(File.join(Rails.root.to_s,'app','models','concerns','active_audit','audit_concern.rb'))
-      require File.join(Rails.root.to_s,'app','models','concerns','active_audit','audit_concern.rb')
-    end
-    if defined?(::ActiveAudit::AuditConcern)
-      include ::ActiveAudit::AuditConcern
+      require_or_load File.join(Rails.root.to_s,'app','models','concerns','active_audit','audit_concern')
+      if defined?(ActiveAudit::AuditConcern)
+        include ActiveAudit::AuditConcern
+      end
     end
   end
 

data/db/migrate/2_add_extras_to_active_audits.rb

@@ -0,0 +1,5 @@
+class AddExtrasToActiveAudits < ActiveRecord::Migration
+  def change
+    add_column :audits, :extras, :text
+  end
+end

data/lib/active_audit/engine.rb

@@ -4,7 +4,7 @@ module ActiveAudit
   module Rails
     class Engine < ::Rails::Engine
       initializer 'activeservice.autoload', :before => :set_autoload_paths do |app|
-        app.config.autoload_paths += %W(#{app.config.root}/app/concerns/active_audit)
+        app.config.autoload_paths += %W(#{app.config.root}/app/models/concerns/active_audit)
       end
       #ActiveRecord::Base.class_eval do
         #include ActiveAudit::Logger

data/lib/active_audit/logger.rb

@@ -7,12 +7,15 @@ module ActiveAudit
 
     included do
 
+      has_many :audits, class_name: "ActiveAudit::Audit", as: :obj
+
       after_create :log_activity_on_create
       after_update :log_activity_on_update
       before_destroy :log_activity_on_destroy
 
       attr_accessible :audit_user_id
       attr_accessor :audit_user_id
+      attr_accessor :audit_extras
 
       @@_loggable_events = {}
 
@@ -28,7 +31,7 @@ module ActiveAudit
         @@_loggable_events.each do |k,v|
           next unless k.eql?(:create)
           if v.eql?(true)
-            ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s
+            ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s, extras: audit_extras
           elsif v.is_a?(Array)
             log_event = false
             v.each do |field|
@@ -40,7 +43,7 @@ module ActiveAudit
               end
             end
             if log_event
-              ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s
+              ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s, extras: audit_extras
             end
           end
         end
@@ -50,7 +53,7 @@ module ActiveAudit
         @@_loggable_events.each do |k,v|
           next if [:create,:destroy].include?(k)
           if k.eql?(:update) and v.eql?(true)
-            ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s
+            ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s, extras: audit_extras
           else
             if v.is_a?(Array)
               log_event = false
@@ -63,7 +66,7 @@ module ActiveAudit
                 end
               end
               if log_event
-                ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s
+                ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s, extras: audit_extras
               end
             end
           end
@@ -73,7 +76,7 @@ module ActiveAudit
       def log_activity_on_destroy
         @@_loggable_events.each do |k,v|
           next unless k.eql?(:destroy)
-          ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s
+          ActiveAudit::Audit.create obj_id: id, obj_type: self.class.to_s, user_id: audit_user_id, activity: k.to_s, extras: audit_extras
         end
       end
 

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'active_audit/logger'
 require 'active_record'
 require 'faker'
 require './db/migrate/1_create_active_audits'
+require './db/migrate/2_add_extras_to_active_audits'
 
 puts "Removing test database..."
 if File.exist? "spec/db/active_audit_test.sqlite3"
@@ -21,6 +22,7 @@ ActiveRecord::Base.establish_connection(
 puts "Creating test tables..."
 ActiveRecord::Base.connection.execute("CREATE TABLE `people`(`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `surname` TEXT, `email` TEXT, `age` INT, `created_at` DATETIME, `updated_at` DATETIME);")
 CreateActiveAudits.migrate :up
+AddExtrasToActiveAudits.migrate :up
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeaudit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -133,6 +133,7 @@ extra_rdoc_files:
 files:
 - app/models/active_audit/audit.rb
 - db/migrate/1_create_active_audits.rb
+- db/migrate/2_add_extras_to_active_audits.rb
 - lib/active_audit/engine.rb
 - lib/active_audit/logger.rb
 - lib/activeaudit.rb
@@ -157,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3583920372480114366
+      hash: 1962650347525140061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: