mongoid-locker 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15bbaa6b9c117c44fb72c5db1b1c6ec6a9019044
-  data.tar.gz: e0e4680415861b7ce27cba6bd3884a2cee123f3f
+  metadata.gz: f041c4f1e34322978f337ddf9aa20727aa152974
+  data.tar.gz: 7be9a12c2137ae7174a16956742a418cff02470a
 SHA512:
-  metadata.gz: b6cf643433841b6efba4ac548ace833fa50b6d4984cbc90c620ec1a38f5338943a181c372499394923d9386b96d328e1a8236904c3c94df7452c55a94badce0b
-  data.tar.gz: 27537644279ea4c3fb4299fcd1430c4b3d9f017222f29550965b2fdedbb7d9052cef223386f5136ead1b03989b8083650191157d3081fe77afca55228531d312
+  metadata.gz: beb254ea3282c54d9977703ecd9d670b9caf17e1ce1cfa598169b8d1f3a981654fbdf4b0bb2ddc626a3dfb7f2ac06c6e5858ee3531e70e8a850593e57a9bec4b
+  data.tar.gz: 96966c6237c4081b4477d0e774cddc131392c40d7125c782f5f427daaf881b9e45466eecd0fb331d28cd737f2badfbf48e3de4049db69d3ed24117c34579adef

data/.gitignore

@@ -0,0 +1,19 @@
+# rcov
+coverage
+coverage.data
+
+# rdoc
+rdoc
+
+# yard
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# guard
+tmp
+
+# bundler
+Gemfile.lock

data/.travis.yml

@@ -1,18 +1,34 @@
+services:
+  - mongodb
+
 language: ruby
 
-rvm:
-  - 1.9.3
-  - 2.1.2
-  - 2.2
-  - jruby-19mode
-  - rbx-2
+cache: bundler
 
-services: mongodb
+before_install:
+  - gem update --system
+  - gem install bundler
 
-env:
-  - MONGOID_VERSION=2
-  - MONGOID_VERSION=3
-  - MONGOID_VERSION=4
-  - MONGOID_VERSION=5
+matrix:
+  include:
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=2
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=3
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=4
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=5
+    - rvm: 2.3.1
+      env: MONGOID_VERSION=6
+      before_script:
+        - bundle exec danger
+    - rvm: rbx-2
+    - rvm: ruby-head
+    - rvm: jruby-head
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-2
 
-cache: bundler
+bundler_args: --without development

data/CHANGELOG.md

@@ -1,55 +1,61 @@
-# Changelog
+## Changelog
 
-## 0.3.4 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.4...master?w=1))
+### 0.3.5 (1/24/2017)
 
-* fixed write concern for the lock record with Mongoid 5
-* don't query the document in Mongoid 5, better performance when acquiring lock
+* [#43](https://github.com/mongoid/mongoid-locker/pull/43): Added support for Mongoid 6 - [@sivagollapalli](https://github.com/sivagollapalli).
+* [#38](https://github.com/mongoid/mongoid-locker/issues/38): Fixed unlock already destroyed object - [@sivagollapalli](https://github.com/sivagollapalli).
+* Removed Jeweler - [@afeld](https://github.com/afeld).
+* [#46](https://github.com/mongoid/mongoid-locker/pull/46): Allow unlock when process no longer owns the lock or the lock times out - [@nchainani](https://github.com/nchainani).
+* Library moved to the mongoid organization - [@afeld](https://github.com/afeld), [@dblock](https://github.com/dblock).
+* [#48](https://github.com/mongoid/mongoid-locker/pull/48): Added Danger, PR linter - [@dblock](https://github.com/dblock).
 
-## 0.3.3 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.3...master?w=1))
+### 0.3.4
 
-* support Mongoid 5 - #36
+* [#37](https://github.com/mongoid/mongoid-locker/pull/37): Fixed write concern for the lock record with Mongoid 5 - [@dblock](https://github.com/dblock).
+* Don't query the document in Mongoid 5, better performance when acquiring lock - [@afeld](https://github.com/afeld).
 
-## 0.3.2 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.1...v0.3.2?w=1))
+### 0.3.3
 
-* loosen Mongoid dependency - #33
+* [#36](https://github.com/mongoid/mongoid-locker/pull/36): Added support for Mongoid 5 - [@dblock](https://github.com/dblock).
 
-## 0.3.1 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.0...v0.3.1?w=1))
+### 0.3.2
 
-* fixed race condition, `undefined method '-' for nil:NilClass` - #18
+* [#34](https://github.com/mongoid/mongoid-locker/issues/34): Loosened Mongoid dependency - [@afeld](https://github.com/afeld).
 
-## 0.3.0 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.2.1...v0.3.0?w=1))
+### 0.3.1
 
-* change exception class to be `Mongoid::Locker::LockError` - #8
-* drop support for Rubinius 1.8-mode, since it seems to be [broken w/ Mongoid 2.6](https://travis-ci.org/mongoid/mongoid/jobs/4594000)
-* relax dependency on Mongoid - #12
-* add Mongoid 4 support
-* drop support for Ruby 1.8.x
-* got rid of appraisal for testing multiple Mongoid versions
-* added Rubocop, Ruby style linter
-* fixed `:has_lock?` to always return a boolean
-* upgraded RSpec to 3.x
+* [#32](https://github.com/mongoid/mongoid-locker/pull/32): Fixed race condition, `undefined method '-' for nil:NilClass` - [@pschrammel](https://github.com/pschrammel).
 
-Thanks to @mooremo, @yanowitz and @nchainani (#9):
+### 0.3.0
 
-* add `:retries` option to attempt to grab a lock multiple times - #2
-* add `:retry_sleep` to override duration between lock attempts
-* reload document after acquiring a lock by default, which can be disabled with `:reload => false`
+* [#8](https://github.com/mongoid/mongoid-locker/issues/8): Changed exception class to be `Mongoid::Locker::LockError` - [@afeld](https://github.com/afeld), [@tolsen](https://github.com/tolsen).
+* Dropped support for Rubinius 1.8-mode, since it seems to be broken w/ Mongoid 2.6 - [@afeld](https://github.com/afeld).
+* [#8](https://github.com/mongoid/mongoid-locker/issues/12): Relaxed dependency on Mongoid - [@afeld](https://github.com/afeld).
+* [#24](https://github.com/mongoid/mongoid-locker/pull/24): Added Mongoid 4 support - [@dblock](https://github.com/dblock).
+* [#24](https://github.com/mongoid/mongoid-locker/pull/24): Dropped support for Ruby 1.8.x - [@dblock](https://github.com/dblock).
+* Got rid of appraisal for testing multiple Mongoid versions - [@afeld](https://github.com/afeld).
+* [#25](https://github.com/mongoid/mongoid-locker/pull/25): Added Rubocop, Ruby style linter - [@dblock](https://github.com/dblock).
+* [#25](https://github.com/mongoid/mongoid-locker/pull/25): Fixed `:has_lock?` to always return a boolean - [@dblock](https://github.com/dblock).
+* [#25](https://github.com/mongoid/mongoid-locker/pull/25): Upgraded RSpec to 3.x - [@dblock](https://github.com/dblock).
+* [#9](https://github.com/mongoid/mongoid-locker/pull/9): Added `:retries` option to attempt to grab a lock multiple times - [@afeld](https://github.com/afeld), [@mooremo](https://github.com/mooremo).
+* Added `:retry_sleep` to override duration between lock attempts - [@afeld](https://github.com/afeld).
+* Reload document after acquiring a lock by default, which can be disabled with `:reload => false` - [@afeld](https://github.com/afeld).
 
-## 0.2.1 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.2.0...v0.2.1?w=1))
+### 0.2.1
 
-* fix for `update()` on Mongoid 3
-* automatically reload model after waiting - #1
+* Fix for `update()` on Mongoid 3 - [@afeld](https://github.com/afeld).
+* [#1](https://github.com/mongoid/mongoid-locker/issues/1): Automatically reload model after waiting - [@afeld](https://github.com/afeld).
 
-## 0.2.0 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.1.1...v0.2.0?w=1))
+### 0.2.0
 
-* handle recursive calls to `#with_lock` - #7
-* lock optimizations, particularly for large documents
-* add Mongoid 3 support - #3
+* [#7](https://github.com/mongoid/mongoid-locker/issues/7): Handle recursive calls to `#with_lock` - [@afeld](https://github.com/afeld).
+* Lock optimizations, particularly for large documents - [@afeld](https://github.com/afeld).
+* [#5](https://github.com/mongoid/mongoid-locker/issues/5): Added Mongoid 3 support - [@afeld](https://github.com/afeld).
 
-## 0.1.1 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.1.0...v0.1.1?w=1))
+### 0.1.1
 
-* fix for subclasses - #5
+* [#5](https://github.com/mongoid/mongoid-locker/issues/5): Fix for subclasses - [@afeld](https://github.com/afeld).
 
-## 0.1.0
+### 0.1.0
 
-Initial release!
+* Initial public release - [@afeld](https://github.com/afeld).

data/CONTRIBUTING.md

@@ -1,18 +1,19 @@
 # Contributing
 
-Pull requests are welcome.  To set up:
+Pull requests are welcome. To set up:
 
     $ bundle install
 
 To run tests:
 
-    $ rake
+    $ bundle exec rake
 
-To run tests for Mongoid 3:
+To run tests for an older version of Mongoid:
 
     $ rm Gemfile.lock
-    $ MONGOID_VERSION=3 bundle install
-    $ MONGOID_VERSION=3 rake
+    $ export MONGOID_VERSION=4
+    $ bundle install
+    $ bundle exec rake
 
 To auto-run tests as you code:
 

data/Dangerfile

@@ -0,0 +1 @@
+danger.import_dangerfile(gem: "mongoid-danger")

data/Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 
 case ENV['MONGOID_VERSION']
+when /^6/
+  gem 'mongoid', '~> 6.0'
 when /^5/
   gem 'mongoid', '~> 5.0'
 when /^4/
@@ -14,18 +16,19 @@ else
   gem 'mongoid', '>= 2.8', '< 6.0'
 end
 
-gem 'mongoid-compatibility'
+gemspec
 
 group :development do
-  gem 'rspec', '~> 3.0'
   gem 'bundler', '~> 1.1'
-  gem 'jeweler', '~> 1.8'
-
   gem 'guard-rspec'
   gem 'rb-fsevent', '~> 0.9.1'
 end
 
 group :development, :test do
-  gem 'rake'
+  gem 'mongoid-compatibility'
+  gem 'rack', '~> 1.5'
+  gem 'rspec', '~> 3.0'
+  gem 'rake', '11.3.0'
   gem 'rubocop', '0.29.1'
+  gem 'mongoid-danger', '~> 0.1.1'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Aidan Feldman
+Copyright (c) 2012-2017 Aidan Feldman & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,18 +1,18 @@
-# mongoid-locker 
+# mongoid-locker
 [![Gem Version](https://badge.fury.io/rb/mongoid-locker.svg)](http://badge.fury.io/rb/mongoid-locker)
-[![Build Status](https://secure.travis-ci.org/afeld/mongoid-locker.svg?branch=master)](http://travis-ci.org/afeld/mongoid-locker) 
-[![Code Climate](https://codeclimate.com/github/afeld/mongoid-locker.svg)](https://codeclimate.com/github/afeld/mongoid-locker)
+[![Build Status](https://secure.travis-ci.org/mongoid/mongoid-locker.svg?branch=master)](http://travis-ci.org/mongoid/mongoid-locker)
+[![Code Climate](https://codeclimate.com/github/mongoid/mongoid-locker.svg)](https://codeclimate.com/github/mongoid/mongoid-locker)
 
 Document-level locking for MongoDB via Mongoid.  The need arose at [Jux](https://jux.com) from multiple processes on multiple servers trying to act upon the same document and stepping on each other's toes.  Mongoid-Locker is an easy way to ensure only one process can perform a certain operation on a document at a time.
 
-[Tested](http://travis-ci.org/afeld/mongoid-locker) against MRI 1.9.3, 2.0.0 and 2.1.2, Rubinius 2.x, and JRuby 1.9 with Mongoid 2, 3, 4 and 5 ([where supported](http://travis-ci.org/#!/afeld/mongoid-locker)).
+[Tested](http://travis-ci.org/mongoid/mongoid-locker) against MRI 2.3.1 with Mongoid 2, 3, 4, 5 and 6. See [.travis.yml](.travis.yml) for the latest test matrix.
 
 ## Usage
 
 Add to your `Gemfile`:
 
 ```ruby
-gem 'mongoid-locker', '~> 0.2'
+gem 'mongoid-locker'
 ```
 
 and run `bundle install`.  In the model you wish to lock, include `Mongoid::Locker` after `Mongoid::Document`.  For example:
@@ -38,7 +38,7 @@ queue_item.with_lock do
 end
 ```
 
-`#with_lock` takes an optional [handful of options around retrying](http://rdoc.info/github/afeld/mongoid-locker/Mongoid/Locker:with_lock), so make sure to take a look.
+`#with_lock` takes an optional [handful of options around retrying](http://rdoc.info/github/mongoid/mongoid-locker/Mongoid/Locker:with_lock), so make sure to take a look.
 
 The default timeout can also be set on a per-class basis:
 
@@ -51,4 +51,10 @@ end
 
 Note that these locks are only enforced when using `#with_lock`, not at the database level.  It is useful for transactional operations, where you can make atomic modification of the document with checks.  For exmple, you could deduct a purchase from a user's balance... _unless_ they are broke.
 
-More in-depth method documentation can be found at [rdoc.info](http://rdoc.info/github/afeld/mongoid-locker/frames).  Enjoy!
+More in-depth method documentation can be found at [rdoc.info](http://rdoc.info/github/mongoid/mongoid-locker/frames).  Enjoy!
+
+## Copyright & License
+
+Copyright (c) 2012-2017 Aidan Feldman & Contributors
+
+MIT License, see [LICENSE](LICENSE.txt) for more information.

data/Rakefile

@@ -2,23 +2,9 @@
 
 require 'rubygems'
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = 'mongoid-locker'
-  gem.homepage = 'http://github.com/afeld/mongoid-locker'
-  gem.license = 'MIT'
-  gem.summary = 'Document-level locking for MongoDB via Mongoid'
-  gem.description = 'Allows multiple processes to operate on individual documents in MongoDB while ensuring that only one can act at a time.'
-  gem.email = 'aidan.feldman@gmail.com'
-  gem.authors = ['Aidan Feldman']
-  gem.files.exclude 'demo'
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/demo/README.md

@@ -1,6 +1,6 @@
 To view slides:
 
-    git clone git@github.com:afeld/mongoid-locker.git
+    git clone git@github.com:mongoid/mongoid-locker.git
     cd mongoid-locker/demo
     gem install gli -v 1.6.0
     gem install showoff

data/demo/showoff.md

@@ -2,7 +2,7 @@
 
 # Mongoid-Locker
 
-[github.com/afeld/mongoid-locker](https://github.com/afeld/mongoid-locker)
+[github.com/mongoid/mongoid-locker](https://github.com/mongoid/mongoid-locker)
 
 ## Aidan Feldman, [Jux.com](https://jux.com)
 
@@ -59,7 +59,7 @@
     class User
       def purchase(amount)
         if amount > self.balance
-          raise "Can't have negative balance!" 
+          raise "Can't have negative balance!"
         else
           # deduct *atomically*
           self.inc(:balance, -1 * amount)
@@ -84,7 +84,7 @@
     class User
       def purchase(amount)
         if amount > self.balance
-          raise "Can't have negative balance!" 
+          raise "Can't have negative balance!"
         else
           # artificial delay
           print 'has enough money...waiting for ENTER > '
@@ -124,7 +124,7 @@
           # after the `wait`, will have updated `balance`
 
           if amount > self.balance
-            raise "Can't have negative balance!" 
+            raise "Can't have negative balance!"
           else
             print 'has enough money...waiting for ENTER > '
             gets
@@ -148,11 +148,11 @@
 
 # Fin.
 
-[afeld/mongoid-locker](https://github.com/afeld/mongoid-locker)
+[mongoid/mongoid-locker](https://github.com/mongoid/mongoid-locker)
 
 ----------------
 
-## Aidan Feldman, [Jux.com](https://jux.com)
+## Aidan Feldman
 
 [@aidanfeldman](https://twitter.com/aidanfeldman)
 

data/lib/mongoid/locker.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'locker', 'version'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'locker', 'wrapper'))
 
 module Mongoid
@@ -69,9 +70,9 @@ module Mongoid
     # @option opts [Boolean] :reload After acquiring the lock, reload the document - defaults to true
     # @return [void]
     def with_lock(opts = {})
-      have_lock = self.has_lock?
+      had_lock = self.has_lock?
 
-      unless have_lock
+      unless had_lock
         opts[:retries] = 1 if opts[:wait]
         lock(opts)
       end
@@ -79,7 +80,7 @@ module Mongoid
       begin
         yield
       ensure
-        unlock unless have_lock
+        unlock if locked? && !had_lock
       end
     end
 
@@ -161,8 +162,7 @@ module Mongoid
 
       )
 
-      self.locked_at = nil
-      self.locked_until = nil
+      self.attributes = { locked_at: nil, locked_until: nil } unless destroyed?
       @has_lock = false
     end
   end

data/lib/mongoid/locker/version.rb

@@ -0,0 +1,5 @@
+module Mongoid
+  module Locker
+    VERSION = '0.3.5'
+  end
+end

data/lib/mongoid/locker/wrapper.rb

@@ -1,6 +1,8 @@
 require 'mongoid/compatibility'
 
-if Mongoid::Compatibility::Version.mongoid5?
+if Mongoid::Compatibility::Version.mongoid6?
+  require 'mongoid/locker/wrapper6'
+elsif Mongoid::Compatibility::Version.mongoid5?
   require 'mongoid/locker/wrapper5'
 elsif Mongoid::Compatibility::Version.mongoid4?
   require 'mongoid/locker/wrapper4'

data/lib/mongoid/locker/wrapper6.rb

@@ -0,0 +1,29 @@
+module Mongoid
+  module Locker
+    # Normalizes queries between various Mongoid versions.
+    module Wrapper
+      # Update the document for the provided Class matching the provided query with the provided setter.
+      #
+      # @param [Class] The model class
+      # @param [Hash] The Mongoid query
+      # @param [Hash] The Mongoid setter
+      # @return [Boolean] true if the document was successfully updated, false otherwise
+      def self.update(klass, query, setter)
+        rc = klass.with(write: { w: 1 }) do
+          klass.collection.find(query).update_one(setter)
+        end
+        rc.ok? && rc.documents.first['n'] == 1
+      end
+
+      # Determine whether the provided document is locked in the database or not.
+      #
+      # @param [Class] The model instance
+      # @return [Time] The timestamp of when the document is locked until, nil if not locked.
+      def self.locked_until(doc)
+        existing_query = { _id: doc.id, locked_until: { '$exists' => true } }
+        existing = doc.class.where(existing_query).limit(1).only(:locked_until).first
+        existing ? existing.locked_until : nil
+      end
+    end
+  end
+end

data/mongoid-locker.gemspec

@@ -1,97 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: mongoid-locker 0.3.4 ruby lib
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mongoid/locker/version'
 
-Gem::Specification.new do |s|
-  s.name = "mongoid-locker"
-  s.version = "0.3.4"
+Gem::Specification.new do |spec|
+  spec.name = 'mongoid-locker'
+  spec.version = Mongoid::Locker::VERSION
+  spec.authors = ['Aidan Feldman']
+  spec.email = ['aidan.feldman@gmail.com']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Aidan Feldman"]
-  s.date = "2015-10-21"
-  s.description = "Allows multiple processes to operate on individual documents in MongoDB while ensuring that only one can act at a time."
-  s.email = "aidan.feldman@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rubocop.yml",
-    ".rubocop_todo.yml",
-    ".travis.yml",
-    "CHANGELOG.md",
-    "CONTRIBUTING.md",
-    "Gemfile",
-    "Guardfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "demo/README.md",
-    "demo/config/mongoid.yml",
-    "demo/instagram.graffle",
-    "demo/instagram.png",
-    "demo/showoff.css",
-    "demo/showoff.md",
-    "lib/mongoid-locker.rb",
-    "lib/mongoid/locker.rb",
-    "lib/mongoid/locker/wrapper.rb",
-    "lib/mongoid/locker/wrapper2.rb",
-    "lib/mongoid/locker/wrapper3.rb",
-    "lib/mongoid/locker/wrapper4.rb",
-    "lib/mongoid/locker/wrapper5.rb",
-    "mongoid-locker.gemspec",
-    "spec/database2.yml",
-    "spec/database3.yml",
-    "spec/database4.yml",
-    "spec/database5.yml",
-    "spec/mongoid-locker_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/afeld/mongoid-locker"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
-  s.summary = "Document-level locking for MongoDB via Mongoid"
+  spec.summary = 'Document-level locking for MongoDB via Mongoid.'
+  spec.description = 'Allows multiple processes to operate on individual documents in MongoDB while ensuring that only one can act at a time.'
+  spec.homepage = 'https://github.com/mongoid/mongoid-locker'
+  spec.license = 'MIT'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["< 6.0", ">= 2.8"])
-      s.add_runtime_dependency(%q<mongoid-compatibility>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, ["= 0.29.1"])
-    else
-      s.add_dependency(%q<mongoid>, ["< 6.0", ">= 2.8"])
-      s.add_dependency(%q<mongoid-compatibility>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rubocop>, ["= 0.29.1"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, ["< 6.0", ">= 2.8"])
-    s.add_dependency(%q<mongoid-compatibility>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rubocop>, ["= 0.29.1"])
-  end
+  spec.add_runtime_dependency 'mongoid', '>= 2.8'
+  spec.add_runtime_dependency 'mongoid-compatibility', '>= 0.4.1'
 end
-

metadata

@@ -1,169 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-locker
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: mongoid-compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   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: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  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: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !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: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.29.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.4.1
 description: Allows multiple processes to operate on individual documents in MongoDB
   while ensuring that only one can act at a time.
-email: aidan.feldman@gmail.com
+email:
+- aidan.feldman@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - demo/README.md
 - demo/config/mongoid.yml
 - demo/instagram.graffle
@@ -172,19 +68,15 @@ files:
 - demo/showoff.md
 - lib/mongoid-locker.rb
 - lib/mongoid/locker.rb
+- lib/mongoid/locker/version.rb
 - lib/mongoid/locker/wrapper.rb
 - lib/mongoid/locker/wrapper2.rb
 - lib/mongoid/locker/wrapper3.rb
 - lib/mongoid/locker/wrapper4.rb
 - lib/mongoid/locker/wrapper5.rb
+- lib/mongoid/locker/wrapper6.rb
 - mongoid-locker.gemspec
-- spec/database2.yml
-- spec/database3.yml
-- spec/database4.yml
-- spec/database5.yml
-- spec/mongoid-locker_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/afeld/mongoid-locker
+homepage: https://github.com/mongoid/mongoid-locker
 licenses:
 - MIT
 metadata: {}
@@ -194,18 +86,18 @@ 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.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Document-level locking for MongoDB via Mongoid
+summary: Document-level locking for MongoDB via Mongoid.
 test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.3.4

data/spec/database2.yml

@@ -1,4 +0,0 @@
-test:
-  # for Mongoid 2
-  host: localhost
-  database: mongoid_locker_test

data/spec/database3.yml

@@ -1,7 +0,0 @@
-test:
-  # for Mongoid 3
-  sessions:
-    default:
-      database: mongoid_locker_test
-      hosts:
-        - localhost:27017

data/spec/database4.yml

@@ -1,7 +0,0 @@
-test:
-  # for Mongoid 4
-  sessions:
-    default:
-      database: mongoid_locker_test
-      hosts:
-        - localhost:27017

data/spec/database5.yml

@@ -1,7 +0,0 @@
-test:
-  # for Mongoid 5
-  clients:
-    default:
-      database: mongoid_locker_test
-      hosts:
-        - localhost:27017

data/spec/mongoid-locker_spec.rb

@@ -1,312 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe Mongoid::Locker do
-  def remove_class(klass)
-    Object.send :remove_const, klass.to_s.to_sym
-  end
-
-  before do
-    # recreate the class for each spec
-    class User
-      include Mongoid::Document
-      include Mongoid::Locker
-
-      field :account_balance, type: Integer # easier to test than Float
-    end
-
-    @user = User.create! account_balance: 20
-  end
-
-  after do
-    User.delete_all
-    remove_class User
-  end
-
-  describe '#locked?' do
-    it "shouldn't be locked when created" do
-      expect(@user.locked?).to be false
-    end
-
-    it 'should be true when locked' do
-      @user.with_lock do
-        expect(@user.locked?).to be true
-      end
-    end
-
-    it 'should respect the expiration' do
-      User.timeout_lock_after 1
-
-      @user.with_lock do
-        sleep 2
-        expect(@user.locked?).to be false
-      end
-    end
-
-    it 'should be true for a different instance' do
-      @user.with_lock do
-        expect(User.first.locked?).to be true
-      end
-    end
-  end
-
-  describe '#has_lock?' do
-    it "shouldn't be has_lock when created" do
-      expect(@user.has_lock?).to be false
-    end
-
-    it 'should be true when has_lock' do
-      @user.with_lock do
-        expect(@user.has_lock?).to be true
-      end
-    end
-
-    it 'should respect the expiration' do
-      User.timeout_lock_after 1
-
-      @user.with_lock do
-        sleep 2
-        expect(@user.has_lock?).to be false
-      end
-    end
-
-    it 'should be false for a different instance' do
-      @user.with_lock do
-        expect(User.first.has_lock?).to be false
-      end
-    end
-  end
-
-  describe '#with_lock' do
-    it 'should lock and unlock the user' do
-      @user.with_lock do
-        expect(@user).to be_locked
-        expect(User.first).to be_locked
-      end
-
-      expect(@user).to_not be_locked
-      expect(@user.reload).to_not be_locked
-    end
-
-    it "shouldn't save the full document" do
-      @user.with_lock do
-        @user.account_balance = 10
-      end
-
-      expect(@user.account_balance).to eq(10)
-      expect(User.first.account_balance).to eq(20)
-    end
-
-    it 'should handle errors gracefully' do
-      expect {
-        @user.with_lock do
-          fail 'booyah!'
-        end
-      }.to raise_error 'booyah!'
-
-      expect(@user.reload).to_not be_locked
-    end
-
-    it 'should complain if trying to lock locked doc' do
-      @user.with_lock do
-        user_dup = User.first
-
-        expect {
-          user_dup.with_lock do
-            fail "shouldn't get the lock"
-          end
-        }.to raise_error(Mongoid::Locker::LockError)
-      end
-    end
-
-    it 'should handle recursive calls' do
-      @user.with_lock do
-        @user.with_lock do
-          @user.account_balance = 10
-        end
-      end
-
-      expect(@user.account_balance).to eq(10)
-    end
-
-    it 'should wait until the lock times out, if desired' do
-      User.timeout_lock_after 1
-
-      @user.with_lock do
-        user_dup = User.first
-
-        user_dup.with_lock wait: true do
-          user_dup.account_balance = 10
-          user_dup.save!
-        end
-      end
-
-      expect(@user.reload.account_balance).to eq(10)
-    end
-
-    it 'should, by default, reload the row after acquiring the lock' do
-      expect(@user).to receive(:reload)
-      @user.with_lock do
-        # no-op
-      end
-    end
-
-    it 'should allow override of the default reload behavior' do
-      expect(@user).to_not receive(:reload)
-      @user.with_lock reload: false do
-        # no-op
-      end
-    end
-
-    it 'should, by default, not retry' do
-      expect(@user).to receive(:acquire_lock).once.and_return(true)
-      @user.with_lock do
-        user_dup = User.first
-
-        user_dup.with_lock do
-          # no-op
-        end
-      end
-    end
-
-    it 'should retry the number of times given, if desired' do
-      allow(@user).to receive(:acquire_lock).and_return(false)
-      allow(Mongoid::Locker::Wrapper).to receive(:locked_until).and_return(Time.now)
-
-      expect(@user).to receive(:acquire_lock).exactly(6).times
-      expect {
-        @user.with_lock retries: 5 do
-          # no-op
-        end
-      }.to raise_error(Mongoid::Locker::LockError)
-    end
-
-    it 'does not fail if the lock has been released between check and sleep time calculation' do
-      allow(@user).to receive(:acquire_lock).and_return(false)
-      allow(Mongoid::Locker::Wrapper).to receive(:locked_until).and_return(nil)
-
-      expect(@user).to receive(:acquire_lock).exactly(2).times
-      expect {
-        @user.with_lock retries: 1 do
-          # no-op
-        end
-      }.to raise_error(Mongoid::Locker::LockError)
-    end
-
-    it 'should, by default, when retrying, sleep until the lock expires' do
-      allow(@user).to receive(:acquire_lock).and_return(false)
-      allow(Mongoid::Locker::Wrapper).to receive(:locked_until).and_return(Time.now + 5.seconds)
-      allow(@user).to receive(:sleep) { |time| expect(time).to be_within(0.1).of(5) }
-
-      expect {
-        @user.with_lock retries: 1 do
-          # no-op
-        end
-      }.to raise_error(Mongoid::Locker::LockError)
-    end
-
-    it 'should sleep for the time given, if desired' do
-      allow(@user).to receive(:acquire_lock).and_return(false)
-      allow(@user).to receive(:sleep) { |time| expect(time).to be_within(0.1).of(3) }
-
-      expect {
-        @user.with_lock(retries: 1, retry_sleep: 3) do
-          # no-op
-        end
-      }.to raise_error(Mongoid::Locker::LockError)
-    end
-
-    it 'should override the default timeout' do
-      User.timeout_lock_after 1
-
-      expiration = (Time.now + 3).to_i
-      @user.with_lock timeout: 3 do
-        expect(@user.locked_until.to_i).to eq(expiration)
-      end
-    end
-
-    it 'should reload the document if it needs to wait for a lock' do
-      User.timeout_lock_after 1
-
-      @user.with_lock do
-        user_dup = User.first
-
-        @user.account_balance = 10
-        @user.save!
-
-        expect(user_dup.account_balance).to eq(20)
-        user_dup.with_lock wait: true do
-          expect(user_dup.account_balance).to eq(10)
-        end
-      end
-    end
-
-    it 'should succeed for subclasses' do
-      class Admin < User
-      end
-
-      admin = Admin.create!
-
-      admin.with_lock do
-        expect(admin).to be_locked
-        expect(Admin.first).to be_locked
-      end
-
-      expect(admin).to_not be_locked
-      expect(admin.reload).to_not be_locked
-
-      remove_class Admin
-    end
-  end
-
-  describe '.timeout_lock_after' do
-    it 'should ignore the lock if it has timed out' do
-      User.timeout_lock_after 1
-
-      @user.with_lock do
-        user_dup = User.first
-        sleep 2
-
-        user_dup.with_lock do
-          user_dup.account_balance = 10
-          user_dup.save!
-        end
-      end
-
-      expect(@user.reload.account_balance).to eq(10)
-    end
-
-    it 'should be independent for different classes' do
-      class Account
-        include Mongoid::Document
-        include Mongoid::Locker
-      end
-
-      User.timeout_lock_after 1
-      Account.timeout_lock_after 2
-
-      expect(User.lock_timeout).to eq(1)
-
-      remove_class Account
-    end
-  end
-
-  describe '.locked' do
-    it 'should return the locked documents' do
-      User.create!
-
-      @user.with_lock do
-        expect(User.locked.to_a).to eq([@user])
-      end
-    end
-  end
-
-  describe '.unlocked' do
-    it 'should return the unlocked documents' do
-      user2 = User.create!
-
-      @user.with_lock do
-        expect(User.unlocked.to_a).to eq([user2])
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,31 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rspec'
-require 'mongoid-locker'
-require 'mongoid/compatibility'
-
-ENV['RACK_ENV'] = 'test'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-  version = Mongoid::VERSION.split('.')[0]
-  Mongoid.load! File.join(File.dirname(__FILE__), "database#{version}.yml")
-
-  config.raise_errors_for_deprecations!
-
-  # use to check the query conditions
-  if ENV['LOG']
-    Mongoid.logger.level = Logger::DEBUG
-    Moped.logger.level = Logger::DEBUG if defined? Moped
-  elsif Mongoid::Compatibility::Version.mongoid5?
-    Mongoid.logger.level = Logger::INFO
-    Mongo::Logger.logger.level = Logger::INFO
-  else
-    Mongoid.logger.level = Logger::INFO
-    Moped.logger.level = Logger::INFO if defined? Moped
-  end
-end