audited 4.0.0.rc1 → 4.0.0

data/README.md

@@ -3,7 +3,7 @@ Audited [![Build Status](https://secure.travis-ci.org/collectiveidea/audited.png
 
 **Audited** (previously acts_as_audited) is an ORM extension that logs all changes to your models. Audited also allows you to record who made those changes, save comments and associate models related to the changes.
 
-Audited currently (4.x release candidate) works with Rails 4. For Rails 3, use gem version 3.0 or see the [3.0-stable branch](https://github.com/collectiveidea/audited/tree/3.0-stable).
+Audited currently (4.x) works with Rails 4. For Rails 3, use gem version 3.0 or see the [3.0-stable branch](https://github.com/collectiveidea/audited/tree/3.0-stable).
 
 ## Supported Rubies
 
@@ -162,7 +162,7 @@ Audited.current_user_method = :authenticated_user
 Outside of a request, Audited can still record the user with the `as_user` method:
 
 ```ruby
-Audit.as_user(User.find(1)) do
+Audited.audit_class.as_user(User.find(1)) do
   post.update_attribute!(:title => "Hello, world!")
 end
 post.audits.last.user # => #<User id: 1>

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'bundler/gem_helper'
 require 'rspec/core/rake_task'
+require 'rake/testtask'
 require 'appraisal'
 
 Bundler::GemHelper.install_tasks(:name => 'audited')
@@ -23,4 +24,10 @@ task :spec do
   end
 end
 
-task :default => :spec
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default => [:spec, :test]

data/lib/audited/active_record/version.rb

@@ -0,0 +1,5 @@
+module Audited
+  module ActiveRecord
+    VERSION = "4.0.0"
+  end
+end

data/lib/audited/audit.rb

@@ -11,11 +11,10 @@ module Audited
         belongs_to :user,       :polymorphic => true
         belongs_to :associated, :polymorphic => true
 
-        before_create :set_version_number, :set_audit_user
+        before_create :set_version_number, :set_audit_user, :set_request_uuid
 
         cattr_accessor :audited_class_names
         self.audited_class_names = Set.new
-
       end
 
       # Returns the list of classes that are being audited
@@ -97,5 +96,9 @@ module Audited
       self.user = Thread.current[:audited_user] if Thread.current[:audited_user]
       nil # prevent stopping callback chains
     end
+
+    def set_request_uuid
+      self.request_uuid ||= SecureRandom.uuid
+    end
   end
 end

data/lib/audited/auditor.rb

@@ -65,10 +65,12 @@ module Audited
         before_update :audit_update if !options[:on] || (options[:on] && options[:on].include?(:update))
         before_destroy :audit_destroy if !options[:on] || (options[:on] && options[:on].include?(:destroy))
 
-        # Define and set an after_audit callback. This might be useful if you want
-        # to notify a party after the audit has been created.
+        # Define and set after_audit and around_audit callbacks. This might be useful if you want
+        # to notify a party after the audit has been created or if you want to access the newly-created
+        # audit.
         define_callbacks :audit
         set_callback :audit, :after, :after_audit, :if => lambda { self.respond_to?(:after_audit) }
+        set_callback :audit, :around, :around_audit, :if => lambda { self.respond_to?(:around_audit) }
 
         attr_accessor :version
 

data/lib/audited/mongo_mapper/version.rb

@@ -0,0 +1,5 @@
+module Audited
+  module MongoMapper
+    VERSION = "4.0.0"
+  end
+end

data/lib/audited/sweeper.rb

@@ -17,13 +17,18 @@ module Audited
 
     def before_create(audit)
       audit.user ||= current_user
-      audit.remote_address = controller.try(:request).try(:ip)
+      audit.remote_address = controller.try(:request).try(:remote_ip)
+      audit.request_uuid = request_uuid if request_uuid
     end
 
     def current_user
       controller.send(Audited.current_user_method) if controller.respond_to?(Audited.current_user_method, true)
     end
 
+    def request_uuid
+      controller.try(:request).try(:uuid)
+    end
+
     def add_observer!(klass)
       super
       define_callback(klass)

data/lib/audited/version.rb

@@ -0,0 +1,3 @@
+module Audited
+  VERSION = "4.0.0"
+end

data/spec/support/active_record/models.rb

@@ -38,11 +38,15 @@ module Models
     class UserWithAfterAudit < ::ActiveRecord::Base
       self.table_name = :users
       audited
-      attr_accessor :bogus_attr
+      attr_accessor :bogus_attr, :around_attr
 
       def after_audit
         self.bogus_attr = "do something"
       end
+
+      def around_audit
+        self.around_attr = yield
+      end
     end
 
     class Company < ::ActiveRecord::Base

data/spec/support/active_record/schema.rb

@@ -44,11 +44,13 @@ ActiveRecord::Schema.define do
     t.column :version, :integer, :default => 0
     t.column :comment, :string
     t.column :remote_address, :string
+    t.column :request_uuid, :string
     t.column :created_at, :datetime
   end
 
   add_index :audits, [:auditable_id, :auditable_type], :name => 'auditable_index'
   add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
   add_index :audits, [:user_id, :user_type], :name => 'user_index'
+  add_index :audits, :request_uuid
   add_index :audits, :created_at
 end

data/spec/support/mongo_mapper/models.rb

@@ -94,11 +94,15 @@ module Models
       timestamps!
 
       audited
-      attr_accessor :bogus_attr
+      attr_accessor :bogus_attr, :around_attr
 
       def after_audit
         self.bogus_attr = "do something"
       end
+
+      def around_audit
+        self.around_attr = yield
+      end
     end
 
     class Company

data/test/db/version_6.rb

@@ -0,0 +1,17 @@
+ActiveRecord::Schema.define do
+  create_table :audits, :force => true do |t|
+    t.column :auditable_id, :integer
+    t.column :auditable_type, :string
+    t.column :user_id, :integer
+    t.column :user_type, :string
+    t.column :username, :string
+    t.column :action, :string
+    t.column :audited_changes, :text
+    t.column :version, :integer, :default => 0
+    t.column :comment, :string
+    t.column :created_at, :datetime
+    t.column :remote_address, :string
+    t.column :associated_id, :integer
+    t.column :associated_type, :string
+  end
+end

data/test/upgrade_generator_test.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 
+require 'audited/adapters/active_record'
 require 'generators/audited/upgrade_generator'
 
 class UpgradeGeneratorTest < Rails::Generators::TestCase
@@ -62,4 +63,15 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
       assert_match /rename_column :audits, :association_type, :associated_type/, content
     end
   end
+
+  test "should add 'request_uuid' to audits table" do
+    load_schema 6
+
+    run_generator %w(upgrade)
+
+    assert_migration "db/migrate/add_request_uuid_to_audits.rb" do |content|
+      assert_match /add_column :audits, :request_uuid, :string/, content
+      assert_match /add_index :audits, :request_uuid/, content
+    end
+  end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,118 +14,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-observers
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0.beta2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Log all changes to your models
@@ -133,9 +150,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - Appraisals
 - CHANGELOG
 - Gemfile
@@ -145,10 +162,13 @@ files:
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
 - lib/audited.rb
+- lib/audited/active_record/version.rb
 - lib/audited/audit.rb
 - lib/audited/auditor.rb
+- lib/audited/mongo_mapper/version.rb
 - lib/audited/rspec_matchers.rb
 - lib/audited/sweeper.rb
+- lib/audited/version.rb
 - spec/audited_spec_helpers.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/database.yml
@@ -170,32 +190,40 @@ files:
 - test/db/version_3.rb
 - test/db/version_4.rb
 - test/db/version_5.rb
+- test/db/version_6.rb
 - test/install_generator_test.rb
 - test/test_helper.rb
 - test/upgrade_generator_test.rb
 homepage: https://github.com/collectiveidea/audited
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -725083918367119279
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -725083918367119279
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Log all changes to your models
 test_files:
 - spec/audited_spec_helpers.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 982f38135cfff168133e5d215dfaffaa33ea8a11
-  data.tar.gz: 406ab4c30bfa68a2637ab095b98ebb4ebe6b3df6
-SHA512:
-  metadata.gz: 6467f9860583086e452163cc4c99e4fcc5052a38877a8fbe909834840e5ad3016044de7b77dd44526536bb6aee4653b9cb359a1bed4affaffe2002945c9bef62
-  data.tar.gz: dfbd48f76b0493e07ba436621212864e0dc62f21e0c5f4c3d635052e285cd14d590266756af44673cc1dd999804e9891106ab555aeffbb6d2667f5a6de046ffc