acts_as_audited 2.0.0.rc7 → 2.0.0

data/.gitignore

@@ -0,0 +1,10 @@
+acts_as_audited_plugin.sqlite3.db
+*.log
+doc/
+coverage/
+pkg
+*.swp
+.bundle
+tmp/*
+.yardoc
+.rvmrc

data/CHANGELOG

@@ -1,12 +1,11 @@
 acts_as_audited ChangeLog
 -------------------------------------------------------------------------------
 
-Not released - 2.0.0
-  Rails 3 support
-  Support for associated audits
-  Support for remote IP address storage
-  Plenty of bug fixes and refactoring
-
+* 2011-09-09 - Rails 3.x support
+               Support for associated audits
+               Support for remote IP address storage
+               Plenty of bug fixes and refactoring
+               [kennethkalmer, ineu, PatrickMa, jrozner, dwarburton, bsiggelkow, dgm]
 * 2009-01-27 - Store old and new values for updates, and store all attributes on destroy.
                Refactored revisioning methods to work as expected
 * 2008-10-10 - changed to make it work in development mode

data/Gemfile

@@ -1,11 +1,7 @@
-source :gemcutter
+source 'http://rubygems.org'
 
 gem "rails", ">= 3.0.3"
-
-group :development do
-  gem "sqlite3-ruby"
-  gem "rspec-rails", "~> 2.4.0"
-  gem "rcov"
-  gem "yard"
-  gem "jeweler"
-end
+gem "sqlite3"
+gem "rspec-rails", "~> 2.4.0"
+gem "rcov"
+gem "yard"

data/Gemfile.lock

@@ -1,73 +1,76 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    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)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    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-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    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.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      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)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rcov (0.9.9)
+      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)
@@ -81,22 +84,25 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.4.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sqlite3-ruby (1.3.2)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    sqlite3 (1.3.4)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    yard (0.6.1)
+    tzinfo (0.3.29)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
-  rails (>= 3.0.4)
+  rails (>= 3.0.3)
   rcov
   rspec-rails (~> 2.4.0)
-  sqlite3-ruby
+  sqlite3
   yard

data/README.textile

@@ -0,0 +1,143 @@
+h1. 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+
+has been updated to work with Rails 3, to use it with older version of Rails,
+please see the <tt>1.1-stable</tt> branch.
+
+h2. Installation
+
+In <tt>Gemfile</tt>:
+
+@gem "acts_as_audited", "2.0.0"@
+
+In your application root, run:
+
+@$ bundle install@
+
+Generate the migration:
+
+* If installing without a previous version of +acts_as_audited+ or you do not mind overwriting your audits table:
+
+@$ rails g acts_as_audited:install@
+
+* If upgrading from a previous version of +acts_as_audited+ you might need some alterations to the audits table:
+
+@$ rails g acts_as_audited:upgrade@
+
+* After running one of the generators:
+
+@$ rake db:migrate@
+
+h2. Rails deprecation warning
+
+Currently the gem causes the following deprecation warning to be emitted:
+
+@DEPRECATION WARNING: reorder is deprecated. Please use except(:order).order(...) instead. (called from <class:Audit> at /Users/kenneth/Code/FOSS/acts_as_audited/lib/acts_as_audited/audit.rb:26)@
+
+I'm well aware of the fact, and working towards a solution. The issue has also been brought up on the Rails lighthouse as "#6011":https://rails.lighthouseapp.com/projects/8994/tickets/6011-exceptorderorder-is-not-working-in-scopes. I'm keeping an eye on the issue and working towards another possible solution.
+
+h2. Upgrading
+
+Upgrading to Rails 3, or even between point releases of +acts_as_audited+, might require alterations to the audits table. After every upgrade please run the following generator:
+
+@$ rails g acts_as_audited:upgrade@
+
+The upgrade generator will only generate migrations that are missing, or no migrations at all if you are up to date.
+
+h2. Usage
+
+Declare +acts_as_audited+ on your models:
+
+<pre><code>class User < ActiveRecord::Base
+  acts_as_audited :except => [:password, :mistress]
+end
+</code></pre>
+
+Within a web request, will automatically record the user that made the change if your controller has a +current_user+ method. Comments can be added to an audit by setting <tt>model.audit_comments</tt>
+before create/update/destroy. If the <tt>:comment_required</tt> option is given to +acts_as_audited+,
+the save/update/destroy action will fail with add an error on <tt>model.audit_comment</tt> and triggering a
+transaction rollback if <tt>model.audit_comment</tt> is nil.
+
+To record an audit for an associated model, use the <tt>:associated_with</tt> option.
+
+<pre><code>class User < ActiveRecord::Base
+  acts_as_audited :associated_with => :company
+end
+</code></pre>
+
+If desired, the associated model can access its audits using <tt>has_associated_audits</tt>.
+
+<pre><code>class Company < ActiveRecord::Base
+  has_many :users
+  has_associated_audits
+end
+</code></pre>
+
+To record a user in the audits outside of a web request, you can use +as_user+:
+
+<pre><code>Audit.as_user(user) do
+  # Perform changes on audited models
+end
+</code></pre>
+
+h2. Caveats
+
+If your model declares +attr_accessible+ after +acts_as_audited+, you need to set <tt>:protect</tt> to false. acts_as_audited uses +attr_protected+ internally to prevent malicious users from unassociating your audits, and Rails does not allow both +attr_protected+ and +attr_accessible+. It will default to false if +attr_accessible+ is called before +acts_as_audited+, but needs to be explicitly set if it is called after.
+
+<pre><code>class User < ActiveRecord::Base
+  acts_as_audited :protect => false
+  attr_accessible :name
+end
+</code></pre>
+
+Another caveat is documented in "issue 26":https://github.com/collectiveidea/acts_as_audited/issues#issue/26, where an audit created on the first request to the server does not have a user. Please review the Github issue for more details on how to fix this. It does not appear to affect Rails 3.
+
+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.
+
+h2. Getting Help
+
+Review the documentation at "http://rdoc.info/github/collectiveidea/acts_as_audited":http://rdoc.info/github/collectiveidea/acts_as_audited
+
+Join "the mailing list":http://groups.google.com/group/acts_as_audited for getting help or offering suggestions.
+
+h2. Branches
+
+The <tt>master</tt> branch is considered stable, and you should be able to use it at any time.
+
+h2. Contributing
+
+In the spirit of "free software":http://www.fsf.org/licensing/essays/free-sw.html, **everyone** is encouraged to help improve this project.
+
+Here are some ways *you* can contribute:
+
+* using alpha, beta, and prerelease versions
+* reporting bugs
+* suggesting new features
+* writing or editing documentation
+* writing specifications
+* writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
+* refactoring code
+* closing "issues":https://github.com/collectiveidea/acts_as_audited/issues
+* reviewing patches
+
+h2. Submitting an Issue
+
+We use the "GitHub issue tracker":https://github.com/collectiveidea/acts_as_audited/issues to track bugs
+and features. Before submitting a bug report or feature request, check to make sure it hasn't already
+been submitted. You can indicate support for an existing issuse by voting it up. When submitting a
+bug report, please include a "Gist":https://gist.github.com/ that includes a stack trace and any
+details that may be necessary to reproduce the bug, including your gem version, Ruby version, and
+operating system. Ideally, a bug report should include a pull request with failing specs.
+
+h2. Submitting a Pull Request
+
+1. Fork the project.
+2. Create a topic branch.
+3. Implement your feature or bug fix.
+4. Add specs for your feature or bug fix.
+5. Run @bundle exec rake@. If your changes are not 100% covered and passing, go back to step 4.
+6. Commit and push your changes.
+7. Submit a pull request. Please do not include changes to the gemspec, version, or history file. (If you want to create your own version for some reason, please do so in a separate commit.)

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake'
 require 'rspec/core/rake_task'
 require 'rake/testtask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 $:.unshift File.expand_path('../lib', __FILE__)
 
@@ -9,30 +11,11 @@ require 'acts_as_audited'
 desc 'Default: run specs and tests'
 task :default => [:spec, :test]
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "acts_as_audited"
-    gem.summary = %Q{ActiveRecord extension that logs all changes to your models in an audits table}
-    gem.email = "brandon@opensoul.org"
-    gem.homepage = "http://github.com/collectiveidea/acts_as_audited"
-    gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
-    gem.rdoc_options << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
-    gem.version = ActsAsAudited::VERSION
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  # Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: bundle install"
-end
-
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
   t.pattern = 'spec/*_spec.rb'
 end
 
-task :spec => :check_dependencies
-
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
   t.rcov_opts =  %q[--exclude "spec"]
@@ -46,8 +29,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-task :test => :check_dependencies
-
 begin
   require 'yard'
   YARD::Rake::YardocTask.new

data/acts_as_audited.gemspec

@@ -1,126 +1,18 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{acts_as_audited}
-  s.version = "2.0.0.rc7"
+Gem::Specification.new do |gem|
+  gem.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Keepers", "Kenneth Kalmer"]
-  s.date = %q{2011-02-18}
-  s.email = %q{brandon@opensoul.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".yardopts",
-    "CHANGELOG",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "acts_as_audited.gemspec",
-    "autotest/discover.rb",
-    "lib/acts_as_audited.rb",
-    "lib/acts_as_audited/audit.rb",
-    "lib/acts_as_audited/audit_sweeper.rb",
-    "lib/acts_as_audited/auditor.rb",
-    "lib/generators/acts_as_audited/install_generator.rb",
-    "lib/generators/acts_as_audited/templates/add_association_to_audits.rb",
-    "lib/generators/acts_as_audited/templates/add_comment_to_audits.rb",
-    "lib/generators/acts_as_audited/templates/add_remote_address_to_audits.rb",
-    "lib/generators/acts_as_audited/templates/install.rb",
-    "lib/generators/acts_as_audited/templates/rename_changes_to_audited_changes.rb",
-    "lib/generators/acts_as_audited/templates/rename_parent_to_association.rb",
-    "lib/generators/acts_as_audited/upgrade_generator.rb",
-    "spec/acts_as_audited_spec.rb",
-    "spec/audit_spec.rb",
-    "spec/audit_sweeper_spec.rb",
-    "spec/audited_spec_helpers.rb",
-    "spec/db/schema.rb",
-    "spec/rails_app/config/application.rb",
-    "spec/rails_app/config/boot.rb",
-    "spec/rails_app/config/database.yml",
-    "spec/rails_app/config/environment.rb",
-    "spec/rails_app/config/environments/development.rb",
-    "spec/rails_app/config/environments/production.rb",
-    "spec/rails_app/config/environments/test.rb",
-    "spec/rails_app/config/initializers/backtrace_silencers.rb",
-    "spec/rails_app/config/initializers/inflections.rb",
-    "spec/rails_app/config/initializers/secret_token.rb",
-    "spec/rails_app/config/routes.rb",
-    "spec/spec_helper.rb",
-    "spec/spec_models.rb",
-    "test/db/version_1.rb",
-    "test/db/version_2.rb",
-    "test/db/version_3.rb",
-    "test/db/version_4.rb",
-    "test/install_generator_test.rb",
-    "test/test_helper.rb",
-    "test/upgrade_generator_test.rb"
-  ]
-  s.homepage = %q{http://github.com/collectiveidea/acts_as_audited}
-  s.rdoc_options = ["--main", "README.rdoc", "--line-numbers", "--inline-source"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{ActiveRecord extension that logs all changes to your models in an audits table}
-  s.test_files = [
-    "spec/acts_as_audited_spec.rb",
-    "spec/audit_spec.rb",
-    "spec/audit_sweeper_spec.rb",
-    "spec/audited_spec_helpers.rb",
-    "spec/db/schema.rb",
-    "spec/rails_app/config/application.rb",
-    "spec/rails_app/config/boot.rb",
-    "spec/rails_app/config/environment.rb",
-    "spec/rails_app/config/environments/development.rb",
-    "spec/rails_app/config/environments/production.rb",
-    "spec/rails_app/config/environments/test.rb",
-    "spec/rails_app/config/initializers/backtrace_silencers.rb",
-    "spec/rails_app/config/initializers/inflections.rb",
-    "spec/rails_app/config/initializers/secret_token.rb",
-    "spec/rails_app/config/routes.rb",
-    "spec/spec_helper.rb",
-    "spec/spec_models.rb",
-    "test/db/version_1.rb",
-    "test/db/version_2.rb",
-    "test/db/version_3.rb",
-    "test/db/version_4.rb",
-    "test/install_generator_test.rb",
-    "test/test_helper.rb",
-    "test/upgrade_generator_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0.3"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
+  gem.email = 'brandon@opensoul.org'
+  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.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"
 end
 

data/lib/acts_as_audited.rb

@@ -24,7 +24,7 @@ require 'active_record'
 
 # To get started, please review ActsAsAudited::Auditor::ClassMethods#acts_as_audited
 module ActsAsAudited
-  VERSION = '2.0.0.rc7'
+  VERSION = '2.0.0'
 
   mattr_accessor :current_user_method
   # The method to be called to return the current user for logging in the audits.

data/lib/acts_as_audited/audit.rb

@@ -12,7 +12,7 @@ require 'set'
 class Audit < ActiveRecord::Base
   belongs_to :auditable, :polymorphic => true
   belongs_to :user, :polymorphic => true
-  belongs_to :association, :polymorphic => true
+  belongs_to :associated, :polymorphic => true
 
   before_create :set_version_number, :set_audit_user
 
@@ -58,6 +58,8 @@ class Audit < ActiveRecord::Base
     # @private
     def assign_revision_attributes(record, attributes)
       attributes.each do |attr, val|
+        record = record.dup if record.frozen?
+
         if record.respond_to?("#{attr}=")
           record.attributes.has_key?(attr.to_s) ?
             record[attr] = val :

data/lib/acts_as_audited/audit_sweeper.rb

@@ -4,7 +4,7 @@ class AuditSweeper < ActionController::Caching::Sweeper
 
   def before_create(audit)
     audit.user ||= current_user
-    audit.remote_address = controller.try(:request).try(:remote_ip)
+    audit.remote_address = controller.try(:request).try(:ip)
   end
 
   def current_user

data/lib/acts_as_audited/auditor.rb

@@ -52,9 +52,9 @@ module ActsAsAudited
 
         options = {:protect => accessible_attributes.empty?}.merge(options)
 
-        class_inheritable_reader :non_audited_columns
-        class_inheritable_reader :auditing_enabled
-        class_inheritable_reader :audit_associated_with
+        class_attribute :non_audited_columns, :instance_writer => false
+        class_attribute :auditing_enabled, :instance_writer => false
+        class_attribute :audit_associated_with, :instance_writer => false
 
         if options[:only]
           except = self.column_names - options[:only].flatten.map(&:to_s)
@@ -63,8 +63,8 @@ module ActsAsAudited
             'created_at', 'updated_at', 'created_on', 'updated_on']
           except |= Array(options[:except]).collect(&:to_s) if options[:except]
         end
-        write_inheritable_attribute :non_audited_columns, except
-        write_inheritable_attribute :audit_associated_with, options[:associated_with]
+        self.non_audited_columns = except
+        self.audit_associated_with = options[:associated_with]
 
         if options[:comment_required]
           validates_presence_of :audit_comment, :if => :auditing_enabled
@@ -89,11 +89,11 @@ module ActsAsAudited
         extend ActsAsAudited::Auditor::SingletonMethods
         include ActsAsAudited::Auditor::InstanceMethods
 
-        write_inheritable_attribute :auditing_enabled, true
+        self.auditing_enabled = true
       end
 
       def has_associated_audits
-        has_many :associated_audits, :as => :association, :class_name => "Audit"
+        has_many :associated_audits, :as => :associated, :class_name => "Audit"
       end
 
     end
@@ -125,8 +125,11 @@ module ActsAsAudited
       def revisions(from_version = 1)
         audits = self.audits.where(['version >= ?', from_version])
         return [] if audits.empty?
-        revision = self.audits.find_by_version(from_version).revision
-        Audit.reconstruct_attributes(audits) {|attrs| revision.revision_with(attrs) }
+        revisions = []
+        audits.each do |audit|
+          revisions << audit.revision
+        end
+        revisions
       end
 
       # Get a specific revision specified by the version number, or +:previous+
@@ -210,7 +213,7 @@ module ActsAsAudited
       end
 
       def write_audit(attrs)
-        attrs[:association] = self.send(audit_associated_with) unless audit_associated_with.nil?
+        attrs[:associated] = self.send(audit_associated_with) unless audit_associated_with.nil?
         self.audit_comment = nil
         self.audits.create attrs if auditing_enabled
       end
@@ -251,12 +254,12 @@ module ActsAsAudited
 
       # Disable auditing.
       def disable_auditing
-        write_inheritable_attribute :auditing_enabled, false
+        self.auditing_enabled = false
       end
 
       # Enable auditing.
       def enable_auditing
-        write_inheritable_attribute :auditing_enabled, true
+        self.auditing_enabled = true
       end
 
       # All audit operations during the block are recorded as being

data/lib/generators/acts_as_audited/templates/install.rb

@@ -3,8 +3,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     create_table :audits, :force => true do |t|
       t.column :auditable_id, :integer
       t.column :auditable_type, :string
-      t.column :association_id, :integer
-      t.column :association_type, :string
+      t.column :associated_id, :integer
+      t.column :associated_type, :string
       t.column :user_id, :integer
       t.column :user_type, :string
       t.column :username, :string
@@ -17,7 +17,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     end
 
     add_index :audits, [:auditable_id, :auditable_type], :name => 'auditable_index'
-    add_index :audits, [:association_id, :association_type], :name => 'association_index'
+    add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
     add_index :audits, [:user_id, :user_type], :name => 'user_index'
     add_index :audits, :created_at
   end

data/lib/generators/acts_as_audited/templates/rename_association_to_associated.rb

@@ -0,0 +1,23 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    if index_exists? :audits, [:association_id, :association_type], :name => 'association_index'
+      remove_index :audits, :name => 'association_index'
+    end
+
+    rename_column :audits, :association_id, :associated_id
+    rename_column :audits, :association_type, :associated_type
+
+    add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
+  end
+
+  def self.down
+    if index_exists? :audits, [:associated_id, :associated_type], :name => 'associated_index'
+      remove_index :audits, :name => 'associated_index'
+    end
+
+    rename_column :audits, :associated_type, :association_type
+    rename_column :audits, :associated_id, :association_id
+
+    add_index :audits, [:association_id, :association_type], :name => 'association_index'
+  end
+end

data/lib/generators/acts_as_audited/upgrade_generator.rb

@@ -48,9 +48,15 @@ module ActsAsAudited
           if columns.include?('auditable_parent_id')
             yield :rename_parent_to_association
           else
-            yield :add_association_to_audits
+            unless columns.include?( 'associated_id' )
+              yield :add_association_to_audits
+            end
           end
         end
+
+        if columns.include?( 'association_id' )
+          yield :rename_association_to_associated
+        end
       end
     end
   end

data/spec/acts_as_audited_spec.rb

@@ -175,17 +175,17 @@ describe ActsAsAudited::Auditor do
     let(:owned_company) { OwnedCompany.create!(:name => 'The auditors', :owner => owner) }
 
     it "should record the associated object on create" do
-      owned_company.audits.first.association.should == owner
+      owned_company.audits.first.associated.should == owner
     end
 
     it "should store the associated object on update" do
       owned_company.update_attribute(:name, 'The Auditors')
-      owned_company.audits.last.association.should == owner
+      owned_company.audits.last.associated.should == owner
     end
 
     it "should store the associated object on destroy" do
       owned_company.destroy
-      owned_company.audits.last.association.should == owner
+      owned_company.audits.last.associated.should == owner
     end
   end
 

data/spec/db/schema.rb

@@ -27,8 +27,8 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :audits, :force => true do |t|
     t.column :auditable_id, :integer
     t.column :auditable_type, :string
-    t.column :association_id, :integer
-    t.column :association_type, :string
+    t.column :associated_id, :integer
+    t.column :associated_type, :string
     t.column :user_id, :integer
     t.column :user_type, :string
     t.column :username, :string
@@ -41,7 +41,7 @@ ActiveRecord::Schema.define(:version => 0) do
   end
 
   add_index :audits, [:auditable_id, :auditable_type], :name => 'auditable_index'
-  add_index :audits, [:association_id, :association_type], :name => 'association_index'
+  add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
   add_index :audits, [:user_id, :user_type], :name => 'user_index'
   add_index :audits, :created_at
 end

data/test/db/version_5.rb

@@ -0,0 +1,18 @@
+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 :association_id, :integer
+    t.column :association_type, :string
+  end
+end
+

data/test/upgrade_generator_test.rb

@@ -41,7 +41,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  test "should add 'associated_id' and 'associated_type' to audits table" do
+  test "should add 'association_id' and 'association_type' to audits table" do
     load_schema 4
 
     run_generator %w(upgrade)
@@ -51,4 +51,15 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
       assert_match /add_column :audits, :association_type, :string/, content
     end
   end
+
+  test "should rename 'association_id' to 'associated_id' and 'association_type' to 'associated_type'" do
+    load_schema 5
+
+    run_generator %w(upgrade)
+
+    assert_migration "db/migrate/rename_association_to_associated.rb" do |content|
+      assert_match /rename_column :audits, :association_id, :associated_id/, content
+      assert_match /rename_column :audits, :association_type, :associated_type/, content
+    end
+  end
 end

metadata

@@ -1,129 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_audited
-version: !ruby/object:Gem::Version 
-  hash: 977940584
-  prerelease: true
-  segments: 
-  - 2
-  - 0
-  - 0
-  - rc7
-  version: 2.0.0.rc7
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 - Kenneth Kalmer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2011-09-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70322406432300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: sqlite3-ruby
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rspec-rails
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: yard
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
-  name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+  version_requirements: *70322406432300
 description: 
 email: brandon@opensoul.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - .yardopts
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.textile
 - Rakefile
 - acts_as_audited.gemspec
 - autotest/discover.rb
@@ -136,6 +48,7 @@ files:
 - lib/generators/acts_as_audited/templates/add_comment_to_audits.rb
 - lib/generators/acts_as_audited/templates/add_remote_address_to_audits.rb
 - lib/generators/acts_as_audited/templates/install.rb
+- lib/generators/acts_as_audited/templates/rename_association_to_associated.rb
 - lib/generators/acts_as_audited/templates/rename_changes_to_audited_changes.rb
 - lib/generators/acts_as_audited/templates/rename_parent_to_association.rb
 - lib/generators/acts_as_audited/upgrade_generator.rb
@@ -161,49 +74,40 @@ files:
 - test/db/version_2.rb
 - test/db/version_3.rb
 - test/db/version_4.rb
+- test/db/version_5.rb
 - test/install_generator_test.rb
 - test/test_helper.rb
 - test/upgrade_generator_test.rb
-has_rdoc: true
 homepage: http://github.com/collectiveidea/acts_as_audited
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: ActiveRecord extension that logs all changes to your models in an audits table
-test_files: 
+summary: ActiveRecord extension that logs all changes to your models in an audits
+  table
+test_files:
 - spec/acts_as_audited_spec.rb
 - spec/audit_spec.rb
 - spec/audit_sweeper_spec.rb
@@ -211,6 +115,7 @@ test_files:
 - spec/db/schema.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
 - spec/rails_app/config/environment.rb
 - spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/production.rb
@@ -225,6 +130,7 @@ test_files:
 - test/db/version_2.rb
 - test/db/version_3.rb
 - test/db/version_4.rb
+- test/db/version_5.rb
 - test/install_generator_test.rb
 - test/test_helper.rb
 - test/upgrade_generator_test.rb

data/README.rdoc

@@ -1,120 +0,0 @@
-= 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+
-has been updated to work with Rails 3, to use it with older version of Rails,
-please see the <tt>1.1-stable</tt> branch.
-
-== Installation
-
-In <tt>Gemfile</tt>:
-
-    gem "acts_as_audited", "2.0.0.rc5"
-
-In your application root, run:
-
-    $ bundle install
-
-Generate the migration:
-
-* If installing without a previous version of +acts_as_audited+ or you do not mind overwriting your audits table:
-
-    $ rails g acts_as_audited:install
-
-* If upgrading from a previous version of +acts_as_audited+ you might need some alterations to the audits table:
-
-    $ rails g acts_as_audited:upgrade
-
-* After running one of the generators:
-
-    $ rake db:migrate
-
-== Rails deprecation warning
-
-Currently the gem causes the following deprecation warning to be emitted:
-
-    DEPRECATION WARNING: reorder is deprecated. Please use except(:order).order(...) instead. (called from <class:Audit> at /Users/kenneth/Code/FOSS/acts_as_audited/lib/acts_as_audited/audit.rb:26)
-
-I'm well aware of the fact, and working towards a solution. The issue has also been brought up on the Rails lighthouse as #6011[https://rails.lighthouseapp.com/projects/8994/tickets/6011-exceptorderorder-is-not-working-in-scopes]. I'm keeping an eye on the issue and working towards another possible solution.
-
-== Upgrading
-
-Upgrading to Rails 3, or even between point releases of +acts_as_audited+, might require alterations to the audits table. After every upgrade please run the following generator:
-
-    $ rails g acts_as_audited:upgrade
-
-The upgrade generator will only generate migrations that are missing, or no migrations at all if you are up to date.
-
-== Usage
-
-Declare +acts_as_audited+ on your models:
-
-    class User < ActiveRecord::Base
-      acts_as_audited :except => [:password, :mistress]
-    end
-
-Within a web request, will automatically record the user that made the change if your controller has a +current_user+ method. Comments can be added to an audit by setting <tt>model.audit_comments</tt> 
-before create/update/destroy. If the <tt>:comment_required</tt> option is given to +acts_as_audited+, 
-the save/update/destroy action will fail with add an error on <tt>model.audit_comment</tt> and triggering a 
-transaction rollback if <tt>model.audit_comment</tt> is nil.
-
-To record an audit for an associated model, use the <tt>:associated_with</tt> option.
-
-    class User < ActiveRecord::Base
-      acts_as_audited :associated_with => :company
-    end
-
-If desired, the associated model can access its audits using <tt>has_associated_audits</tt>.
-
-    class Company < ActiveRecord::Base
-      has_many :users
-      has_associated_audits
-    end
-
-To record a user in the audits outside of a web request, you can use +as_user+:
-
-    Audit.as_user(user) do
-      # Perform changes on audited models
-    end
-
-== Caveats
-
-If your model declares +attr_accessible+ after +acts_as_audited+, you need to set <tt>:protect</tt> to false. acts_as_audited uses +attr_protected+ internally to prevent malicious users from unassociating your audits, and Rails does not allow both +attr_protected+ and +attr_accessible+. It will default to false if +attr_accessible+ is called before +acts_as_audited+, but needs to be explicitly set if it is called after.
-
-  class User < ActiveRecord::Base
-    acts_as_audited :protect => false
-    attr_accessible :name
-  end
-
-Another caveat is documented in issue 26[https://github.com/collectiveidea/acts_as_audited/issues#issue/26], where an audit created on the first request to the server does not have a user. Please review the Github issue for more details on how to fix this. It does not appear to affect Rails 3.
-
-== Compatability
-
-+acts_as_audited+ works with Rails 3.0.3. For older versions of Rails, please see the <tt>1.1-stable</tt> branch.
-
-== Getting Help
-
-Review the documentation at http://rdoc.info/github/collectiveidea/acts_as_audited
-
-Join the mailing list for getting help or offering suggestions - http://groups.google.com/group/acts_as_audited
-
-== Branches
-
-The <tt>master</tt> branch is considered stable, and you should be able to use it at any time. The <tt>development</tt> branch will contain all active development and might be a moving target from time to time.
-
-== Contributing
-
-Contributions are always welcome. Checkout the latest code on GitHub - http://github.com/collectiveidea/acts_as_audited
-
-When contributing a bug-fix, please use a topic branch created off our <tt>master</tt> branch. When developing a new feature, please create a topic branch of our <tt>development</tt> branch (and rebase before submiting a pull request).
-
-Please include tests with your patches. There are a few gems required to run the tests:
-
-  $ bundle install
-
-Make sure the tests pass against the version of Rails specified in the Gemfile
-
-  $ rake spec test
-
-Please report bugs or feature suggestions on GitHub - http://github.com/collectiveidea/acts_as_audited/issues
-