mongoid-history 0.3.0 → 0.3.1

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+services: mongodb
 rvm:
   - 1.9.3
 

data/CHANGELOG.md

@@ -1,13 +1,19 @@
-Next Release
-------------
+0.3.1
+-----
 
-* 
+* [#45](https://github.com/aq1018/mongoid-history/pull/45) Fix: intermittent hash ordering issue with history_tracks - [@getaroom](https://github.com/getaroom).
+* [#50](https://github.com/aq1018/mongoid-history/pull/50) Fix: tracking of array changes, undo and redo of field changes on non-embedded objects - [@dblock](https://github.com/dblock).
+
+0.3.0 (8/21/2012)
+-----------------
+
+* [#41](https://github.com/aq1018/mongoid-history/pull/41) Mongoid 3.x support - [@zambot](https://github.com/zambot).
 
 0.2.4 (8/21/2012)
 -----------------
 
-* [#38](https://github.com/aq1018/mongoid-history/pull/38) Fix: Allow sub-models to be tracked by using `collection_name` as the scope - [@acant](https://github.com/acant).
-* [#35](https://github.com/aq1018/mongoid-history/pull/35): Fix: sweeper references record of change, not the record changed - [@dblock](https://github.com/dblock).
+* [#38](https://github.com/aq1018/mongoid-history/pull/38) Fix: allow sub-models to be tracked by using `collection_name` as the scope - [@acant](https://github.com/acant).
+* [#35](https://github.com/aq1018/mongoid-history/pull/35) Fix: sweeper references record of change, not the record changed - [@dblock](https://github.com/dblock).
 
 0.2.3 (4/20/2012)
 -----------------

data/README.md

@@ -1,7 +1,7 @@
 mongoid-history
 ===============
 
-[![Build Status](https://secure.travis-ci.org/aq1018/mongoid-history.png?branch=master)](http://travis-ci.org/aq1018/mongoid-history) [![Dependency Status](https://gemnasium.com/aq1018/mongoid-history.png?travis)](https://gemnasium.com/aq1018/mongoid-history)
+[![Build Status](https://secure.travis-ci.org/aq1018/mongoid-history.png?branch=master)](http://travis-ci.org/aq1018/mongoid-history)
 
 Mongoid-history tracks historical changes for any document, including embedded ones. It achieves this by storing all history tracks in a single collection that you define. 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.
 
@@ -178,6 +178,6 @@ Contributing to mongoid-history
 Copyright
 ---------
 
-Copyright (c) 2011-2012 Aaron Qian. MIT License. 
+Copyright (c) 2011-2012 Aaron Qian. MIT License.
 See [LICENSE.txt](https://github.com/aq1018/mongoid-history/blob/master/LICENSE.txt) for further details.
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/mongoid/history/trackable.rb

@@ -71,7 +71,7 @@ module Mongoid::History
 
     module MyInstanceMethods
       def history_tracks
-        @history_tracks ||= Mongoid::History.tracker_class.where(:scope => history_trackable_options[:scope], :association_chain => association_hash)
+        @history_tracks ||= Mongoid::History.tracker_class.where(:scope => history_trackable_options[:scope], :association_chain => { "$elemMatch" => association_hash })
       end
 
       #  undo :from => 1, :to => 5
@@ -239,7 +239,7 @@ module Mongoid::History
           modified[k] = m unless m.nil?
         end
 
-        return original.easy_diff modified
+        [ original, modified ]
       end
 
     end

data/mongoid-history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid-history"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Qian", "Justin Grimes"]
-  s.date = "2012-08-21"
+  s.date = "2012-11-16"
   s.description = "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.\n\n  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."
   s.email = ["aq1018@gmail.com", "justin.mgrimes@gmail.com"]
   s.extra_rdoc_files = [

data/spec/integration/integration_spec.rb

@@ -52,6 +52,7 @@ describe Mongoid::History do
 
       field             :email
       field             :name
+      field             :aliases, :type => Array
       track_history     :except => [:email]
     end
 
@@ -59,7 +60,7 @@ describe Mongoid::History do
       include Mongoid::Document
       include Mongoid::Timestamps
       include Mongoid::History::Trackable
-      
+
       belongs_to :updated_by, :class_name => "User"
 
       field             :title
@@ -68,7 +69,7 @@ describe Mongoid::History do
   end
 
   before :each do
-    @user = User.create(:name => "Aaron", :email => "aaron@randomemail.com")
+    @user = User.create(:name => "Aaron", :email => "aaron@randomemail.com", :aliases => [ 'bob' ])
     @another_user = User.create(:name => "Another Guy", :email => "anotherguy@randomemail.com")
     @post = Post.create(:title => "Test", :body => "Post", :modifier => @user, :views => 100)
     @comment = @post.comments.create(:title => "test", :body => "comment", :modifier => @user)
@@ -189,10 +190,35 @@ describe Mongoid::History do
       end
 
       it "should exclude defined options" do
+        name = @user.name
+        @user.update_attributes(:name => "Aaron2", :email => "aaronsnewemail@randomemail.com")
+        @user.history_tracks.first.original.keys.should == [ "name", "updated_at" ]
+        @user.history_tracks.first.original["name"].should == name
+        @user.history_tracks.first.modified.keys.should == [ "name", "updated_at" ]
+        @user.history_tracks.first.modified["name"].should == @user.name
+      end
+
+      it "should undo field changes" do
+        name = @user.name
         @user.update_attributes(:name => "Aaron2", :email => "aaronsnewemail@randomemail.com")
-        @user.history_tracks.first.modified.keys.should include "name"
-        @user.history_tracks.first.modified.keys.should_not include "email"
+        @user.history_tracks.first.undo! nil
+        @user.reload.name.should == name
+      end
+
+      it "should track array changes" do
+        aliases = @user.aliases
+        @user.update_attributes(:aliases => [ 'bob', 'joe' ])
+        @user.history_tracks.first.original["aliases"].should == aliases
+        @user.history_tracks.first.modified["aliases"].should == @user.aliases
       end
+
+      it "should undo array changes" do
+        aliases = @user.aliases
+        @user.update_attributes(:aliases => [ 'bob', 'joe' ])
+        @user.history_tracks.first.undo! nil
+        @user.reload.aliases.should == aliases
+      end
+
     end
 
     describe "on update non-embedded twice" do
@@ -367,7 +393,7 @@ describe Mongoid::History do
         @tag_foo = @post.tags.create(:title => "foo", :updated_by => @user)
         @tag_bar = @post.tags.create(:title => "bar")
       end
-      
+
       after(:each) do
         Thread.current[:mongoid_history_sweeper_controller] = nil
       end
@@ -400,7 +426,7 @@ describe Mongoid::History do
         @tag_foo.history_tracks.last.association_chain.last["name"].should == "tags"
         lambda{ @tag_foo.history_tracks.last.trackable }.should_not raise_error
       end
-      
+
       it "should save modifier" do
         @tag_foo.history_tracks.last.modifier.should eq @user
         @tag_bar.history_tracks.last.modifier.should eq @user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-history
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_diff
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 877523070155476761
+      hash: -3144305441896243530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: