audited 4.0.0 → 4.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e008bd8e45b0c84dac31af4c65d41e61b6f76c1f
+  data.tar.gz: 90ead5b1d9033c3426a20de46ea1aca59798b7ab
+SHA512:
+  metadata.gz: 33bd73a0be9da10924353681e4cccb3515dcd5ad9f47f3140ca18914532eef791f3b1c34caa11bb9dd47bd1be34f56751e5457b3946af70ccd20747f9c1215ce
+  data.tar.gz: bf7c70b57abf23809d08c899558f9a0effc393e2e1d526dcbc45c70f2302c6da96efa409506b6033e8ad87d0d13e97958d3a6515e1f23dd09cd12bb0a73ad4f0

data/.gitignore

@@ -15,3 +15,4 @@ Gemfile.lock
 gemfiles/*.lock
 pkg
 tmp/*
+audited_test.sqlite3.db

data/.travis.yml

@@ -1,9 +1,30 @@
 language: ruby
 services: mongodb
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby-head
+env:
+  - DB=SQLITE
+  - DB=POSTGRES
+  - DB=MYSQL
+before_script:
+  - mysql -e 'create database audited_test;'
+  - psql -c 'create database audited_test;' -U postgres
 gemfile:
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+branches:
+  only:
+  - master
+sudo: false
+notifications:
+  webhooks:
+    urls:
+    - http://buildlight.collectiveidea.com/
+    on_start: true

data/Appraisals

@@ -1,9 +1,15 @@
 appraise 'rails40' do
   gem 'rails', '~> 4.0.0'
   gem 'rails-observers'
+  gem 'test-unit'
 end
 
 appraise 'rails41' do
   gem 'rails', '~> 4.1.0'
   gem 'rails-observers'
 end
+
+appraise 'rails42' do
+  gem 'rails', '~> 4.2.0'
+  gem 'rails-observers'
+end

data/README.md

@@ -3,15 +3,15 @@ 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) 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.2. 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
 
 Audited supports and is [tested against](http://travis-ci.org/collectiveidea/audited) the following Ruby versions:
 
-* 1.9.3
 * 2.0.0
-* 2.1.2
+* 2.1.5
+* 2.2.0
 
 Audited may work just fine with a Ruby version not listed above, but we can't guarantee that it will. If you'd like to maintain a Ruby that isn't listed, please let us know with a [pull request](https://github.com/collectiveidea/audited/pulls).
 
@@ -153,7 +153,7 @@ class PostsController < ApplicationController
 end
 ```
 
-To use a method other than `current_user`, put the following in an intializer:
+To use a method other than `current_user`, put the following in an initializer:
 
 ```ruby
 Audited.current_user_method = :authenticated_user

data/gemfiles/rails40.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
 gem "rails-observers"
+gem "test-unit"
 
 gemspec :name => "audited", :path => "../"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "rails-observers"
+
+gemspec :name => "audited", :path => "../"

data/lib/audited.rb

@@ -1,9 +1,7 @@
-require 'rails/observers/active_model/active_model' 
+require 'rails/observers/active_model/active_model'
 
 
 module Audited
-  VERSION = '4.0.0'
-
   class << self
     attr_accessor :ignored_attributes, :current_user_method, :audit_class
 

data/lib/audited/active_record/version.rb

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

data/lib/audited/auditor.rb

@@ -139,7 +139,7 @@ module Audited
       def revision_with(attributes)
         self.dup.tap do |revision|
           revision.id = id
-          revision.send :instance_variable_set, '@attributes', self.attributes
+          revision.send :instance_variable_set, '@attributes', self.attributes if rails_below?('4.2.0')
           revision.send :instance_variable_set, '@new_record', self.destroyed?
           revision.send :instance_variable_set, '@persisted', !self.destroyed?
           revision.send :instance_variable_set, '@readonly', false
@@ -162,6 +162,10 @@ module Audited
         end
       end
 
+      def rails_below?(rails_version)
+        Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new(rails_version)
+      end
+
       private
 
       def audited_changes
@@ -197,7 +201,7 @@ module Audited
 
       def audit_destroy
         write_audit(:action => 'destroy', :audited_changes => audited_attributes,
-                    :comment => audit_comment)
+                    :comment => audit_comment) unless self.new_record?
       end
 
       def write_audit(attrs)
@@ -234,10 +238,12 @@ module Audited
       #     @foo.save
       #   end
       #
-      def without_auditing(&block)
+      def without_auditing
         auditing_was_enabled = auditing_enabled
         disable_auditing
-        block.call.tap { enable_auditing if auditing_was_enabled }
+        yield
+      ensure
+        enable_auditing if auditing_was_enabled
       end
 
       def disable_auditing

data/lib/audited/mongo_mapper/version.rb

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

data/lib/audited/version.rb

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

data/spec/audited_spec_helpers.rb

@@ -5,6 +5,11 @@ module AuditedSpecHelpers
     klass.create({:name => 'Brandon', :username => 'brandon', :password => 'password'}.merge(attrs))
   end
 
+  def build_user(use_mongo = false, attrs = {})
+    klass = use_mongo ? Models::MongoMapper::User : Models::ActiveRecord::User
+    klass.new({:name => 'darth', :username => 'darth', :password => 'noooooooo'}.merge(attrs))
+  end
+
   def create_versions(n = 2, use_mongo = false)
     klass = use_mongo ? Models::MongoMapper::User : Models::ActiveRecord::User
 

data/spec/rails_app/config/database.yml

@@ -9,12 +9,12 @@ sqlite3: &SQLITE
 postgresql: &POSTGRES
   adapter: postgresql
   username: postgres
-  password: postgres
+  password:
   database: audited_test
   min_messages: ERROR
 
 mysql: &MYSQL
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   username: root
   password:

data/spec/rails_app/config/environments/test.rb

@@ -1,35 +1,44 @@
 RailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  # config.whiny_nils = true
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  # config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  config.action_dispatch.show_exceptions = false
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  config.eager_load = false
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

data/spec/support/active_record/schema.rb

@@ -1,7 +1,7 @@
 require 'active_record'
 require 'logger'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection
 ActiveRecord::Base.logger = Logger.new(SPEC_ROOT.join('debug.log'))
 ActiveRecord::Migration.verbose = false
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.2.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -14,145 +13,157 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2015-03-31 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
+  name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.13.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.13.0.beta2
 - !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 description: Log all changes to your models
 email: info@collectiveidea.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG
 - Gemfile
@@ -161,6 +172,7 @@ files:
 - Rakefile
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
 - lib/audited.rb
 - lib/audited/active_record/version.rb
 - lib/audited/audit.rb
@@ -197,33 +209,26 @@ files:
 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: '0'
-      segments:
-      - 0
-      hash: -725083918367119279
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Log all changes to your models
 test_files:
 - spec/audited_spec_helpers.rb