acts_as_audited 2.0.0 → 2.1.0

data/.gitignore

@@ -7,4 +7,5 @@ pkg
 .bundle
 tmp/*
 .yardoc
-.rvmrc
+.rvmrc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/CHANGELOG

@@ -1,6 +1,7 @@
 acts_as_audited ChangeLog
 -------------------------------------------------------------------------------
-
+* 2012-04-10 - Add Audit scopes for creates, updates and destroys [chriswfx]
+* 2011-10-25 - Made ignored_attributes configurable [senny]
 * 2011-09-09 - Rails 3.x support
                Support for associated audits
                Support for remote IP address storage

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem "rails", ">= 3.0.3"
+gemspec
+
 gem "sqlite3"
-gem "rspec-rails", "~> 2.4.0"
-gem "rcov"
-gem "yard"
+gem "rspec-rails", "~> 2.0"
+gem "simplecov"

data/README.textile

@@ -1,4 +1,5 @@
-h1. acts_as_audited
+h1. acts_as_audited !https://secure.travis-ci.org/collectiveidea/acts_as_audited.png?branch=master(Build Status)!:http://travis-ci.org/collectiveidea/acts_as_audited !https://gemnasium.com/collectiveidea/acts_as_audited.png(Dependency Status)!:https://gemnasium.com/collectiveidea/acts_as_audited
+
 
 +acts_as_audited+ is an ActiveRecord extension that logs all changes to your
 models in an audits table, with optional revision comments. +acts_as_audited+
@@ -95,7 +96,7 @@ Another caveat is documented in "issue 26":https://github.com/collectiveidea/act
 
 h2. Compatability
 
-+acts_as_audited+ works with Rails 3.0.3 – 3.1.0. For older versions of Rails, please see the <tt>1.1-stable</tt> branch.
++acts_as_audited+ works with Rails 3.0+. For older versions of Rails, please see the <tt>1.1-stable</tt> branch.
 
 h2. Getting Help
 

data/acts_as_audited.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
+  gem.add_runtime_dependency "rails", "~> 3.0", ">= 3.0.3"
 
-  gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
-  gem.email = 'brandon@opensoul.org'
+  gem.authors = ["Brandon Keepers", "Kenneth Kalmer", "Daniel Morrison", "Brian Ryckbost"]
+  gem.email = 'daniel@collectiveidea.com  '
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   gem.files = `git ls-files`.split("\n")
-  gem.homepage = %q{http://github.com/collectiveidea/acts_as_audited}
+  gem.homepage = %q{https://github.com/collectiveidea/acts_as_audited}
   gem.rdoc_options = ["--main", "README.rdoc", "--line-numbers", "--inline-source"]
   gem.require_paths = ["lib"]
   gem.name = 'acts_as_audited'
   gem.summary = %q{ActiveRecord extension that logs all changes to your models in an audits table}
   gem.test_files = `git ls-files -- spec/* test/*`.split("\n")
-  gem.version = "2.0.0"
+  gem.version = "2.1.0"
 end
 

data/autotest/discover.rb

@@ -1 +1 @@
-Autotest.add_discovery { "rspec2" }
+Autotest.add_discovery { "rspec2" }

data/lib/acts_as_audited.rb

@@ -19,17 +19,23 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'active_support/core_ext/module'
 require 'active_record'
 
 # To get started, please review ActsAsAudited::Auditor::ClassMethods#acts_as_audited
 module ActsAsAudited
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 
-  mattr_accessor :current_user_method
-  # The method to be called to return the current user for logging in the audits.
-  @@current_user_method = :current_user
+  class << self
+    attr_accessor :ignored_attributes, :current_user_method
+  end
+  @ignored_attributes ||= ['lock_version',
+                          'created_at',
+                          'updated_at',
+                          'created_on',
+                          'updated_on']
 
+  # The method to be called to return the current user for logging in the audits.
+  @current_user_method = :current_user
 end
 
 require 'acts_as_audited/auditor'

data/lib/acts_as_audited/audit.rb

@@ -25,6 +25,10 @@ class Audit < ActiveRecord::Base
   default_scope order(:version)
   scope :descending, reorder("version DESC")
 
+  scope :creates,   :conditions => {:action => 'create'}
+  scope :updates,   :conditions => {:action => 'update'}
+  scope :destroys,  :conditions => {:action => 'destroy'}
+
   class << self
 
     # Returns the list of classes that are being audited

data/lib/acts_as_audited/auditor.rb

@@ -34,7 +34,7 @@ module ActsAsAudited
       #       acts_as_audited :except => :password
       #     end
       # * +protect+ - If your model uses +attr_protected+, set this to false to prevent Rails from
-      #   raising an error.  If you declare +attr_accessibe+ before calling +acts_as_audited+, it
+      #   raising an error.  If you declare +attr_accessible+ before calling +acts_as_audited+, it
       #   will automatically default to false.  You only need to explicitly set this if you are
       #   calling +attr_accessible+ after.
       #
@@ -59,8 +59,7 @@ module ActsAsAudited
         if options[:only]
           except = self.column_names - options[:only].flatten.map(&:to_s)
         else
-          except = [self.primary_key, inheritance_column, 'lock_version',
-            'created_at', 'updated_at', 'created_on', 'updated_on']
+          except = [self.primary_key, inheritance_column] + ActsAsAudited.ignored_attributes
           except |= Array(options[:except]).collect(&:to_s) if options[:except]
         end
         self.non_audited_columns = except

data/spec/acts_as_audited_spec.rb

@@ -17,6 +17,15 @@ describe ActsAsAudited::Auditor do
       end
     end
 
+    it "should be configurable which attributes are not audited" do
+      ActsAsAudited.ignored_attributes = ['delta', 'top_secret', 'created_at']
+      class Secret < ActiveRecord::Base
+        acts_as_audited
+      end
+
+      Secret.non_audited_columns.should include('delta', 'top_secret', 'created_at')
+    end
+
     it "should not save non-audited columns" do
       create_user.audits.first.audited_changes.keys.any? { |col| ['created_at', 'updated_at', 'password'].include?( col ) }.should be_false
     end
@@ -57,6 +66,10 @@ describe ActsAsAudited::Auditor do
 
     it "should set the action to create" do
       user.audits.first.action.should == 'create'
+      Audit.creates.reorder(:id).last.should == user.audits.first
+      user.audits.creates.count.should == 1
+      user.audits.updates.count.should == 0
+      user.audits.destroys.count.should == 0
     end
 
     it "should store all the audited attributes" do
@@ -102,6 +115,8 @@ describe ActsAsAudited::Auditor do
     it "should set the action to 'update'" do
       @user.update_attributes :name => 'Changed'
       @user.audits.last.action.should == 'update'
+      Audit.updates.reorder(:id).last.should == @user.audits.last
+      @user.audits.updates.last.should == @user.audits.last
     end
 
     it "should store the changed attributes" do
@@ -145,6 +160,8 @@ describe ActsAsAudited::Auditor do
       @user.destroy
 
       @user.audits.last.action.should == 'destroy'
+      Audit.destroys.reorder(:id).last.should == @user.audits.last
+      @user.audits.destroys.last.should == @user.audits.last
     end
 
     it "should store all of the audited attributes" do

data/spec/rails_app/config/application.rb

@@ -4,7 +4,6 @@ require "rails/all"
 
 Bundler.require :default
 
-
 module RailsApp
   class Application < Rails::Application
     # Ensure the root is correct

data/spec/rails_app/config/boot.rb

@@ -10,4 +10,4 @@ rescue LoadError
   Bundler.setup :default, DEVISE_ORM
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/rails_app/config/initializers/secret_token.rb

@@ -1,2 +1,2 @@
 Rails.application.config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
-Rails.application.config.session_store :cookie_store, :key => "_my_app"
+Rails.application.config.session_store :cookie_store, :key => "_my_app"

data/spec/spec_helper.rb

@@ -4,9 +4,7 @@ $:.unshift File.dirname(__FILE__)
 
 require 'rails_app/config/environment'
 require 'rspec/rails'
-
 require 'acts_as_audited'
-
 require 'audited_spec_helpers'
 
 RSpec.configure do |c|

data/spec/spec_models.rb

@@ -11,24 +11,24 @@ class User < ActiveRecord::Base
 end
 
 class CommentRequiredUser < ActiveRecord::Base
-  set_table_name :users
+  self.table_name = :users
   acts_as_audited :comment_required => true
 end
 
 class UnprotectedUser < ActiveRecord::Base
-  set_table_name :users
+  self.table_name = :users
   acts_as_audited :protect => false
   attr_accessible :name, :username, :password
 end
 
 class AccessibleUser < ActiveRecord::Base
-  set_table_name :users
+  self.table_name = :users
   attr_accessible :name, :username, :password # declare attr_accessible before calling aaa
   acts_as_audited
 end
 
 class NoAttributeProtectionUser < ActiveRecord::Base
-  set_table_name :users
+  self.table_name = :users
   acts_as_audited
 end
 
@@ -37,34 +37,34 @@ class Company < ActiveRecord::Base
 end
 
 class Owner < ActiveRecord::Base
-  set_table_name 'users'
+  self.table_name = 'users'
   has_associated_audits
 end
 
 class OwnedCompany < ActiveRecord::Base
-  set_table_name 'companies'
+  self.table_name = 'companies'
   belongs_to :owner, :class_name => "Owner"
   attr_accessible :name, :owner # declare attr_accessible before calling aaa
   acts_as_audited :associated_with => :owner
 end
 
 class OnUpdateDestroy < ActiveRecord::Base
-  set_table_name 'companies'
+  self.table_name = 'companies'
   acts_as_audited :on => [:update, :destroy]
 end
 
 class OnCreateDestroy < ActiveRecord::Base
-  set_table_name 'companies'
+  self.table_name = 'companies'
   acts_as_audited :on => [:create, :destroy]
 end
 
 class OnCreateDestroyExceptName < ActiveRecord::Base
-  set_table_name 'companies'
+  self.table_name = 'companies'
   acts_as_audited :except => :name, :on => [:create, :destroy]
 end
 
 class OnCreateUpdate < ActiveRecord::Base
-  set_table_name 'companies'
+  self.table_name = 'companies'
   acts_as_audited :on => [:create, :update]
 end
 

metadata

@@ -1,39 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_audited
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
 - Brandon Keepers
 - Kenneth Kalmer
+- Daniel Morrison
+- Brian Ryckbost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70322406432300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70322406432300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 description: 
-email: brandon@opensoul.org
+email: ! 'daniel@collectiveidea.com  '
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -78,7 +91,7 @@ files:
 - test/install_generator_test.rb
 - test/test_helper.rb
 - test/upgrade_generator_test.rb
-homepage: http://github.com/collectiveidea/acts_as_audited
+homepage: https://github.com/collectiveidea/acts_as_audited
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -102,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension that logs all changes to your models in an audits
@@ -134,3 +147,4 @@ test_files:
 - test/install_generator_test.rb
 - test/test_helper.rb
 - test/upgrade_generator_test.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,108 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.3)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
-      bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rdoc (3.9.4)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.4.0)
-    sprockets (2.0.0)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    sqlite3 (1.3.4)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    yard (0.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rails (>= 3.0.3)
-  rcov
-  rspec-rails (~> 2.4.0)
-  sqlite3
-  yard