laserlemon-vestal_versions 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/vestal_versions.rb

@@ -9,6 +9,16 @@ module LaserLemon
     module ClassMethods
       def versioned
         has_many :versions, :as => :versioned, :order => 'versions.number ASC', :dependent => :destroy do
+          def between(from_value, to_value)
+            from, to = number_at(from_value), number_at(to_value)
+            return [] if from.nil? || to.nil?
+            condition = (from == to) ? to : Range.new(*[from, to].sort)
+            all(
+              :conditions => {:number => condition},
+              :order => "versions.number #{(from > to) ? 'DESC' : 'ASC'}"
+            )
+          end
+
           def at(value)
             case value
               when Version then value
@@ -18,24 +28,13 @@ module LaserLemon
             end
           end
 
-          def between(from_value, to_value)
-            from, to = number_at(from_value), number_at(to_value)
-            return [] if from.nil? || to.nil? || (from == to)
-            all(
-              :conditions => {:number => Range.new(*[from, to].sort)},
-              :order => "versions.number #{(from > to) ? 'DESC' : 'ASC'}"
-            )
-          end
-
-          private
-
-            def number_at(value)
-              case value
-                when Version then value.number
-                when Numeric then value.floor
-                when Symbol, Date, Time then at(value).try(:number)
-              end
+          def number_at(value)
+            case value
+              when Version then value.number
+              when Numeric then value.floor
+              when Symbol, Date, Time then at(value).try(:number)
             end
+          end
         end
 
         after_save :create_version, :if => :needs_version?
@@ -47,7 +46,6 @@ module LaserLemon
 
     module InstanceMethods
       private
-
         def needs_version?
           !changed.empty?
         end
@@ -69,7 +67,6 @@ module LaserLemon
         end
 
       public
-
         def version
           @version ||= last_version
         end
@@ -81,15 +78,17 @@ module LaserLemon
         def reverted?
           version != last_version
         end
-        
+
         def reload_with_versions(*args)
           reset_version
           reload_without_versions(*args)
         end
 
         def revert_to(value)
-          chain = versions.between(version, value)
-          return version unless chain.size > 1
+          to_value = versions.number_at(value)
+          return version if to_value == version
+          chain = versions.between(version, to_value)
+          return version if chain.empty?
 
           new_version = chain.last.number
           backward = chain.first > chain.last
@@ -114,7 +113,7 @@ module LaserLemon
         end
 
         def last_changes
-          return {} if version == 1
+          return {} if version.nil? || version == 1
           versions.at(version).changes
         end
 

data/test/between_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class BetweenTest < Test::Unit::TestCase
+  context 'The number of versions between' do
+    setup do
+      @user = User.create(:name => 'Steve Richert')
+      @version = @user.version
+      @valid = [@version, 0, 1_000_000, :first, :last, 1.day.since(@user.created_at), @user.versions.first]
+      @invalid = [nil, :bogus, 'bogus', Date.parse('0001-12-25')]
+    end
+
+    context 'the current version and the current version' do
+      should 'equal one' do
+        assert_equal 1, @user.versions.between(@version, @version).size
+      end
+    end
+
+    context 'the current version and a valid value' do
+      should 'not equal zero' do
+        @valid.each do |valid|
+          assert_not_equal 0, @user.versions.between(@version, valid).size
+          assert_not_equal 0, @user.versions.between(valid, @version).size
+        end
+      end
+    end
+
+    context 'the current version and an invalid value' do
+      should 'equal zero' do
+        @invalid.each do |invalid|
+          assert_equal 0, @user.versions.between(@version, invalid).size
+          assert_equal 0, @user.versions.between(invalid, @version).size
+        end
+      end
+    end
+
+    context 'two invalid values' do
+      should 'equal zero' do
+        @invalid.each do |first|
+          @invalid.each do |second|
+            assert_equal 0, @user.versions.between(first, second).size
+            assert_equal 0, @user.versions.between(second, first).size
+          end
+        end
+      end
+    end
+
+    context 'a valid value and an invalid value' do
+      should 'equal zero' do
+        @valid.each do |valid|
+          @invalid.each do |invalid|
+            assert_equal 0, @user.versions.between(valid, invalid).size
+            assert_equal 0, @user.versions.between(invalid, valid).size
+          end
+        end
+      end
+    end
+  end
+end

data/test/creation_test.rb

@@ -27,14 +27,6 @@ class CreationTest < Test::Unit::TestCase
       assert_equal @count, @user.versions.count
     end
 
-    should 'not increase when reverting to an identical version' do
-      @user.update_attribute(:name, 'Steve Jobs')
-      @user.update_attribute(:name, @name)
-      count = @user.versions.count
-      @user.revert_to!(:first)
-      assert_equal count, @user.versions.count
-    end
-
     context 'after an update' do
       setup do
         @initial_count = @count

data/vestal_versions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vestal_versions}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-08-31}
+  s.date = %q{2009-09-01}
   s.description = %q{Keep a DRY history of your ActiveRecord models' changes}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/version.rb",
      "lib/vestal_versions.rb",
+     "test/between_test.rb",
      "test/changes_test.rb",
      "test/comparable_test.rb",
      "test/creation_test.rb",
@@ -42,7 +43,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Keep a DRY history of your ActiveRecord models' changes}
   s.test_files = [
-    "test/changes_test.rb",
+    "test/between_test.rb",
+     "test/changes_test.rb",
      "test/comparable_test.rb",
      "test/creation_test.rb",
      "test/last_changes_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laserlemon-vestal_versions
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - init.rb
 - lib/version.rb
 - lib/vestal_versions.rb
+- test/between_test.rb
 - test/changes_test.rb
 - test/comparable_test.rb
 - test/creation_test.rb
@@ -52,7 +53,6 @@ files:
 - vestal_versions.gemspec
 has_rdoc: false
 homepage: http://github.com/laserlemon/vestal_versions
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -73,11 +73,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Keep a DRY history of your ActiveRecord models' changes
 test_files: 
+- test/between_test.rb
 - test/changes_test.rb
 - test/comparable_test.rb
 - test/creation_test.rb