vestal_versions 1.0.1 → 1.0.2

data/Rakefile

@@ -13,8 +13,7 @@ begin
     g.email = 'steve@laserlemon.com'
     g.homepage = 'http://github.com/laserlemon/vestal_versions'
     g.authors = %w(laserlemon)
-    g.add_development_dependency 'activerecord'
-    g.add_development_dependency 'activesupport'
+    g.add_dependency 'activerecord', '>= 2.1.0'
     g.add_development_dependency 'shoulda'
     g.add_development_dependency 'mocha'
   end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/vestal_versions/creation.rb

@@ -35,7 +35,7 @@ module VestalVersions
       private
         # Returns whether a new version should be created upon updating the parent record.
         def create_version?
-          version_changes.present?
+          !version_changes.blank?
         end
 
         # Creates a new version upon updating the parent record.

data/lib/vestal_versions/options.rb

@@ -28,6 +28,9 @@ module VestalVersions
           :class_name => 'VestalVersions::Version',
           :dependent => :delete_all
         )
+        options.reverse_merge!(
+          :order => "#{options[:class_name].constantize.table_name}.number ASC"
+        )
 
         class_inheritable_accessor :vestal_versions_options
         self.vestal_versions_options = options.dup

data/lib/vestal_versions/reset.rb

@@ -2,8 +2,6 @@ module VestalVersions
   # Adds the ability to "reset" (or hard revert) a versioned ActiveRecord::Base instance.
   module Reset
     def self.included(base) # :nodoc:
-      Version.send(:include, VersionMethods)
-
       base.class_eval do
         include InstanceMethods
       end
@@ -20,37 +18,11 @@ module VestalVersions
       # documentation for more details.
       def reset_to!(value)
         if saved = skip_version{ revert_to!(value) }
-          versions.after(value).each(&version_reset_method)
+          versions.send(:delete_records, versions.after(value))
           reset_version
         end
         saved
       end
-
-      private
-        # The method used to individually remove versions from the version history by way of the
-        # +reset_to!+ method. There are three options for the <tt>:dependent</tt> option given
-        # to the +versioned+ method: <tt>:delete_all</tt>, <tt>:destroy</tt> and <tt>:nullify</tt>.
-        # If none is given, <tt>:delete_all</tt> is the default.
-        #
-        # If <tt>:delete_all</tt> is given, each version will be deleted from the database,
-        # triggering no callbacks. If <tt>:destroy</tt> is given, each version will likewise be
-        # deleted from the database, but any callbacks associated with version destruction will be
-        # triggered. If <tt>:nullify</tt> is specified, the version records will simply be
-        # dissociated from the versioned parent record by setting its foreign key to nil.
-        def version_reset_method
-          vestal_versions_options[:dependent].to_s.sub(/_all$/, '').to_sym
-        end
-    end
-
-    # Instance methods added to the VestalVersions::Version model to accomodate resetting the
-    # parent ActiveRecord::Base instance.
-    module VersionMethods
-      # The +nullify+ method is meant to mimic the behavior of ActiveRecord when the parent of a
-      # +has_many+ association (with <tt>:dependent => :nullify</tt>) is destroyed and the child
-      # records are dissociated from the parent's primary key.
-      def nullify
-        update_attribute(:versioned_id, nil)
-      end
     end
   end
 end

data/lib/vestal_versions/version.rb

@@ -6,9 +6,6 @@ module VestalVersions
     # Associate polymorphically with the parent record.
     belongs_to :versioned, :polymorphic => true
 
-    # Order versions by number, ascending by default.
-    default_scope :order => "#{table_name}.number ASC"
-
     # ActiveRecord::Base#changes is an existing method, so before serializing the +changes+ column,
     # the existing +changes+ method is undefined. The overridden +changes+ method pertained to 
     # dirty attributes, but will not affect the partial updates functionality as that's based on

data/lib/vestal_versions/versions.rb

@@ -64,9 +64,9 @@ module VestalVersions
     # still return a valid version number (useful for reversion).
     def number_at(value)
       case value
-        when Date, Time then at(value).try(:number) || 1
+        when Date, Time then (v = at(value)) ? v.number : 1
         when Numeric then value.floor
-        when String, Symbol then at(value).try(:number)
+        when String, Symbol then (v = at(value)) ? v.number : nil
         when Version then value.number
       end
     end

data/test/control_test.rb

@@ -122,7 +122,7 @@ class ControlTest < Test::Unit::TestCase
         end
 
         should 'update the last version' do
-          last_version = @user.versions.last
+          last_version = @user.versions(true).last
           assert_equal @last_version.id, last_version.id
           assert_not_equal @last_version.attributes, last_version.attributes
         end
@@ -142,7 +142,7 @@ class ControlTest < Test::Unit::TestCase
         end
 
         should 'update the last version' do
-          last_version = @user.versions.last
+          last_version = @user.versions(true).last
           assert_equal @last_version.id, last_version.id
           assert_not_equal @last_version.attributes, last_version.attributes
         end

data/test/reset_test.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 class ResetTest < Test::Unit::TestCase
   context 'Resetting a model' do
     setup do
+      @original_dependent = User.reflect_on_association(:versions).options[:dependent]
       @user, @versions = User.new, []
       @names = ['Steve Richert', 'Stephen Richert', 'Stephen Jobs', 'Steve Jobs']
       @names.each do |name|
@@ -19,7 +20,7 @@ class ResetTest < Test::Unit::TestCase
     end
 
     should 'dissociate all versions after the target' do
-      @versions.reverse.each_with_index do |version, i|
+      @versions.reverse.each do |version|
         @user.reset_to!(version)
         assert_equal 0, @user.versions(true).after(version).count
       end
@@ -27,11 +28,11 @@ class ResetTest < Test::Unit::TestCase
 
     context 'with the :dependent option as :delete_all' do
       setup do
-        User.prepare_versioned_options(:dependent => :delete_all)
+        User.reflect_on_association(:versions).options[:dependent] = :delete_all
       end
 
       should 'delete all versions after the target version' do
-        @versions.reverse.each_with_index do |version, i|
+        @versions.reverse.each do |version|
           later_versions = @user.versions.after(version)
           @user.reset_to!(version)
           later_versions.each do |later_version|
@@ -44,7 +45,7 @@ class ResetTest < Test::Unit::TestCase
 
       should 'not destroy all versions after the target version' do
         VestalVersions::Version.any_instance.stubs(:destroy).raises(RuntimeError)
-        @versions.reverse.each_with_index do |version, i|
+        @versions.reverse.each do |version|
           assert_nothing_raised do
             @user.reset_to!(version)
           end
@@ -54,11 +55,11 @@ class ResetTest < Test::Unit::TestCase
 
     context 'with the :dependent option as :destroy' do
       setup do
-        User.prepare_versioned_options(:dependent => :destroy)
+        User.reflect_on_association(:versions).options[:dependent] = :destroy
       end
 
       should 'delete all versions after the target version' do
-        @versions.reverse.each_with_index do |version, i|
+        @versions.reverse.each do |version|
           later_versions = @user.versions.after(version)
           @user.reset_to!(version)
           later_versions.each do |later_version|
@@ -71,7 +72,7 @@ class ResetTest < Test::Unit::TestCase
 
       should 'destroy all versions after the target version' do
         VestalVersions::Version.any_instance.stubs(:destroy).raises(RuntimeError)
-        @versions.reverse.each_with_index do |version, i|
+        @versions.reverse.each do |version|
           later_versions = @user.versions.after(version)
           if later_versions.empty?
             assert_nothing_raised do
@@ -88,11 +89,11 @@ class ResetTest < Test::Unit::TestCase
 
     context 'with the :dependent option as :nullify' do
       setup do
-        User.prepare_versioned_options(:dependent => :nullify)
+        User.reflect_on_association(:versions).options[:dependent] = :nullify
       end
 
       should 'leave all versions after the target version' do
-        @versions.reverse.each_with_index do |version, i|
+        @versions.reverse.each do |version|
           later_versions = @user.versions.after(version)
           @user.reset_to!(version)
           later_versions.each do |later_version|
@@ -103,5 +104,9 @@ class ResetTest < Test::Unit::TestCase
         end
       end
     end
+
+    teardown do
+      User.reflect_on_association(:versions).options[:dependent] = @original_dependent
+    end
   end
 end

data/test/reversion_test.rb

@@ -10,7 +10,9 @@ class ReversionTest < Test::Unit::TestCase
         @user.update_attribute(:name, name)
         @attributes[@user.version] = @user.attributes
         time += 1.hour
-        @user.versions.last.try(:update_attribute, :created_at, time)
+        if last_version = @user.versions.last
+          last_version.update_attribute(:created_at, time)
+        end
         @times[@user.version] = time
       end
       @user.reload.versions.reload

data/test/schema.rb

@@ -38,3 +38,6 @@ class User < ActiveRecord::Base
     self[:first_name], self[:last_name] = names.split(' ', 2)
   end
 end
+
+class MyCustomVersion < VestalVersions::Version
+end

data/test/tagging_test.rb

@@ -9,9 +9,10 @@ class TaggingTest < Test::Unit::TestCase
 
     should "update the version record's tag column" do
       tag_name = 'TAG'
-      assert_not_equal tag_name, @user.versions.last.tag
+      last_version = @user.versions.last
+      assert_not_equal tag_name, last_version.tag
       @user.tag_version(tag_name)
-      assert_equal tag_name, @user.versions.last.tag
+      assert_equal tag_name, last_version.reload.tag
     end
 
     should 'create a version record for an initial version' do

data/test/version_test.rb

@@ -29,8 +29,8 @@ class VersionTest < Test::Unit::TestCase
       assert_not_equal @last_version, last_version
     end
 
-    should 'default to ordering by number when finding' do
-      order = VestalVersions::Version.send(:scope, :find)[:order]
+    should 'default to ordering by number when finding through association' do
+      order = @user.versions.send(:scope, :find)[:order]
       assert_equal 'versions.number ASC', order
     end
 

data/vestal_versions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vestal_versions}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2010-01-03}
+  s.date = %q{2010-01-13}
   s.description = %q{Keep a DRY history of your ActiveRecord models' changes}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [
@@ -88,19 +88,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 2.1.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 2.1.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vestal_versions
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - laserlemon
@@ -9,28 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -05:00
+date: 2010-01-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda