mongoid-locker 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cffd896e4b9edf28567f50b95a4fca968a63889
-  data.tar.gz: 705e4c702b50629be4785679f76f49166ce2b84b
+  metadata.gz: bf9bd7b5292b2c9ab352102fb652cc6751d4be64
+  data.tar.gz: 0a8eb450da8131e7808831787ae9135dae805e37
 SHA512:
-  metadata.gz: 839d56221e31ea70ff62502cb74d74fd4b904c61ce23ffc9923c5ca05897d213a33f1e494ac30ff18ab44bc1524adc7b184bf8394c65e8761df503c7fe44b7a6
-  data.tar.gz: a2638f06f54f87fe71b481a0d8cea49341e9ece00867a91c447efa2dcb1e577e6d6fefd2b6628a776c6b75ff4845f8e136dec2d092d40dcf6938182fff41e66a
+  metadata.gz: 593ddca343da2c1c107f2ef972eeaccd2c3303c1401fa5b04ed667f411ea53ca47ab6b1043e2545a6e478692f8620292f904fe606fd1f7f40c3f2c39b75b4360
+  data.tar.gz: fcf91faa35ebd2201a8c66debdc49e4a2cbb46c19711d14a8264a20aa778baf7ce915e5ac939d00bfeab6effc1f3df29decd7414b70599d4e6e463dc18c0b657

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/.rubocop_todo.yml

@@ -1,15 +1,15 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-03-12 10:43:25 -0400 using RuboCop version 0.29.1.
+# on 2015-09-25 09:10:09 -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: 1
+# Offense count: 2
 Metrics/AbcSize:
-  Max: 18
+  Max: 19
 
-# Offense count: 22
+# Offense count: 25
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 184
@@ -19,7 +19,7 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 25
 
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/Blocks:
   Enabled: false

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.1.2
+  - 2.2
   - jruby-19mode
   - rbx-2
 
@@ -12,5 +13,6 @@ env:
   - MONGOID_VERSION=2
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
+  - MONGOID_VERSION=5
 
 cache: bundler

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## HEAD ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.2...master?w=1))
+## 0.3.3 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.3...master?w=1))
 
-* your contribution here
+* support Mongoid 5 - #36
 
 ## 0.3.2 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.1...v0.3.2?w=1))
 

data/Gemfile

@@ -1,17 +1,21 @@
 source 'http://rubygems.org'
 
 case ENV['MONGOID_VERSION']
-when /4/
+when /^5/
+  gem 'mongoid', '~> 5.0'
+when /^4/
   gem 'mongoid', '~> 4.0'
-when /3/
+when /^3/
   gem 'mongoid', '~> 3.1'
-when /2/
+when /^2/
   gem 'bson_ext', platforms: :ruby
   gem 'mongoid', '~> 2.8'
 else
-  gem 'mongoid', '>= 2.8', '< 5.0'
+  gem 'mongoid', '>= 2.8', '< 6.0'
 end
 
+gem 'mongoid-compatibility'
+
 group :development do
   gem 'rspec', '~> 3.0'
   gem 'bundler', '~> 1.1'

data/README.md

@@ -1,8 +1,8 @@
-# mongoid-locker [![Build Status](https://secure.travis-ci.org/afeld/mongoid-locker.png?branch=master)](http://travis-ci.org/afeld/mongoid-locker) [![Code Climate](https://codeclimate.com/github/afeld/mongoid-locker.png)](https://codeclimate.com/github/afeld/mongoid-locker)
+# 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.
 
-[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 and 4 ([where supported](http://travis-ci.org/#!/afeld/mongoid-locker)).
+[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)).
 
 ## Usage
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/mongoid/locker/wrapper.rb

@@ -1,9 +1,9 @@
+require 'mongoid/compatibility'
+
 module Mongoid
   module Locker
     # Normalizes queries between Mongoid 2 and 3.
     module Wrapper
-      IS_OLD_MONGOID = Mongoid::VERSION.start_with? '2.'
-
       # Update the document for the provided Class matching the provided query with the provided setter.
       #
       # @param [Class] The model class
@@ -11,14 +11,13 @@ module Mongoid
       # @param [Hash] The Mongoid setter
       # @return [Boolean] true if the document was successfully updated, false otherwise
       def self.update(klass, query, setter)
-        error_obj =
-          if IS_OLD_MONGOID
-            klass.collection.update(query, setter, safe: true)
-          else
-            klass.with(safe: true).collection.find(query).update(setter)
-          end
-
-        error_obj['n'] == 1
+        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.
@@ -31,7 +30,7 @@ module Mongoid
           locked_until: { '$exists' => true }
         }
 
-        if IS_OLD_MONGOID
+        if Mongoid::Compatibility::Version.mongoid2?
           existing = doc.class.collection.find_one(existing_query, fields: { locked_until: 1 })
           existing ? existing['locked_until'] : nil
         else

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.2 ruby lib
+# stub: mongoid-locker 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mongoid-locker"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   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-04-29"
+  s.date = "2015-09-25"
   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 = [
@@ -45,19 +45,21 @@ Gem::Specification.new do |s|
     "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.6"
+  s.rubygems_version = "2.2.2"
   s.summary = "Document-level locking for MongoDB via Mongoid"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["< 5.0", ">= 2.8"])
+      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"])
@@ -66,7 +68,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rubocop>, ["= 0.29.1"])
     else
-      s.add_dependency(%q<mongoid>, ["< 5.0", ">= 2.8"])
+      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"])
@@ -76,7 +79,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rubocop>, ["= 0.29.1"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["< 5.0", ">= 2.8"])
+    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"])

data/spec/database5.yml

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

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 $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'
 
@@ -19,5 +21,11 @@ RSpec.configure do |config|
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-locker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
@@ -26,10 +26,24 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        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
@@ -163,6 +177,7 @@ files:
 - 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
@@ -185,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Document-level locking for MongoDB via Mongoid