acts_as_audited_customized 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/generators/audit_model/audit_model_generator.rb

@@ -6,7 +6,6 @@ class AuditModelGenerator < Rails::Generator::NamedBase
   end
 
   def manifest
-    # puts "*** [AuditModelGenerator.manifest] - File.join(File.dirname(__FILE__), '..', '..', 'lib', 'acts_as_audited') = #{File.join(File.dirname(__FILE__), '..', '..', 'lib', 'acts_as_audited')}"
     record do |m|
       m.directory(File.join('app', 'models'))
       m.template('model.rb', "app/models/audit.rb", :assigns => { :human_model => @human_model })

data/generators/audit_model/templates/model.rb

@@ -19,19 +19,39 @@ class Audit < ActiveRecord::Base
   cattr_accessor :audited_class_names
   self.audited_class_names = Set.new
 
-  def self.audited_classes
-    self.audited_class_names.map(&:constantize)
-  end
+  class << self
+    def audited_classes
+      self.audited_class_names.map(&:constantize)
+    end
+
+    # All audits made during the block called will be recorded as made
+    # by +user+. This method is hopefully threadsafe, making it ideal
+    # for background operations that require audit information.
+    def as_user(user, &block)
+      Thread.current[:acts_as_audited_<%= human_model %>] = user
+      yield
+      Thread.current[:acts_as_audited_<%= human_model %>] = nil
+    end
 
-  # All audits made during the block called will be recorded as made
-  # by +<%= human_model %>+. This method is hopefully threadsafe, making it ideal
-  # for background operations that require audit information.
-  def self.as_<%= human_model %>(<%= human_model %>, &block)
-    Thread.current[:acts_as_audited_<%= human_model %>] = <%= human_model %>
+    def manual_audit(<%= human_model %>, action, auditable = nil)
+      attribs = { :action => action }
 
-    yield
+      case <%= human_model %>
+      when ActiveRecord::Base
+        attribs[:<%= human_model %>] = <%= human_model %>
+      when String
+        attribs[:username] = <%= human_model %>
+      end
+
+      case auditable
+      when ActiveRecord::Base
+        attribs[:auditable] = auditable
+      when String
+        attribs[:auditable_type] = auditable
+      end
 
-    Thread.current[:acts_as_audited_<%= human_model %>] = nil
+      Audit.create attribs
+    end
   end
 
   # Allows <%= human_model %> to be set to either a string or an ActiveRecord object

data/generators/audited_migration/audited_migration_generator.rb

@@ -6,7 +6,6 @@ class AuditedMigrationGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      m.directory(File.join('db', 'migrate'))
       m.migration_template 'migration.rb', 'db/migrate', :assigns => { :human_model => @human_model }
     end
   end

data/generators/audited_migration/templates/migration.rb

@@ -1,15 +1,15 @@
 class <%= class_name %> < ActiveRecord::Migration
   def self.up
     create_table :audits, :force => true do |t|
-      t.column :auditable_id, :integer
-      t.column :auditable_type, :string
-      t.column :<%= human_model %>_id, :integer
-      t.column :<%= human_model %>_type, :string
-      t.column :username, :string
-      t.column :action, :string
-      t.column :changes, :text
-      t.column :version, :integer, :default => 0
-      t.column :created_at, :datetime
+      t.integer  :auditable_id
+      t.string   :auditable_type
+      t.integer  :<%= human_model %>_id
+      t.string   :<%= human_model %>_type
+      t.string   :username
+      t.string   :action
+      t.text     :changes
+      t.integer  :version, :default => 0
+      t.datetime :created_at
     end
 
     add_index :audits, [:auditable_id, :auditable_type], :name => 'auditable_index'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited_customized
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Brandon Keepers