acts_as_versioned 0.2.3 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,48 @@
+*GIT* (version numbers are overrated)
+
+
+
+* (16 Jun 2008) Backwards Compatibility is overrated (big updates for rails 2.1)
+
+  * Use ActiveRecord 2.1's dirty attribute checking instead [Asa Calow]
+  * Remove last traces of #non_versioned_fields
+  * Remove AR::Base.find_version and AR::Base.find_versions, rely on AR association proxies and named_scope
+  * Remove #versions_count, rely on AR association counter caching.
+  * Remove #versioned_attributes, basically the same as AR::Base.versioned_columns
+
+* (5 Oct 2006) Allow customization of #versions association options [Dan Peterson]
+
+*0.5.1*
+
+* (8 Aug 2006) Versioned models now belong to the unversioned model.  @article_version.article.class => Article [Aslak Hellesoy]
+
+*0.5* # do versions even matter for plugins?
+
+* (21 Apr 2006) Added without_locking and without_revision methods.
+
+  Foo.without_revision do
+    @foo.update_attributes ...
+  end
+
+*0.4*
+
+* (28 March 2006) Rename non_versioned_fields to non_versioned_columns (old one is kept for compatibility).
+* (28 March 2006) Made explicit documentation note that string column names are required for non_versioned_columns.
+
+*0.3.1*
+
+* (7 Jan 2006) explicitly set :foreign_key option for the versioned model's belongs_to assocation for STI [Caged]
+* (7 Jan 2006) added tests to prove has_many :through joins work
+
+*0.3*
+
+* (2 Jan 2006) added ability to share a mixin with versioned class
+* (2 Jan 2006) changed the dynamic version model to MyModel::Version
+
+*0.2.4*
+
+* (27 Nov 2005) added note about possible destructive behavior of if_changed? [Michael Schuerig]
+
 *0.2.3*
 
 * (12 Nov 2005) fixed bug with old behavior of #blank? [Michael Schuerig]

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+group :development do
+  gem 'rails',        '3.0.0.beta4'
+  gem 'sqlite3-ruby', '1.3.1'
+  gem 'mysql',        '2.8.1'
+end

data/Rakefile

@@ -0,0 +1,146 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+desc "Generate RCov test coverage and open in your browser"
+task :coverage do
+  require 'rcov'
+  sh "rm -fr coverage"
+  sh "rcov test/test_*.rb"
+  sh "open coverage/index.html"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "#{name} #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/acts_as_versioned.gemspec

@@ -0,0 +1,85 @@
+## This is the rakegem gemspec template. Make sure you read and understand
+## all of the comments. Some sections require modification, and others can
+## be deleted if you don't need them. Once you understand the contents of
+## this file, feel free to delete any comments that begin with two hash marks.
+## You can find comprehensive Gem::Specification documentation, at
+## http://docs.rubygems.org/read/chapter/20
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'acts_as_versioned'
+  s.version           = '0.6.0'
+  s.date              = '2010-07-19'
+  s.rubyforge_project = 'acts_as_versioned'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "Add simple versioning to ActiveRecord models."
+  s.description = "Add simple versioning to ActiveRecord models."
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["Rick Olson"]
+  s.email    = 'technoweenie@gmail.com'
+  s.homepage = 'http://github.com/technoweenie/acts_as_versioned'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = %w[README MIT-LICENSE CHANGELOG]
+
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  s.add_dependency('activerecord', ["~> 3.0.0.beta4"])
+
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  s.add_development_dependency('sqlite3-ruby', ["~> 1.3.1"])
+
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    CHANGELOG
+    Gemfile
+    MIT-LICENSE
+    README
+    RUNNING_UNIT_TESTS
+    Rakefile
+    acts_as_versioned.gemspec
+    init.rb
+    lib/acts_as_versioned.rb
+    test/abstract_unit.rb
+    test/database.yml
+    test/fixtures/authors.yml
+    test/fixtures/landmark.rb
+    test/fixtures/landmark_versions.yml
+    test/fixtures/landmarks.yml
+    test/fixtures/locked_pages.yml
+    test/fixtures/locked_pages_revisions.yml
+    test/fixtures/migrations/1_add_versioned_tables.rb
+    test/fixtures/page.rb
+    test/fixtures/page_versions.yml
+    test/fixtures/pages.yml
+    test/fixtures/widget.rb
+    test/migration_test.rb
+    test/schema.rb
+    test/versioned_test.rb
+  ]
+  # = MANIFEST =
+
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end

data/init.rb

@@ -0,0 +1 @@
+require 'acts_as_versioned'

data/lib/acts_as_versioned.rb

@@ -18,11 +18,12 @@
 # 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.
+require 'active_support/concern'
 
 module ActiveRecord #:nodoc:
   module Acts #:nodoc:
     # Specify this act if you want to save a copy of the row in a versioned table.  This assumes there is a 
-    # versioned table ready and that your model has a version field.  This works with optimisic locking if the lock_version
+    # versioned table ready and that your model has a version field.  This works with optimistic locking if the lock_version
     # column is present as well.
     #
     # The class for the versioned model is derived the first time it is seen. Therefore, if you change your database schema you have to restart
@@ -49,349 +50,445 @@ module ActiveRecord #:nodoc:
     #   page.revert_to(page.versions.last) # using versioned instance
     #   page.title         # => 'hello world'
     #
+    #   page.versions.earliest # efficient query to find the first version
+    #   page.versions.latest   # efficient query to find the most recently created version
+    #
+    #
+    # Simple Queries to page between versions
+    #
+    #   page.versions.before(version) 
+    #   page.versions.after(version)
+    #
+    # Access the previous/next versions from the versioned model itself
+    #
+    #   version = page.versions.latest
+    #   version.previous # go back one version
+    #   version.next     # go forward one version
+    #
     # See ActiveRecord::Acts::Versioned::ClassMethods#acts_as_versioned for configuration options
     module Versioned
-      def self.included(base) # :nodoc:
-        base.extend ClassMethods
-      end
+      VERSION   = "0.6.0"
+      CALLBACKS = [:set_new_version, :save_version, :save_version?]
+
+      # == Configuration options
+      #
+      # * <tt>class_name</tt> - versioned model class name (default: PageVersion in the above example)
+      # * <tt>table_name</tt> - versioned model table name (default: page_versions in the above example)
+      # * <tt>foreign_key</tt> - foreign key used to relate the versioned model to the original model (default: page_id in the above example)
+      # * <tt>inheritance_column</tt> - name of the column to save the model's inheritance_column value for STI.  (default: versioned_type)
+      # * <tt>version_column</tt> - name of the column in the model that keeps the version number (default: version)
+      # * <tt>sequence_name</tt> - name of the custom sequence to be used by the versioned model.
+      # * <tt>limit</tt> - number of revisions to keep, defaults to unlimited
+      # * <tt>if</tt> - symbol of method to check before saving a new version.  If this method returns false, a new version is not saved.
+      #   For finer control, pass either a Proc or modify Model#version_condition_met?
+      #
+      #     acts_as_versioned :if => Proc.new { |auction| !auction.expired? }
+      #
+      #   or...
+      #
+      #     class Auction
+      #       def version_condition_met? # totally bypasses the <tt>:if</tt> option
+      #         !expired?
+      #       end
+      #     end
+      #
+      # * <tt>if_changed</tt> - Simple way of specifying attributes that are required to be changed before saving a model.  This takes
+      #   either a symbol or array of symbols.
+      #
+      # * <tt>extend</tt> - Lets you specify a module to be mixed in both the original and versioned models.  You can also just pass a block
+      #   to create an anonymous mixin:
+      #
+      #     class Auction
+      #       acts_as_versioned do
+      #         def started?
+      #           !started_at.nil?
+      #         end
+      #       end
+      #     end
+      #
+      #   or...
+      #
+      #     module AuctionExtension
+      #       def started?
+      #         !started_at.nil?
+      #       end
+      #     end
+      #     class Auction
+      #       acts_as_versioned :extend => AuctionExtension
+      #     end
+      #
+      #  Example code:
+      #
+      #    @auction = Auction.find(1)
+      #    @auction.started?
+      #    @auction.versions.first.started?
+      #
+      # == Database Schema
+      #
+      # The model that you're versioning needs to have a 'version' attribute. The model is versioned
+      # into a table called #{model}_versions where the model name is singlular. The _versions table should
+      # contain all the fields you want versioned, the same version column, and a #{model}_id foreign key field.
+      #
+      # A lock_version field is also accepted if your model uses Optimistic Locking.  If your table uses Single Table inheritance,
+      # then that field is reflected in the versioned model as 'versioned_type' by default.
+      #
+      # Acts_as_versioned comes prepared with the ActiveRecord::Acts::Versioned::ActMethods::ClassMethods#create_versioned_table
+      # method, perfect for a migration.  It will also create the version column if the main model does not already have it.
+      #
+      #   class AddVersions < ActiveRecord::Migration
+      #     def self.up
+      #       # create_versioned_table takes the same options hash
+      #       # that create_table does
+      #       Post.create_versioned_table
+      #     end
+      #
+      #     def self.down
+      #       Post.drop_versioned_table
+      #     end
+      #   end
+      #
+      # == Changing What Fields Are Versioned
+      #
+      # By default, acts_as_versioned will version all but these fields:
+      #
+      #   [self.primary_key, inheritance_column, 'version', 'lock_version', versioned_inheritance_column]
+      #
+      # You can add or change those by modifying #non_versioned_columns.  Note that this takes strings and not symbols.
+      #
+      #   class Post < ActiveRecord::Base
+      #     acts_as_versioned
+      #     self.non_versioned_columns << 'comments_count'
+      #   end
+      #
+      def acts_as_versioned(options = {}, &extension)
+        # don't allow multiple calls
+        return if self.included_modules.include?(ActiveRecord::Acts::Versioned::Behaviors)
+
+        cattr_accessor :versioned_class_name, :versioned_foreign_key, :versioned_table_name, :versioned_inheritance_column,
+                       :version_column, :max_version_limit, :track_altered_attributes, :version_condition, :version_sequence_name, :non_versioned_columns,
+                       :version_association_options, :version_if_changed
+
+        self.versioned_class_name         = options[:class_name] || "Version"
+        self.versioned_foreign_key        = options[:foreign_key] || self.to_s.foreign_key
+        self.versioned_table_name         = options[:table_name] || "#{table_name_prefix}#{base_class.name.demodulize.underscore}_versions#{table_name_suffix}"
+        self.versioned_inheritance_column = options[:inheritance_column] || "versioned_#{inheritance_column}"
+        self.version_column               = options[:version_column] || 'version'
+        self.version_sequence_name        = options[:sequence_name]
+        self.max_version_limit            = options[:limit].to_i
+        self.version_condition            = options[:if] || true
+        self.non_versioned_columns        = [self.primary_key, inheritance_column, self.version_column, 'lock_version', versioned_inheritance_column] + options[:non_versioned_columns].to_a.map(&:to_s)
+        self.version_association_options  = {
+                                                    :class_name  => "#{self.to_s}::#{versioned_class_name}",
+                                                    :foreign_key => versioned_foreign_key,
+                                                    :dependent   => :delete_all
+        }.merge(options[:association_options] || {})
+
+        if block_given?
+          extension_module_name = "#{versioned_class_name}Extension"
+          silence_warnings do
+            self.const_set(extension_module_name, Module.new(&extension))
+          end
+
+          options[:extend] = self.const_get(extension_module_name)
+        end
+
+        unless options[:if_changed].nil?
+          self.track_altered_attributes = true
+          options[:if_changed] = [options[:if_changed]] unless options[:if_changed].is_a?(Array)
+          self.version_if_changed = options[:if_changed].map(&:to_s)
+        end
+
+        include options[:extend] if options[:extend].is_a?(Module)
+
+        include ActiveRecord::Acts::Versioned::Behaviors
 
-      module ClassMethods
-        # == Configuration options
-        #
-        # * <tt>class_name</tt> - versioned model class name (default: PageVersion in the above example)
-        # * <tt>table_name</tt> - versioned model table name (default: page_versions in the above example)
-        # * <tt>foreign_key</tt> - foreign key used to relate the versioned model to the original model (default: page_id in the above example)
-        # * <tt>inheritance_column</tt> - name of the column to save the model's inheritance_column value for STI.  (default: versioned_type)
-        # * <tt>version_column</tt> - name of the column in the model that keeps the version number (default: version)
-        # * <tt>sequence_name</tt> - name of the custom sequence to be used by the versioned model.
-        # * <tt>limit</tt> - number of revisions to keep, defaults to unlimited
-        # * <tt>if</tt> - symbol of method to check before saving a new version.  If this method returns false, a new version is not saved.
-        #   For finer control, pass either a Proc or modify Model#version_condition_met?
-        #
-        #     acts_as_versioned :if => Proc.new { |auction| !auction.expired? }
-        #
-        #   or...
-        #
-        #     class Auction
-        #       def version_condition_met? # totally bypasses the <tt>:if</tt> option
-        #         !expired?
-        #       end
-        #     end
-        #
-        # * <tt>if_changed</tt> - Simple way of specifying attributes that are required to be changed before saving a model.  This takes
-        #   either a symbol or array of symbols.
-        #
-        # == Database Schema
-        #
-        # The model that you're versioning needs to have a 'version' attribute. The model is versioned 
-        # into a table called #{model}_versions where the model name is singlular. The _versions table should 
-        # contain all the fields you want versioned, the same version column, and a #{model}_id foreign key field.
-        #
-        # A lock_version field is also accepted if your model uses Optimistic Locking.  If your table uses Single Table inheritance,
-        # then that field is reflected in the versioned model as 'versioned_type' by default.
         #
-        # Acts_as_versioned comes prepared with the ActiveRecord::Acts::Versioned::ActMethods::ClassMethods#create_versioned_table 
-        # method, perfect for a migration.  It will also create the version column if the main model does not already have it.
+        # Create the dynamic versioned model
         #
-        #   class AddVersions < ActiveRecord::Migration
-        #     def self.up
-        #       # create_versioned_table takes the same options hash
-        #       # that create_table does
-        #       Post.create_versioned_table
-        #     end
-        #   
-        #     def self.down
-        #       Post.drop_versioned_table
-        #     end
-        #   end
-        def acts_as_versioned(options = {})
-          # don't allow multiple calls
-          return if self.included_modules.include?(ActiveRecord::Acts::Versioned::ActMethods)
-
-          class_eval do
-            include ActiveRecord::Acts::Versioned::ActMethods
-            cattr_accessor :versioned_class_name, :versioned_foreign_key, :versioned_table_name, :versioned_inheritance_column, 
-              :version_column, :max_version_limit, :track_changed_attributes, :version_condition, :version_sequence_name
-            attr_accessor :changed_attributes
+        const_set(versioned_class_name, Class.new(ActiveRecord::Base)).class_eval do
+          def self.reloadable?;
+            false;
           end
-          
-          self.versioned_class_name = options[:class_name] || "#{self.to_s.demodulize}Version"
-          self.versioned_foreign_key = options[:foreign_key] || self.to_s.foreign_key
-          self.versioned_table_name = options[:table_name] || "#{table_name_prefix}#{Inflector.underscore(Inflector.demodulize(class_name_of_active_record_descendant(self)))}_versions#{table_name_suffix}"            
-          self.versioned_inheritance_column = options[:inheritance_column] || "versioned_#{inheritance_column}"
-          self.version_column = options[:version_column] || 'version'
-          self.version_sequence_name = options[:sequence_name]
-          self.max_version_limit = options[:limit].to_i
-          self.version_condition = options[:if] || true
-
-          class_eval do
-            has_many :versions, 
-              :class_name  => "ActiveRecord::Acts::Versioned::#{versioned_class_name}",
-              :foreign_key => "#{versioned_foreign_key}",
-              :order       => 'version'
-            before_save  :set_new_version
-            after_create :save_version_on_create
-            after_update :save_version
-            after_save   :clear_old_versions
-            after_save   :clear_changed_attributes
-            
-            unless options[:if_changed].nil?
-              self.track_changed_attributes = true
-              options[:if_changed] = [options[:if_changed]] unless options[:if_changed].is_a?(Array)
-              options[:if_changed].each do |attr_name|
-                define_method("#{attr_name}=") do |value|
-                  (self.changed_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) or self.send(attr_name) == value
-                  write_attribute(attr_name.to_s, value)
-                end
-              end
-            end
+
+          # find first version before the given version
+          def self.before(version)
+            where(["#{original_class.versioned_foreign_key} = ? and version < ?", version.send(original_class.versioned_foreign_key), version.version]).
+                    order('version DESC').
+                    first
           end
-          
-          # create the dynamic versioned model
-          # maybe if i sit down long enough i can think up a better way to do this.
-          dynamic_model = <<-EOV
-            class ActiveRecord::Acts::Versioned::#{versioned_class_name} < ActiveRecord::Base
-              set_table_name "#{versioned_table_name}"
-              belongs_to :#{self.to_s.demodulize.underscore}, :class_name => "#{self.to_s}"
-          EOV
-          
-          dynamic_model += %Q{set_sequence_name "#{version_sequence_name}"\n} if version_sequence_name
-          
-          eval dynamic_model + 'end'
-        end
-      end
-    
-      module ActMethods
-        def self.included(base) # :nodoc:
-          base.extend ClassMethods
-        end
-        
-        # Saves a version of the model if applicable
-        def save_version
-          save_version_on_create if save_version?
-        end
-        
-        # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
-        def save_version_on_create
-          rev = self.class.versioned_class.new
-          self.clone_versioned_model(self, rev)
-          rev.version = send(self.class.version_column)
-          rev.send("#{self.class.versioned_foreign_key}=", self.id)
-          rev.save
-        end
 
-        # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
-        # Override this method to set your own criteria for clearing old versions.
-        def clear_old_versions
-          return if self.class.max_version_limit == 0
-          excess_baggage = send(self.class.version_column).to_i - self.class.max_version_limit
-          if excess_baggage > 0
-            sql = "DELETE FROM #{self.class.versioned_table_name} WHERE version <= #{excess_baggage} AND #{self.class.versioned_foreign_key} = #{self.id}"
-            self.class.versioned_class.connection.execute sql
+          # find first version after the given version.
+          def self.after(version)
+            where(["#{original_class.versioned_foreign_key} = ? and version > ?", version.send(original_class.versioned_foreign_key), version.version]).
+                    order('version ASC').
+                    first
           end
-        end
 
-        # Finds a specific version of this model.
-        def find_version(version)
-          return version if version.is_a?(self.class.versioned_class)
-          return nil if version.is_a?(ActiveRecord::Base)
-          find_versions(:conditions => ['version = ?', version], :limit => 1).first
-        end
-        
-        # Finds versions of this model.  Takes an options hash like <tt>find</tt>
-        def find_versions(options = {})
-          versions.find(:all, options)
-        end
+          # finds earliest version of this record
+          def self.earliest
+            order("#{original_class.version_column}").first
+          end
 
-        # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
-        def revert_to(version)
-          if version.is_a?(self.class.versioned_class)
-            return false unless version.send(self.class.versioned_foreign_key) == self.id and !version.new_record?
-          else
-            return false unless version = find_version(version)
+          # find latest version of this record
+          def self.latest
+            order("#{original_class.version_column} desc").first
           end
-          self.clone_versioned_model(version, self)
-          self.send("#{self.class.version_column}=", version.version)
-          true
-        end
 
-        # Reverts a model to a given version and saves the model.  
-        # Takes either a version number or an instance of the versioned model
-        def revert_to!(version)
-          revert_to(version) ? save_without_revision : false
-        end
+          def previous
+            self.class.before(self)
+          end
 
-        # Temporarily turns off Optimistic Locking while saving.  Used when reverting so that a new version is not created.
-        def save_without_revision
-          old_lock_value = ActiveRecord::Base.lock_optimistically
-          ActiveRecord::Base.lock_optimistically = false if old_lock_value
-          disable_acts_as_versioned_callbacks
-          save_result = self.save
-          enable_acts_as_versioned_callbacks
-          ActiveRecord::Base.lock_optimistically = true if old_lock_value
-          save_result
-        end
-      
-        # Returns an array of attribute keys that are versioned.  See non_versioned_fields
-        def versioned_attributes
-          self.attributes.keys.select { |k| !self.class.non_versioned_fields.include?(k) }
-        end
-        
-        # If called with no parameters, gets whether the current model has changed and needs to be versioned.
-        # If called with a single parameter, gets whether the parameter has changed.
-        def changed?(attr_name = nil)
-          attr_name.nil? ?
-            (!self.class.track_changed_attributes or (changed_attributes and changed_attributes.length > 0)) :
-            (changed_attributes and changed_attributes.include?(attr_name.to_s))
-        end
-        
-        # keep old dirty? method
-        alias_method :dirty?, :changed?
-        
-        # Clones a model.  Used when saving a new version or reverting a model's version.
-        def clone_versioned_model(orig_model, new_model)
-          self.versioned_attributes.each do |key|
-            new_model.send("#{key}=", orig_model.attributes[key]) if orig_model.attribute_present?(key)
+          def next
+            self.class.after(self)
           end
-          
-          if orig_model.is_a?(self.class.versioned_class)
-            new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
-          elsif new_model.is_a?(self.class.versioned_class)
-            new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
+
+          def versions_count
+            page.version
           end
         end
-        
-        # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
-        def save_version?
-          version_condition_met? and changed?
-        end
-        
-        # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
-        # custom version condition checking.
-        def version_condition_met?
-          case
-          when version_condition.is_a?(Symbol)
-            send(version_condition)
-          when version_condition.respond_to?(:call) && (version_condition.arity == 1 || version_condition.arity == -1)
-            version_condition.call(self)
-          else
-            version_condition
-          end          
-        end
 
-        protected
-        # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
-        def set_new_version
-          self.send("#{self.class.version_column}=", self.next_version) if new_record? or (!locking_enabled? and save_version?)
-        end
-        
-        # Gets the next available version for the current record, or 1 for a new record
-        def next_version
-          return 1 if new_record?
-          connection.select_one("SELECT MAX(version)+1 AS next_version FROM #{self.class.versioned_table_name} WHERE #{self.class.versioned_foreign_key} = #{self.id}")['next_version'] || 1
-        end
-        
-        # clears current changed attributes.  Called after save.
-        def clear_changed_attributes
-          self.changed_attributes = []
-        end
+        versioned_class.cattr_accessor :original_class
+        versioned_class.original_class = self
+        versioned_class.set_table_name versioned_table_name
+        versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym,
+                                   :class_name  => "::#{self.to_s}",
+                                   :foreign_key => versioned_foreign_key
+        versioned_class.send :include, options[:extend] if options[:extend].is_a?(Module)
+        versioned_class.set_sequence_name version_sequence_name if version_sequence_name
+      end
 
-        private
-        unless defined?(ACTS_AS_VERSIONED_CALLBACKS)
-          ACTS_AS_VERSIONED_CALLBACKS =  [:set_new_version, :save_version_on_create, :save_version, :clear_changed_attributes]
-        end
+      module Behaviors
+        extend ActiveSupport::Concern
 
-        ACTS_AS_VERSIONED_CALLBACKS.each do |attr_name| 
-          alias_method "orig_#{attr_name}".to_sym, attr_name
+        included do
+          has_many :versions, self.version_association_options
+
+          before_save :set_new_version
+          after_save :save_version
+          after_save :clear_old_versions
         end
-        
-        def empty_callback() end #:nodoc:
 
-        def enable_acts_as_versioned_callbacks
-          self.class.class_eval do 
-            ACTS_AS_VERSIONED_CALLBACKS.each do |attr_name|
-              alias_method attr_name, "orig_#{attr_name}".to_sym
+        module InstanceMethods
+          # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
+          def save_version
+            if @saving_version
+              @saving_version = nil
+              rev = self.class.versioned_class.new
+              clone_versioned_model(self, rev)
+              rev.send("#{self.class.version_column}=", send(self.class.version_column))
+              rev.send("#{self.class.versioned_foreign_key}=", id)
+              rev.save
             end
           end
-        end
 
-        def disable_acts_as_versioned_callbacks
-          self.class.class_eval do 
-            ACTS_AS_VERSIONED_CALLBACKS.each do |attr_name| 
-              alias_method attr_name, :empty_callback
+          # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
+          # Override this method to set your own criteria for clearing old versions.
+          def clear_old_versions
+            return if self.class.max_version_limit == 0
+            excess_baggage = send(self.class.version_column).to_i - self.class.max_version_limit
+            if excess_baggage > 0
+              self.class.versioned_class.delete_all ["#{self.class.version_column} <= ? and #{self.class.versioned_foreign_key} = ?", excess_baggage, id]
             end
           end
-        end
 
-        module ClassMethods
-          # Finds a specific version of a specific row of this model
-          def find_version(id, version)
-            find_versions(id, 
-              :conditions => ["#{versioned_foreign_key} = ? AND version = ?", id, version], 
-              :limit => 1).first
+          # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
+          def revert_to(version)
+            if version.is_a?(self.class.versioned_class)
+              return false unless version.send(self.class.versioned_foreign_key) == id and !version.new_record?
+            else
+              return false unless version = versions.where(self.class.version_column => version).first
+            end
+            self.clone_versioned_model(version, self)
+            send("#{self.class.version_column}=", version.send(self.class.version_column))
+            true
+          end
+
+          # Reverts a model to a given version and saves the model.
+          # Takes either a version number or an instance of the versioned model
+          def revert_to!(version)
+            revert_to(version) ? save_without_revision : false
+          end
+
+          # Temporarily turns off Optimistic Locking while saving.  Used when reverting so that a new version is not created.
+          def save_without_revision
+            save_without_revision!
+            true
+          rescue
+            false
+          end
+
+          def save_without_revision!
+            without_locking do
+              without_revision do
+                save!
+              end
+            end
+          end
+
+          def altered?
+            track_altered_attributes ? (version_if_changed - changed).length < version_if_changed.length : changed?
+          end
+
+          # Clones a model.  Used when saving a new version or reverting a model's version.
+          def clone_versioned_model(orig_model, new_model)
+            self.class.versioned_columns.each do |col|
+              new_model.send("#{col.name}=", orig_model.send(col.name)) if orig_model.has_attribute?(col.name)
+            end
+
+            if orig_model.is_a?(self.class.versioned_class)
+              new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
+            elsif new_model.is_a?(self.class.versioned_class)
+              new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
+            end
+          end
+
+          # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
+          def save_version?
+            version_condition_met? && altered?
+          end
+
+          # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
+          # custom version condition checking.
+          def version_condition_met?
+            case
+              when version_condition.is_a?(Symbol)
+                send(version_condition)
+              when version_condition.respond_to?(:call) && (version_condition.arity == 1 || version_condition.arity == -1)
+                version_condition.call(self)
+              else
+                version_condition
+            end
+          end
+
+          # Executes the block with the versioning callbacks disabled.
+          #
+          #   @foo.without_revision do
+          #     @foo.save
+          #   end
+          #
+          def without_revision(&block)
+            self.class.without_revision(&block)
+          end
+
+          # Turns off optimistic locking for the duration of the block
+          #
+          #   @foo.without_locking do
+          #     @foo.save
+          #   end
+          #
+          def without_locking(&block)
+            self.class.without_locking(&block)
+          end
+
+          def empty_callback()
           end
-        
-          # Finds versions of a specific model.  Takes an options hash like <tt>find</tt>
-          def find_versions(id, options = {})
-            versioned_class.find :all, {
-              :conditions => ["#{versioned_foreign_key} = ?", id],
-              :order      => 'version' }.merge(options)
+
+          #:nodoc:
+
+          protected
+          # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
+          def set_new_version
+            @saving_version = new_record? || save_version?
+            self.send("#{self.class.version_column}=", next_version) if new_record? || (!locking_enabled? && save_version?)
           end
-        
-          # Returns an array of columns that are versioned.  See non_versioned_fields
+
+          # Gets the next available version for the current record, or 1 for a new record
+          def next_version
+            (new_record? ? 0 : versions.calculate(:maximum, version_column).to_i) + 1
+          end
+        end
+
+        module ClassMethods
+          # Returns an array of columns that are versioned.  See non_versioned_columns
           def versioned_columns
-            self.columns.select { |c| !non_versioned_fields.include?(c.name) }
+            @versioned_columns ||= columns.select { |c| !non_versioned_columns.include?(c.name) }
           end
-    
+
           # Returns an instance of the dynamic versioned model
           def versioned_class
-            "ActiveRecord::Acts::Versioned::#{versioned_class_name}".constantize
+            const_get versioned_class_name
           end
-          
-          # An array of fields that are not saved in the versioned table
-          def non_versioned_fields
-            [self.primary_key, inheritance_column, 'version', 'lock_version', versioned_inheritance_column]
-          end
-          
+
           # Rake migration task to create the versioned table using options passed to acts_as_versioned
           def create_versioned_table(create_table_options = {})
             # create version column in main table if it does not exist
-            if !self.content_columns.find { |c| %w(version lock_version).include? c.name }
-              self.connection.add_column table_name, :version, :integer
+            if !self.content_columns.find { |c| [version_column.to_s, 'lock_version'].include? c.name }
+              self.connection.add_column table_name, version_column, :integer
+              self.reset_column_information
             end
-            
+
+            return if connection.table_exists?(versioned_table_name)
+
             self.connection.create_table(versioned_table_name, create_table_options) do |t|
               t.column versioned_foreign_key, :integer
-              t.column :version, :integer
+              t.column version_column, :integer
             end
-            
-            updated_col = nil
-            self.versioned_columns.each do |col| 
-              updated_col = col if !updated_col and %(updated_at updated_on).include?(col.name)
-              self.connection.add_column versioned_table_name, col.name, col.type, 
-                :limit => col.limit, 
-                :default => col.default
+
+            self.versioned_columns.each do |col|
+              self.connection.add_column versioned_table_name, col.name, col.type,
+                                         :limit     => col.limit,
+                                         :default   => col.default,
+                                         :scale     => col.scale,
+                                         :precision => col.precision
             end
-        
+
             if type_col = self.columns_hash[inheritance_column]
-              self.connection.add_column versioned_table_name, versioned_inheritance_column, type_col.type, 
-                :limit => type_col.limit, 
-                :default => type_col.default
-            end
-    
-            if updated_col.nil?
-              self.connection.add_column versioned_table_name, :updated_at, :timestamp
+              self.connection.add_column versioned_table_name, versioned_inheritance_column, type_col.type,
+                                         :limit     => type_col.limit,
+                                         :default   => type_col.default,
+                                         :scale     => type_col.scale,
+                                         :precision => type_col.precision
             end
+
+            self.connection.add_index versioned_table_name, versioned_foreign_key
           end
-          
+
           # Rake migration task to drop the versioned table
           def drop_versioned_table
             self.connection.drop_table versioned_table_name
           end
+
+          # Executes the block with the versioning callbacks disabled.
+          #
+          #   Foo.without_revision do
+          #     @foo.save
+          #   end
+          #
+          def without_revision(&block)
+            class_eval do
+              CALLBACKS.each do |attr_name|
+                alias_method "orig_#{attr_name}".to_sym, attr_name
+                alias_method attr_name, :empty_callback
+              end
+            end
+            block.call
+          ensure
+            class_eval do
+              CALLBACKS.each do |attr_name|
+                alias_method attr_name, "orig_#{attr_name}".to_sym
+              end
+            end
+          end
+
+          # Turns off optimistic locking for the duration of the block
+          #
+          #   Foo.without_locking do
+          #     @foo.save
+          #   end
+          #
+          def without_locking(&block)
+            current = ActiveRecord::Base.lock_optimistically
+            ActiveRecord::Base.lock_optimistically = false if current
+            begin
+              block.call
+            ensure
+              ActiveRecord::Base.lock_optimistically = true if current
+            end
+          end
         end
       end
     end
   end
 end
 
-ActiveRecord::Base.class_eval { include ActiveRecord::Acts::Versioned }
+ActiveRecord::Base.extend ActiveRecord::Acts::Versioned