mongoid-history 0.0.5 → 0.0.6

data/README.rdoc

@@ -82,7 +82,20 @@ Here is a quick example on how to use this plugin. For more details, please look
   
   track.redo! # comment title should be "Test 2"
   
+  # undo last change
+  comment.undo! @user
   
+  # undo versions 1 - 4
+  comment.undo! @user, :from => 1, :to => 4
+  
+  # undo last 3 versions
+  comment.undo! @user, :last => 3
+  
+  # redo versions 1 - 4
+  comment.redo! @user, :from => 1, :to => 4
+  
+  # redo last 3 versions
+  comment.redo! @user, :last => 3
 
 == Contributing to mongoid-history
  

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/mongoid/history.rb

@@ -8,5 +8,6 @@ module Mongoid
     def self.tracker_class
       @tracker_class ||= tracker_class_name.to_s.classify.constantize
     end
+
   end
 end

data/lib/mongoid/history/trackable.rb

@@ -42,7 +42,6 @@ module Mongoid::History
 
         before_update :track_update
         before_create :track_create if options[:track_create]
-
         
         Mongoid::History.trackable_classes ||= []
         Mongoid::History.trackable_classes << self
@@ -67,7 +66,50 @@ module Mongoid::History
         @history_tracks ||= Mongoid::History.tracker_class.where(:scope => history_trackable_options[:scope], :association_chain => triverse_association_chain)
       end
       
+      #  undo :from => 1, :to => 5
+      #  undo 4
+      #  undo :last => 10
+      def undo!(modifier, options_or_version=nil)
+        versions = get_versions_criteria(options_or_version).to_a
+        versions.sort!{|v1, v2| v2.version <=> v1.version}
+
+        versions.each do |v|
+          undo_attr = v.undo_attr(modifier)
+          self.attributes = v.undo_attr(modifier)
+        end
+        save!
+      end
+      
+      def redo!(modifier, options_or_version=nil)
+        versions = get_versions_criteria(options_or_version).to_a
+        versions.sort!{|v1, v2| v1.version <=> v2.version}
+
+        versions.each do |v|
+          redo_attr = v.redo_attr(modifier)
+          self.attributes = redo_attr
+        end
+        save!
+      end
+      
     private
+      def get_versions_criteria(options_or_version)
+        if options_or_version.is_a? Hash
+          options = options_or_version
+          if options[:from] && options[:to]
+            versions = history_tracks.where(:version.in => (options[:from] .. options[:to]).to_a)
+          elsif options[:last]
+            versions = history_tracks.limit(options[:last])
+          else
+            raise "Invalid options, please specify (:from / :to) keys or :last key."
+          end
+        else
+          version = options_or_version || self.attributes[history_trackable_options[:version_field]]
+          version = [ version ].flatten
+          versions = history_tracks.where(:version.in => version)
+        end
+        versions.desc(:version)
+      end
+      
       def should_track_update?
         track_history? && !modified_attributes_for_update.blank?
       end

data/lib/mongoid/history/tracker.rb

@@ -21,19 +21,27 @@ module Mongoid::History
     end
     
     def undo!(modifier)
+      trackable.update_attributes!(undo_attr(modifier))
+    end
+    
+    def redo!(modifier)
+      trackable.update_attributes!(redo_attr(modifier))
+    end
+    
+    def undo_attr(modifier)
       undo_hash = affected.easy_unmerge(modified)
       undo_hash.easy_merge!(original)
       modifier_field = trackable.history_trackable_options[:modifier_field]
       undo_hash[modifier_field] = modifier
-      trackable.update_attributes!(undo_hash)
+      undo_hash
     end
     
-    def redo!(modifier)
+    def redo_attr(modifier)
       redo_hash = affected.easy_unmerge(original)
       redo_hash.easy_merge!(modified)
       modifier_field = trackable.history_trackable_options[:modifier_field]
       redo_hash[modifier_field] = modifier
-      trackable.update_attributes!(redo_hash)
+      redo_hash
     end
     
     def trackable_root

data/mongoid-history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-history}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Qian"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-16}
   s.description = %q{In frustration of Mongoid::Versioning, I created this plugin for tracking historical changes for any document, including embedded ones. It achieves this by storing all history tracks in a single collection that you define. (See Usage for more details) Embedded documents are referenced by storing an association path, which is an array of document_name and document_id fields starting from the top most parent document and down to the embedded document that should track history.
 
   This plugin implements multi-user undo, which allows users to undo any history change in any order. Undoing a document also creates a new history track. This is great for auditing and preventing vandalism, but it is probably not suitable for use cases such as a wiki.}

data/spec/integration/integration_spec.rb

@@ -274,6 +274,63 @@ describe Mongoid::History do
         @comment.title.should == @comment2.title
       end
     end
+    
+    describe "trackables" do
+      before :each do
+        @comment.update_attributes(:title => "Test2") # version == 2
+        @comment.update_attributes(:title => "Test3") # version == 3
+        @comment.update_attributes(:title => "Test4") # version == 4
+      end
+      
+      describe "undo" do
+        it "should recognize :from, :to options" do
+          @comment.undo! @user, :from => 2, :to => 4
+          @comment.title.should == "test"
+        end
+        
+        it "should recognize parameter as version number" do
+          @comment.undo! @user, 3
+          
+          @comment.title.should == "Test2"
+        end
+        
+        it "should undo last version when no parameter is specified" do
+          @comment.undo! @user
+          @comment.title.should == "Test3"
+        end
+        
+        it "should recognize :last options" do
+          @comment.undo! @user, :last => 2
+          @comment.title.should == "Test2"
+        end
+      end
+      
+      describe "redo" do
+        before :each do
+          @comment.update_attributes(:title => "Test5")
+        end
+        
+        it "should recognize :from, :to options" do
+          @comment.redo! @user,  :from => 2, :to => 4
+          @comment.title.should == "Test4"
+        end
+        
+        it "should recognize parameter as version number" do
+          @comment.redo! @user, 2
+          @comment.title.should == "Test2"
+        end
+        
+        it "should redo last version when no parameter is specified" do
+          @comment.redo! @user
+          @comment.title.should == "Test5"
+        end
+        
+        it "should recognize :last options" do
+          @comment.redo! @user, :last => 1
+          @comment.title.should == "Test5"
+        end
 
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: mongoid-history
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Aaron Qian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4485611789112804696
+      hash: 1896069804740488378
       segments: 
       - 0
       version: "0"