mongoid-history 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7422b15f0027945a65e155ac5776cbbb7f3a38
-  data.tar.gz: e23db13692cbf5679ad32fecaa2a6bd000379547
+  metadata.gz: fc676c3c474a938c28348873980b310b13a23755
+  data.tar.gz: cf12dbab2b4462f7697f0c98e6c15004718df721
 SHA512:
-  metadata.gz: 2d88df0753a104a5fa4577ad4c8117d2fb46e0e1bcd1d996669d79a9f64bc92e8bd32dfecbcbc549d7801d815817eeef805f451b01bd8ba9485fd6f2abbbc3b6
-  data.tar.gz: 718ff47501c3b4feac38f5113131fcffca37570954bce7be763a88ae12a3c7f36f0b6ad6dbe063b6a8018256c4f14f5b7e9d6d364423ec61a34631e02bc1ffaf
+  metadata.gz: 8f3a8201b62c8a378a6f5707f047c58c6dc161000289fa0a835b05f732ab3e15b64fb10cc7be8d55ff434d680f72df5ed6e9a79ebf8a4f85067027e32666852a
+  data.tar.gz: 41e023a44672b5091e791ac365b88e3ea71b46db42ebfeb4b50a647f51a260579492c07b18897713472a494b994c783b7e21028f29fa000507d1425e71050ab8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.4.4 (7/29/2014)
+-----------------
+
+* [#111](https://github.com/aq1018/mongoid-history/pull/111) - Fixed compatibility of `undo!` and `redo!` methods with Rails 3.x - [@mrjlynch](https://github.com/mrjlynch).
+
 0.4.3 (7/10/2014)
 -----------------
 

data/lib/mongoid/history/trackable.rb

@@ -80,9 +80,13 @@ module Mongoid
 
           versions.each do |v|
             undo_attr = v.undo_attr(modifier)
-            attributes.merge!(undo_attr)
+            if Mongoid::History.mongoid3? # update_attributes! not bypassing rails 3 protected attributes
+              assign_attributes(undo_attr, without_protection: true)
+              save!
+            else # assign_attributes with 'without_protection' option does not work with rails 4/mongoid 4
+              update_attributes!(undo_attr)
+            end
           end
-          save!
         end
 
         def redo!(modifier = nil, options_or_version = nil)
@@ -91,9 +95,13 @@ module Mongoid
 
           versions.each do |v|
             redo_attr = v.redo_attr(modifier)
-            attributes.merge!(redo_attr)
+            if Mongoid::History.mongoid3?
+              assign_attributes(redo_attr, without_protection: true)
+              save!
+            else
+              update_attributes!(redo_attr)
+            end
           end
-          save!
         end
 
         def get_embedded(name)

data/lib/mongoid/history/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module History
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

data/spec/integration/integration_spec.rb

@@ -621,98 +621,118 @@ describe Mongoid::History do
 
     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
+        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: 4, to: 2
-          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
-
-        if Mongoid::History.mongoid3?
-          context "protected attributes" do
-            before :each do
-              Comment.attr_accessible(nil)
+        [nil, :reload].each do |method|
+          context "#{method || 'instance'}" do
+            it "should recognize :from, :to options" do
+              comment.undo! user, from: 4, to: 2
+              comment.send(method) if method
+              comment.title.should == "test"
             end
 
-            after :each do
-              Comment.attr_protected(nil)
+            it "should recognize parameter as version number" do
+              comment.undo! user, 3
+              comment.send(method) if method
+              comment.title.should == "Test2"
             end
 
-            it "should undo last version when no parameter is specified on protected attributes" do
+            it "should undo last version when no parameter is specified" do
               comment.undo! user
+              comment.send(method) if method
               comment.title.should == "Test3"
             end
 
-            it "should recognize :last options on model with protected attributes" do
+            it "should recognize :last options" do
               comment.undo! user, last: 2
+              comment.send(method) if method
               comment.title.should == "Test2"
             end
+
+            if Mongoid::History.mongoid3?
+              context "protected attributes" do
+                before :each do
+                  Comment.attr_accessible(nil)
+                end
+
+                after :each do
+                  Comment.attr_protected(nil)
+                end
+
+                it "should undo last version when no parameter is specified on protected attributes" do
+                  comment.undo! user
+                  comment.send(method) if method
+                  comment.title.should == "Test3"
+                end
+
+                it "should recognize :last options on model with protected attributes" do
+                  comment.undo! user, last: 2
+                  comment.send(method) if method
+                  comment.title.should == "Test2"
+                end
+              end
+            end
           end
         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
-
-        if Mongoid::History.mongoid3?
-          context "protected attributes" do
+        [nil, :reload].each do |method|
+          context "#{method || 'instance'}" do
             before :each do
-              Comment.attr_accessible(nil)
+              comment.update_attributes(title: "Test5")
             end
 
-            after :each do
-              Comment.attr_protected(nil)
+            it "should recognize :from, :to options" do
+              comment.redo! user,  from: 2, to: 4
+              comment.send(method) if method
+              comment.title.should == "Test4"
             end
 
             it "should recognize parameter as version number" do
               comment.redo! user, 2
+              comment.send(method) if method
               comment.title.should == "Test2"
             end
 
-            it "should recognize :from, :to options" do
-              comment.redo! user,  from: 2, to: 4
-              comment.title.should == "Test4"
+            it "should redo last version when no parameter is specified" do
+              comment.redo! user
+              comment.send(method) if method
+              comment.title.should == "Test5"
+            end
+
+            it "should recognize :last options" do
+              comment.redo! user, last: 1
+              comment.send(method) if method
+              comment.title.should == "Test5"
+            end
+
+            if Mongoid::History.mongoid3?
+              context "protected attributes" do
+                before :each do
+                  Comment.attr_accessible(nil)
+                end
+
+                after :each do
+                  Comment.attr_protected(nil)
+                end
+
+                it "should recognize parameter as version number" do
+                  comment.redo! user, 2
+                  comment.send(method) if method
+                  comment.title.should == "Test2"
+                end
+
+                it "should recognize :from, :to options" do
+                  comment.redo! user,  from: 2, to: 4
+                  comment.send(method) if method
+                  comment.title.should == "Test4"
+                end
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-history
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Aaron Qian
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -114,42 +114,42 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This library tracks historical changes for any document, including embedded
@@ -169,12 +169,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .document
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -208,17 +208,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Track and audit, undo and redo changes on Mongoid documents.