mongoid-locker 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9bd7b5292b2c9ab352102fb652cc6751d4be64
-  data.tar.gz: 0a8eb450da8131e7808831787ae9135dae805e37
+  metadata.gz: 15bbaa6b9c117c44fb72c5db1b1c6ec6a9019044
+  data.tar.gz: e0e4680415861b7ce27cba6bd3884a2cee123f3f
 SHA512:
-  metadata.gz: 593ddca343da2c1c107f2ef972eeaccd2c3303c1401fa5b04ed667f411ea53ca47ab6b1043e2545a6e478692f8620292f904fe606fd1f7f40c3f2c39b75b4360
-  data.tar.gz: fcf91faa35ebd2201a8c66debdc49e4a2cbb46c19711d14a8264a20aa778baf7ce915e5ac939d00bfeab6effc1f3df29decd7414b70599d4e6e463dc18c0b657
+  metadata.gz: b6cf643433841b6efba4ac548ace833fa50b6d4984cbc90c620ec1a38f5338943a181c372499394923d9386b96d328e1a8236904c3c94df7452c55a94badce0b
+  data.tar.gz: 27537644279ea4c3fb4299fcd1430c4b3d9f017222f29550965b2fdedbb7d9052cef223386f5136ead1b03989b8083650191157d3081fe77afca55228531d312

data/.rubocop_todo.yml

@@ -1,20 +1,20 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-09-25 09:10:09 -0400 using RuboCop version 0.29.1.
+# on 2015-10-21 11:03:44 -0400 using RuboCop version 0.29.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 1
 Metrics/AbcSize:
-  Max: 19
+  Max: 18
 
-# Offense count: 25
+# Offense count: 37
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 184
 
-# Offense count: 4
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 25

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.4 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.4...master?w=1))
+
+* fixed write concern for the lock record with Mongoid 5
+* don't query the document in Mongoid 5, better performance when acquiring lock
+
 ## 0.3.3 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.3...master?w=1))
 
 * support Mongoid 5 - #36

data/README.md

@@ -1,4 +1,7 @@
-# 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)
+# 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)
 
 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.
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/mongoid/locker/wrapper.rb

@@ -1,43 +1,13 @@
 require 'mongoid/compatibility'
 
-module Mongoid
-  module Locker
-    # Normalizes queries between Mongoid 2 and 3.
-    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)
-        if Mongoid::Compatibility::Version.mongoid5?
-          !klass.with(safe: true).collection.find(query).find_one_and_update(setter).nil?
-        elsif Mongoid::Compatibility::Version.mongoid2?
-          klass.collection.update(query, setter, safe: true)['n'] == 1
-        else
-          klass.with(safe: true).collection.find(query).update(setter)['n'] == 1
-        end
-      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 }
-        }
-
-        if Mongoid::Compatibility::Version.mongoid2?
-          existing = doc.class.collection.find_one(existing_query, fields: { locked_until: 1 })
-          existing ? existing['locked_until'] : nil
-        else
-          existing = doc.class.where(existing_query).limit(1).only(:locked_until).first
-          existing ? existing.locked_until : nil
-        end
-      end
-    end
-  end
+if Mongoid::Compatibility::Version.mongoid5?
+  require 'mongoid/locker/wrapper5'
+elsif Mongoid::Compatibility::Version.mongoid4?
+  require 'mongoid/locker/wrapper4'
+elsif Mongoid::Compatibility::Version.mongoid3?
+  require 'mongoid/locker/wrapper3'
+elsif Mongoid::Compatibility::Version.mongoid2?
+  require 'mongoid/locker/wrapper2'
+else
+  fail 'incompatible Mongoid version'
 end

data/lib/mongoid/locker/wrapper2.rb

@@ -0,0 +1,26 @@
+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)
+        klass.collection.update(query, setter, safe: true)['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.collection.find_one(existing_query, fields: { locked_until: 1 })
+        existing ? existing['locked_until'] : nil
+      end
+    end
+  end
+end

data/lib/mongoid/locker/wrapper3.rb

@@ -0,0 +1,26 @@
+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)
+        klass.with(safe: true).collection.find(query).update(setter)['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/lib/mongoid/locker/wrapper4.rb

@@ -0,0 +1,22 @@
+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)
+        klass.with(safe: true).collection.find(query).update(setter)['n'] == 1
+      end
+
+      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/lib/mongoid/locker/wrapper5.rb

@@ -0,0 +1,27 @@
+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 }).collection.find(query).update_one(setter)
+        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

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mongoid-locker 0.3.3 ruby lib
+# stub: mongoid-locker 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mongoid-locker"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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-09-25"
+  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 = [
@@ -41,6 +41,10 @@ Gem::Specification.new do |s|
     "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",
@@ -51,7 +55,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/afeld/mongoid-locker"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Document-level locking for MongoDB via Mongoid"
 
   if s.respond_to? :specification_version then

data/spec/mongoid-locker_spec.rb

@@ -101,7 +101,7 @@ describe Mongoid::Locker do
         @user.with_lock do
           fail 'booyah!'
         end
-      }.to raise_error
+      }.to raise_error 'booyah!'
 
       expect(@user.reload).to_not be_locked
     end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-locker
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-21 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'
   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
@@ -151,11 +151,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
+- .document
+- .rspec
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -173,6 +173,10 @@ files:
 - 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
@@ -190,17 +194,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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Document-level locking for MongoDB via Mongoid