vestal_versions 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/vestal_versions.rb

@@ -9,13 +9,13 @@ module LaserLemon
     module ClassMethods
       def versioned
         has_many :versions, :as => :versioned, :order => 'versions.number ASC', :dependent => :delete_all 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)
+          def between(from, to)
+            from_number, to_number = number_at(from), number_at(to)
+            return [] if from_number.nil? || to_number.nil?
+            condition = (from_number == to_number) ? to_number : Range.new(*[from_number, to_number].sort)
             all(
               :conditions => {:number => condition},
-              :order => "versions.number #{(from > to) ? 'DESC' : 'ASC'}"
+              :order => "versions.number #{(from_number > to_number) ? 'DESC' : 'ASC'}"
             )
           end
 
@@ -88,26 +88,37 @@ module LaserLemon
           reload_without_versions(*args)
         end
 
-        def revert_to(value)
-          to_value = versions.number_at(value)
-          return version if to_value == version
-          chain = versions.between(version, to_value)
-          return version if chain.empty?
+        def changes_between(from, to)
+          from_number, to_number = versions.number_at(from), versions.number_at(to)
+          return {} if from_number == to_number
+          chain = versions.between(from_number, to_number)
+          return {} if chain.empty?
 
-          new_version = chain.last.number
           backward = chain.first > chain.last
           backward ? chain.pop : chain.shift
 
           timestamps = %w(created_at created_on updated_at updated_on)
 
-          chain.each do |version|
+          chain.inject({}) do |changes, version|
             version.changes.except(*timestamps).each do |attribute, change|
-              new_value = backward ? change.first : change.last
-              write_attribute(attribute, new_value)
+              change.reverse! if backward
+              new_change = [changes.fetch(attribute, change).first, change.last]
+              changes.update(attribute => new_change)
             end
+            changes
+          end
+        end
+
+        def revert_to(value)
+          to_number = versions.number_at(value)
+          changes = changes_between(version, to_number)
+          return version if changes.empty?
+
+          changes.each do |attribute, change|
+            write_attribute(attribute, change.last)
           end
 
-          reset_version(new_version)
+          reset_version(to_number)
         end
 
         def revert_to!(value)

data/vestal_versions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vestal_versions}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-09-05}
+  s.date = %q{2009-09-21}
   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: vestal_versions
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -04:00
+date: 2009-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency