laserlemon-vestal_versions 0.3.0 → 0.4.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('vestal_versions', '0.3.0') do |g|
+Echoe.new('vestal_versions', '0.4.1') do |g|
   g.description = %(Keep a DRY history of your ActiveRecord models' changes)
   g.url = 'http://github.com/laserlemon/vestal_versions'
   g.author = 'Steve Richert'

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 3
-:patch: 0
+:minor: 4
+:patch: 1

data/lib/version.rb

@@ -2,17 +2,9 @@ class Version < ActiveRecord::Base
   
   belongs_to :versioned, :polymorphic => true
   
-  validates_presence_of :versioned, :changes, :number
-  validates_numericality_of :number, :greater_than => 0, :only_integer => true
-  validates_uniqueness_of :number, :scope => ['versioned_type', 'versioned_id']
-  
   serialize :changes, Hash
   
-  before_create :set_number
-  
-  def version
-    number
-  end
+  alias_attribute :version, :number
   
   def <=>(other)
     number <=> other.number
@@ -25,10 +17,4 @@ class Version < ActiveRecord::Base
   def >(other)
     number > other.number
   end
-  
-  private
-  
-  def set_number
-    write_attribute(:number, versioned.version.to_i + 1)
-  end
 end

data/lib/vestal_versions.rb

@@ -8,54 +8,62 @@ module LaserLemon
     
     module ClassMethods
       def versioned
-        has_many :versions, :as => :versioned, :order => 'versions.number', :dependent => :destroy, :autosave => true do
-          def current
-            first(:conditions => {:number => versioned.version})
-          end
-          
+        has_many :versions, :as => :versioned, :order => 'versions.number ASC', :dependent => :destroy do
           def at(value)
             case value
             when Version: value
-            when Symbol: send(value)
-            when Numeric: first(:conditions => {:number => value.floor})
-            when Date, Time: last(:conditions => ['versions.created_at <= ?', value.to_time])
+            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.in_time_zone])
             end
           end
           
           def between(from_value, to_value)
-            from, to = at(from_value), at(to_value)
-            return [] unless [from, to].all?{|v| v.is_a?(Version) }
+            from, to = number_at(from_value), number_at(to_value)
+            return [] if from.nil? || to.nil? || (from == to)
             all(
-              :conditions => {:number => ([from, to].min.number..[from, to].max.number)},
+              :conditions => {:number => Range.new(*[from, to].sort)},
               :order => "versions.number #{(from > to) ? 'DESC' : 'ASC'}"
             )
           end
+          
+          private
+          
+          def number_at(value)
+            case value
+            when Version: value.number
+            when Numeric: value.floor
+            when Symbol, Date, Time: at(value).try(:number)
+            end
+          end
         end
         
-        before_save :build_version
+        after_save :create_version, :if => :needs_version?
         
         include InstanceMethods
       end
     end
     
     module InstanceMethods
-      def build_version
-        @version = nil
-        versions.reload
-        unless changes.blank?
-          if versions.empty?
-            if new_record?
-              versions.build(:changes => attributes)
-            else
-              reverted_attributes = attributes.inject({}){|h,(k,v)| h.update(k => (changed.include?(k) ? changes[k].first : v)) }
-              version_timestamp = (try(:updated_at) || try(:created_at))
-              versions.build(:changes => reverted_attributes, :created_at => version_timestamp)
-            end
-          end
-          versions.build(:changes => changes) unless new_record?
+      private
+      
+      def needs_version?
+        !changed.empty?
+      end
+      
+      def create_version
+        if versions.empty?
+          versions.create(:changes => attributes, :number => 1)
+        else
+          @version = nil
+          versions.create(:changes => changes, :number => (version.to_i + 1))
         end
+        
+        @version = nil
       end
       
+      public
+      
       def version
         @version ||= versions.maximum(:number)
       end
@@ -63,13 +71,16 @@ module LaserLemon
       def revert_to(value)
         chain = versions.between(version, value)
         return version unless chain.size > 1
+        
         new_version, backward = chain.last.number, (chain.first > chain.last)
         backward ? chain.pop : chain.shift
+        
         chain.each do |version|
-          version.changes.each do |attribute, change|
+          version.changes.except('updated_at', 'updated_on').each do |attribute, change|
             write_attribute(attribute, backward ? change.first : change.last)
           end
         end
+        
         @version = new_version
       end
       

data/vestal_versions.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vestal_versions}
-  s.version = "0.3.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Richert"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-08-12}
   s.description = %q{Keep a DRY history of your ActiveRecord models' changes}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = ["lib/version.rb", "lib/vestal_versions.rb", "README.rdoc", "tasks/vestal_versions_tasks.rake"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laserlemon-vestal_versions
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Steve Richert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: []