acts_as_audited 1.1.1 → 2.0.0

data/.gitignore

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

data/.yardopts

@@ -0,0 +1,3 @@
+--no-private
+--title acts_as_audited
+--exclude lib/generators

data/CHANGELOG

@@ -1,8 +1,16 @@
- acts_as_audited ChangeLog
+acts_as_audited ChangeLog
 -------------------------------------------------------------------------------
+
+* 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
+* 2008-09-24 - Add ability to record parent record of the record being audited
+               [Kenneth Kalmer]
 * 2008-04-19 - refactored to make compatible with dirty tracking in edge rails
                and to stop storing both old and new values in a single audit
 * 2008-04-18 - Fix NoMethodError when trying to access the :previous revision
@@ -22,4 +30,4 @@
                that saves the new value after every change and not just the
                first, and performs proper type-casting before doing comparisons
 * 2006-08-14 - The "changes" are now saved as a serialized hash
-* 2006-07-21 - initial version
+* 2006-07-21 - initial version

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,108 @@
+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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2008 Brandon Keepers - Collective Idea
+Copyright © 2010 Brandon Keepers - Collective Idea
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

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,57 +1,38 @@
 require 'rake'
-require 'load_multi_rails_rake_tasks'
+require 'rspec/core/rake_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-desc 'Default: run tests.'
-task :default => :test
+$:.unshift File.expand_path('../lib', __FILE__)
 
-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"]
-    gem.add_dependency 'activerecord', '>=2.1'
-    gem.add_development_dependency "thoughtbot-shoulda"
-    gem.add_development_dependency "jnunemaker-matchy"
-    # 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: sudo gem install jeweler"
+require 'acts_as_audited'
+
+desc 'Default: run specs and tests'
+task :default => [:spec, :test]
+
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/*_spec.rb'
 end
 
-desc 'Test the acts_as_audited plugin'
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov = true
+  t.rcov_opts =  %q[--exclude "spec"]
+end
+
+desc 'Test the acts_as_audited generators'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
   t.verbose = true
 end
 
-task :test => :check_dependencies
-
 begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-    test.rcov_opts = %w(--exclude test,/usr/lib/ruby,/Library/Ruby,$HOME/.gem --sort coverage)
-  end
+  require 'yard'
+  YARD::Rake::YardocTask.new
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+  puts "YARD (or a dependency) not available. Install it with: bundle install"
 end
 
-desc 'Generate documentation for the acts_as_audited plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = 'acts_as_audited'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/acts_as_audited.gemspec

@@ -1,73 +1,18 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{acts_as_audited}
-  s.version = "1.1.1"
+Gem::Specification.new do |gem|
+  gem.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Keepers"]
-  s.date = %q{2010-04-03}
-  s.email = %q{brandon@opensoul.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "acts_as_audited.gemspec",
-     "generators/audited_migration/USAGE",
-     "generators/audited_migration/audited_migration_generator.rb",
-     "generators/audited_migration/templates/migration.rb",
-     "init.rb",
-     "lib/acts_as_audited.rb",
-     "lib/acts_as_audited/audit.rb",
-     "lib/acts_as_audited/audit_sweeper.rb",
-     "rails/init.rb",
-     "test/acts_as_audited_test.rb",
-     "test/audit_sweeper_test.rb",
-     "test/audit_test.rb",
-     "test/db/database.yml",
-     "test/db/schema.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/collectiveidea/acts_as_audited}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{ActiveRecord extension that logs all changes to your models in an audits table}
-  s.test_files = [
-    "test/acts_as_audited_test.rb",
-     "test/audit_sweeper_test.rb",
-     "test/audit_test.rb",
-     "test/db/schema.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.1"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_development_dependency(%q<jnunemaker-matchy>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.1"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<jnunemaker-matchy>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.1"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<jnunemaker-matchy>, [">= 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/autotest/discover.rb

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

data/lib/acts_as_audited/audit.rb

@@ -5,37 +5,75 @@ require 'set'
 # * <tt>auditable</tt>: the ActiveRecord model that was changed
 # * <tt>user</tt>: the user that performed the change; a string or an ActiveRecord model
 # * <tt>action</tt>: one of create, update, or delete
-# * <tt>changes</tt>: a serialized hash of all the changes
+# * <tt>audited_changes</tt>: a serialized hash of all the changes
+# * <tt>comment</tt>: a comment set with the audit
 # * <tt>created_at</tt>: Time that the change was performed
 #
 class Audit < ActiveRecord::Base
   belongs_to :auditable, :polymorphic => true
   belongs_to :user, :polymorphic => true
+  belongs_to :associated, :polymorphic => true
 
   before_create :set_version_number, :set_audit_user
 
-  serialize :changes
+  serialize :audited_changes
 
   cattr_accessor :audited_class_names
   self.audited_class_names = Set.new
 
-  def self.audited_classes
-    self.audited_class_names.map(&:constantize)
-  end
+  # Order by ver
+  default_scope order(:version)
+  scope :descending, reorder("version DESC")
+
+  class << self
+
+    # Returns the list of classes that are being audited
+    def audited_classes
+      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_user] = user
+
+      yieldval = yield
+
+      Thread.current[:acts_as_audited_user] = nil
+
+      yieldval
+    end
+
+    # @private
+    def reconstruct_attributes(audits)
+      attributes = {}
+      result = audits.collect do |audit|
+        attributes.merge!(audit.new_attributes).merge!(:version => audit.version)
+        yield attributes if block_given?
+      end
+      block_given? ? result : attributes
+    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 self.as_user(user, &block)
-    Thread.current[:acts_as_audited_user] = user
+    # @private
+    def assign_revision_attributes(record, attributes)
+      attributes.each do |attr, val|
+        record = record.dup if record.frozen?
 
-    yield
+        if record.respond_to?("#{attr}=")
+          record.attributes.has_key?(attr.to_s) ?
+            record[attr] = val :
+            record.send("#{attr}=", val)
+        end
+      end
+      record
+    end
 
-    Thread.current[:acts_as_audited_user] = nil
   end
 
   # Allows user to be set to either a string or an ActiveRecord object
-  def user_as_string=(user) #:nodoc:
+  # @private
+  def user_as_string=(user)
     # reset both either way
     self.user_as_model = self.username = nil
     user.is_a?(ActiveRecord::Base) ?
@@ -45,61 +83,44 @@ class Audit < ActiveRecord::Base
   alias_method :user_as_model=, :user=
   alias_method :user=, :user_as_string=
 
-  def user_as_string #:nodoc:
+  # @private
+  def user_as_string
     self.user_as_model || self.username
   end
   alias_method :user_as_model, :user
   alias_method :user, :user_as_string
 
+  # Return an instance of what the object looked like at this revision. If
+  # the object has been destroyed, this will be a new record.
   def revision
     clazz = auditable_type.constantize
-    returning clazz.find_by_id(auditable_id) || clazz.new do |m|
+    ( clazz.find_by_id(auditable_id) || clazz.new ).tap do |m|
       Audit.assign_revision_attributes(m, self.class.reconstruct_attributes(ancestors).merge({:version => version}))
     end
   end
 
+  # Return all audits older than the current one.
   def ancestors
-    self.class.find(:all, :order => 'version',
-      :conditions => ['auditable_id = ? and auditable_type = ? and version <= ?',
+    self.class.where(['auditable_id = ? and auditable_type = ? and version <= ?',
       auditable_id, auditable_type, version])
   end
 
   # Returns a hash of the changed attributes with the new values
   def new_attributes
-    (changes || {}).inject({}.with_indifferent_access) do |attrs,(attr,values)|
-      attrs[attr] = Array(values).last
+    (audited_changes || {}).inject({}.with_indifferent_access) do |attrs,(attr,values)|
+      attrs[attr] = values.is_a?(Array) ? values.last : values
       attrs
     end
   end
 
   # Returns a hash of the changed attributes with the old values
   def old_attributes
-    (changes || {}).inject({}.with_indifferent_access) do |attrs,(attr,values)|
+    (audited_changes || {}).inject({}.with_indifferent_access) do |attrs,(attr,values)|
       attrs[attr] = Array(values).first
       attrs
     end
   end
 
-  def self.reconstruct_attributes(audits)
-    attributes = {}
-    result = audits.collect do |audit|
-      attributes.merge!(audit.new_attributes).merge!(:version => audit.version)
-      yield attributes if block_given?
-    end
-    block_given? ? result : attributes
-  end
-  
-  def self.assign_revision_attributes(record, attributes)
-    attributes.each do |attr, val|
-      if record.respond_to?("#{attr}=")
-        record.attributes.has_key?(attr.to_s) ?
-          record[attr] = val :
-          record.send("#{attr}=", val)
-      end
-    end
-    record
-  end
-
 private
 
   def set_version_number