laserlemon-vestal_versions 0.4.2 → 0.4.3

data/.gitignore

@@ -1 +1,2 @@
+.DS_Store
 test/*.db

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/vestal_versions.rb

@@ -11,10 +11,10 @@ module LaserLemon
         has_many :versions, :as => :versioned, :order => 'versions.number ASC', :dependent => :destroy do
           def at(value)
             case value
-              when Version: value
-              when Numeric: find_by_number(value.floor)
-              when Symbol: respond_to?(value) ? send(value) : nil
-              when Date, Time: last(:conditions => ['versions.created_at <= ?', value.to_time])
+              when Version then value
+              when Numeric then find_by_number(value.floor)
+              when Symbol then respond_to?(value) ? send(value) : nil
+              when Date, Time then last(:conditions => ['versions.created_at <= ?', value.to_time])
             end
           end
 
@@ -31,9 +31,9 @@ module LaserLemon
 
             def number_at(value)
               case value
-                when Version: value.number
-                when Numeric: value.floor
-                when Symbol, Date, Time: at(value).try(:number)
+                when Version then value.number
+                when Numeric then value.floor
+                when Symbol, Date, Time then at(value).try(:number)
               end
             end
         end
@@ -41,6 +41,7 @@ module LaserLemon
         after_save :create_version, :if => :needs_version?
 
         include InstanceMethods
+        alias_method_chain :reload, :versions
       end
     end
 
@@ -52,6 +53,7 @@ module LaserLemon
         end
 
         def reset_version(new_version = nil)
+          @last_version = nil if new_version.nil?
           @version = new_version
         end
 
@@ -69,7 +71,20 @@ module LaserLemon
       public
 
         def version
-          @version ||= versions.maximum(:number)
+          @version ||= last_version
+        end
+
+        def last_version
+          @last_version ||= versions.maximum(:number)
+        end
+
+        def reverted?
+          version != last_version
+        end
+        
+        def reload_with_versions(*args)
+          reset_version
+          reload_without_versions(*args)
         end
 
         def revert_to(value)

data/test/creation_test.rb

@@ -44,12 +44,12 @@ class CreationTest < Test::Unit::TestCase
       end
 
       should 'increase by one' do
-        assert_equal (@initial_count + 1), @count
+        assert_equal @initial_count + 1, @count
       end
 
       should 'increase by one when reverted' do
         @user.revert_to!(:first)
-        assert_equal (@count + 1), @user.versions.count
+        assert_equal @count + 1, @user.versions.count
       end
 
       should 'not increase until a revert is saved' do

data/test/schema.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
+  :adapter => defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbcsqlite3' : 'sqlite3',
   :database => File.join(File.dirname(__FILE__), 'test.db')
 )
 

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
-$: << File.join(File.dirname(__FILE__))
+$: << File.dirname(__FILE__)
 
 require 'rubygems'
 require 'test/unit'

data/vestal_versions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vestal_versions}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-08-13}
+  s.date = %q{2009-08-31}
   s.description = %q{Keep a DRY history of your ActiveRecord models' changes}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laserlemon-vestal_versions
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency