mongoid-history 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/mongoid/history/tracker.rb

@@ -20,15 +20,19 @@ module Mongoid::History
     module ClassMethods
     end
     
-    def undo!
+    def undo!(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)
     end
     
-    def redo!
+    def redo!(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)
     end
     

data/mongoid-history.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-history}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Qian"]

data/spec/integration/integration_spec.rb

@@ -206,23 +206,30 @@ describe Mongoid::History do
     describe "non-embedded" do
       it "should undo changes" do
         @post.update_attributes(:title => "Test2")
-        @post.history_tracks.where(:version => 1).first.undo!
+        @post.history_tracks.where(:version => 1).first.undo!(@user)
         @post.reload
         @post.title.should == "Test"
       end
       
       it "should create a new history track after undo" do
         @post.update_attributes(:title => "Test2")
-        @post.history_tracks.where(:version => 1).first.undo!
+        @post.history_tracks.where(:version => 1).first.undo!(@user)
         @post.reload
         @post.history_tracks.count.should == 2
       end
       
+      it "should assign @user as the modifier of the newly created history track" do
+        @post.update_attributes(:title => "Test2")
+        @post.history_tracks.where(:version => 1).first.undo!(@user)
+        @post.reload
+        @post.history_tracks.where(:version => 2).first.modifier.should == @user
+      end
+      
       it "should stay the same after undo and redo" do
         @post.update_attributes(:title => "Test2")
         @track = @post.history_tracks.where(:version => 1).first
-        @track.undo!
-        @track.redo!
+        @track.undo!(@user)
+        @track.redo!(@user)
         @post2 = Post.where(:_id => @post.id).first
       
         @post.title.should == @post2.title
@@ -232,7 +239,7 @@ describe Mongoid::History do
     describe "embedded" do
       it "should undo changes" do
         @comment.update_attributes(:title => "Test2")
-        @comment.history_tracks.where(:version => 2).first.undo!
+        @comment.history_tracks.where(:version => 2).first.undo!(@user)
         # reloading an embedded document === KAMIKAZE
         # at least for the current release of mongoid...
         @post.reload
@@ -242,17 +249,25 @@ describe Mongoid::History do
       
       it "should create a new history track after undo" do
         @comment.update_attributes(:title => "Test2")
-        @comment.history_tracks.where(:version => 2).first.undo!
+        @comment.history_tracks.where(:version => 2).first.undo!(@user)
         @post.reload
         @comment = @post.comments.first
         @comment.history_tracks.count.should == 3
       end
       
+      it "should assign @user as the modifier of the newly created history track" do
+        @comment.update_attributes(:title => "Test2")
+        @comment.history_tracks.where(:version => 2).first.undo!(@user)
+        @post.reload
+        @comment = @post.comments.first
+        @comment.history_tracks.where(:version => 3).first.modifier.should == @user
+      end
+      
       it "should stay the same after undo and redo" do
         @comment.update_attributes(:title => "Test2")
         @track = @comment.history_tracks.where(:version => 2).first
-        @track.undo!
-        @track.redo!
+        @track.undo!(@user)
+        @track.redo!(@user)
         @post2 = Post.where(:_id => @post.id).first
         @comment2 = @post2.comments.first
         

metadata

@@ -2,7 +2,7 @@
 name: mongoid-history
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Aaron Qian
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4375760332682967457
+      hash: -4589189191115367559
       segments: 
       - 0
       version: "0"