mongoid-undo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19492347296216836cfe8a40b1994b0a49aaabc3
-  data.tar.gz: 786e77d26b1a74aefeb94f5878d4c778dc65a191
+  metadata.gz: 23ccf468731385d0732bd4fdbe957902bf33ea8a
+  data.tar.gz: e1f5454370449d7c7c5c7ec63c9facee18ce3e8c
 SHA512:
-  metadata.gz: 554821f592b475c4f591173d15879e70410a9f487a5aa11a9f8d8fa344dd2d79ece62c290fe334c1a6c051daa5ccede15b3b474d82a1a433cd3fe201a738d5fb
-  data.tar.gz: 5f4297de289c8ee64076bc708d5477ff7cfebdbc0523942fb753783a34a91231472b2f07f5e55a5edb11ff3084e7c8e2d0e55c0f92b8399d584ce820254819da
+  metadata.gz: 7d5a5958173f42e4610ec5c5ac222a92696dfa36cb2f8211ceab2f9ccaadea7c252a05baa33458dc12ffc4d200e123355d85472f56af01591d7dc898c9844791
+  data.tar.gz: 1585c00dfc19903fa43aeb511a802ee1fe4e5944f6d0acc0aa1133b0b60b1e2d8cd9717d5911732f03b7d4ab22e91ed3542d05eddfe635a809b93351b7e877a0

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+services: mongodb
+
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid_4.Gemfile
+  - gemfiles/mongoid_5.Gemfile

data/Gemfile

@@ -1,6 +1,2 @@
 source 'https://rubygems.org'
-
 gemspec
-
-gem 'minitest'
-gem 'rake'

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2012 - 2015 Mario Uher
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# mongoid-undo
+# mongoid-undo [![Build Status](https://travis-ci.org/haihappen/mongoid-undo.svg?branch=master)](https://travis-ci.org/haihappen/mongoid-undo)
 
 Super simple undo for your Mongoid app, based on both great modules
 [Mongoid::Paranoia](http://mongoid.org/en/mongoid/docs/extras.html#paranoia) and
@@ -85,7 +85,7 @@ document.persisted? #=> false
 
 ### Callbacks
 
-Mongoid::Undo defines two callbacks which are called before and after `undo`, respectively `redo`. Both are based on `ActiveModel::Callbacks` which means they behave like the allready known Rails callbacks.
+Mongoid::Undo defines two callbacks which are called before and after `undo`, respectively `redo`. Both are based on `ActiveModel::Callbacks` which means they behave like the already known Rails callbacks.
 
 ```ruby
 class Document
@@ -114,23 +114,6 @@ end
 
 (The MIT license)
 
-Copyright (c) 2012 - 2014 Mario Uher
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2012-2015 Mario Uher
+
+See LICENSE.md.

data/gemfiles/mongoid_4.Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '../'
+
+gem 'mongoid', '~> 4.0'

data/gemfiles/mongoid_5.Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '../'
+
+gem 'mongoid', '~> 5.0'

data/lib/mongoid/undo.rb

@@ -11,6 +11,7 @@ module Mongoid
     include Mongoid::Versioning
     include Mongoid::Interceptable
 
+    # @todo Remove Mongoid 4 support.
     included do
       # _id must be marked as not-versioned
       fields['_id'].options.merge!(versioned: false)
@@ -21,7 +22,10 @@ module Mongoid
         name = :"set_action_after_#{action}"
 
         define_method name do
-          collection.find(atomic_selector).update('$set' => { action: action })
+          query = collection.find(atomic_selector)
+          set = { '$set' => { action: action }}
+
+          query.respond_to?(:update_one) ? query.update_one(set) : query.update(set)
           version = self.instance_variable_get(:@version)
           reload
           self.instance_variable_set :@version, version unless version.nil?
@@ -59,8 +63,10 @@ module Mongoid
     alias_method :redoable?, :undoable?
 
   private
+    # @todo Remove Mongoid 4 support.
     def retrieve
-      update versions.last.versioned_attributes.except('version', 'updated_at')
+      attributes = versions.last.versioned_attributes.except('version', 'updated_at')
+      respond_to?(:update_one) ? update_one(attributes) : update(attributes)
     end
   end
 end

data/lib/mongoid/undo/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Undo
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/mongoid-undo.gemspec

@@ -9,12 +9,16 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/haihappen/mongoid-undo'
   gem.summary       = 'Super simple undo for your Mongoid app.'
   gem.description   = 'mongoid-undo provides a super simple and easy to use undo system for Mongoid apps.'
+  gem.licenses      = ['MIT']
 
   gem.files         = `git ls-files`.split("\n")
   gem.require_path  = 'lib'
 
-  gem.add_dependency 'activesupport'
-  gem.add_dependency 'mongoid', '~> 4.0.0'
-  gem.add_dependency 'mongoid-paranoia', '~> 1.0.0'
-  gem.add_dependency 'mongoid-versioning', '~> 1.0.0'
+  gem.add_dependency 'activesupport', '~> 4.0'
+  gem.add_dependency 'mongoid', '>= 4.0.0', '<= 6.0.0'
+  gem.add_dependency 'mongoid-paranoia', '>= 1.3.0', '~> 1.1'
+  gem.add_dependency 'mongoid-versioning', '>= 1.1.0', '~> 1.1'
+
+  gem.add_development_dependency 'minitest', '~> 5.0'
+  gem.add_development_dependency 'rake', '~> 10.0'
 end

data/test/mongoid.yml

@@ -1,4 +1,10 @@
 test:
+  clients:
+    default:
+      database: mongoid_undo_test
+      hosts:
+        - localhost:27017
+  # TODO Remove Mongoid 4.0 support
   sessions:
     default:
       database: mongoid_undo_test

data/test/test_helper.rb

@@ -6,10 +6,11 @@ require 'mongoid/undo'
 
 Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), 'test')
 
-class MiniTest::Unit::TestCase
-  alias_method :assert_not, :refute
-  alias_method :assert_not_equal, :refute_equal
+if defined?(Mongo)
+  Mongo::Logger.logger.level = Logger::WARN
+end
 
+class Minitest::Test
   # Copied from activesupport/lib/active_support/testing/assertions.rb
   def assert_difference(expression, difference = 1, message = nil, &block)
     expressions = Array(expression)

data/test/undo_test.rb

@@ -15,7 +15,7 @@ class Timestamped < Document
   include Mongoid::Timestamps
 end
 
-class UndoTest < Minitest::Unit::TestCase
+class UndoTest < Minitest::Test
   def test_create
     document = Document.create(name: 'foo')
     assert_equal :create, document.action
@@ -26,7 +26,7 @@ class UndoTest < Minitest::Unit::TestCase
     document.undo
     assert_equal :create, document.action
     assert_equal 1, document.version
-    assert_not document.persisted?
+    refute document.persisted?
     assert document.undoable?
 
     document.redo
@@ -41,7 +41,7 @@ class UndoTest < Minitest::Unit::TestCase
     document = Document.create(name: 'foo')
 
     document.save
-    assert_not document.undoable?
+    refute document.undoable?
 
     document.update_attributes name: 'bar'
     assert_equal :update, document.action
@@ -69,7 +69,7 @@ class UndoTest < Minitest::Unit::TestCase
 
     document.destroy
     assert_equal :destroy, document.action
-    assert_not document.persisted?
+    refute document.persisted?
     assert document.undoable?
 
     document.undo
@@ -79,7 +79,7 @@ class UndoTest < Minitest::Unit::TestCase
 
     document.redo
     assert_equal :destroy, document.action
-    assert_not document.persisted?
+    refute document.persisted?
     assert document.undoable?
   end
 
@@ -115,13 +115,13 @@ class UndoTest < Minitest::Unit::TestCase
     updated_at = document.updated_at
 
     document.update_attributes(name: 'bar')
-    assert_not_equal updated_at, document.updated_at
+    refute_equal updated_at, document.updated_at
 
     document.undo
-    assert_not_equal updated_at, document.updated_at
+    refute_equal updated_at, document.updated_at
 
     document.redo
-    assert_not_equal updated_at, document.updated_at
+    refute_equal updated_at, document.updated_at
   end
 
 

metadata

@@ -1,71 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-undo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid-paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mongoid-versioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '10.0'
 description: mongoid-undo provides a super simple and easy to use undo system for
   Mongoid apps.
 email: uher.mario@gmail.com
@@ -74,10 +120,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CHANGELOG.md
+- ".travis.yml"
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
+- gemfiles/mongoid_4.Gemfile
+- gemfiles/mongoid_5.Gemfile
 - lib/mongoid/undo.rb
 - lib/mongoid/undo/version.rb
 - mongoid-undo.gemspec
@@ -85,7 +134,8 @@ files:
 - test/test_helper.rb
 - test/undo_test.rb
 homepage: https://github.com/haihappen/mongoid-undo
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -103,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Super simple undo for your Mongoid app.

data/CHANGELOG.md

@@ -1,51 +0,0 @@
-# 0.11.0 (June 29, 2014)
-* Adds undoable? (and respectively redoable?) methods to check whether a new version was saved or not.
-
-# 0.10.1 (April 16, 2014)
-* Switches to non anonymous callbacks.
-
-# 0.10.0 (March 30, 2014)
-* Adds both callbacks for undo and redo.
-
-# 0.9.1 (February 17, 2014)
-* We are still on minitest 4. 😞
-
-# 0.9.0 (February 17, 2014)
-* Whoa! Removes ruby version from Gemfile.
-
-# 0.8.0 (February 10, 2014)
-* Fixes \#2: updated_at-columns not working anymore.
-
-# 0.7.0 (February 8, 2014)
-* Simpler tests.
-
-# 0.6.0 (February 15, 2013)
-* Updated Gemfile for Bundler 1.2.4+.
-* Easier mongoid config.
-
-# 0.5.0 (February 14, 2013)
-* Use Rake::FileList.
-* \#1 Removed localization monkey patch. mongoid >= 3.0.10 is now required!
-
-# 0.4.0 (December 31, 2012)
-* Better specs structure.
-* Use require_relative.
-
-# 0.3.0 (December 22, 2012)
-* Revert "Renamed action field to _action."
-
-# 0.2.1 (December 22, 2012)
-* Typo. Upps.
-
-# 0.2.0 (December 22, 2012)
-* Fixed weird looking README.md.
-
-# 0.1.0 (December 22, 2012)
-* Refactored specs.
-* Renamed action field to _action.
-
-# 0.0.2 (December 22, 2012)
-* Added rake to Gemfile.
-
-# 0.0.1 (December 21, 2012)
-* First public version.