mongoid-locker 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80f5cc223862e305b57a190f0713f9b40d98aa2
-  data.tar.gz: 5e7b035e9de4e47acb180f8737aad225fef38170
+  metadata.gz: db96ccf9519cc4ef2df88bf968cfc40acd6d2ff7
+  data.tar.gz: 37d88ea39dbaec86ffe1be4ded07ad3fe1b47ac3
 SHA512:
-  metadata.gz: 21b22b0c0e1902582d62565efa1ab8d38571960ab915756de31bd2ff9f021c5cab4e9e5bd49bffee967d392a0ef457e572c0a398db88560155124d9df29ffc62
-  data.tar.gz: 582144c90fde1230f723f610f76153ffd475c1005fc5162891c88cd1ed38651e45f42432679a8b46b4682b9c08fe82f950a606128fadd03e7666efb51b4f03f0
+  metadata.gz: 8d3074ad2fcef9295c961924fde5d688bbede292f95fe3c0cc81ea155ab7f66659ab6ae13f080d4d4f6497b7dd528848b93ea6522be36cdd4cf6d4d7d2a0e757
+  data.tar.gz: 63bce2ad2b457225073b839744fbb6667f3e387f313d3a06095f35f4d9b0a4006328ac7b5c195c7a6869c6eb9041357050aff28a6baa6d5e86a8b8f410d91131

data/.rubocop.yml

@@ -1,38 +1,7 @@
 AllCops:
-  Excludes:
-    - vendor/**
-    - bin/**
+  Exclude:
+    - vendor/**/*
+    - bin/**/*
     - mongoid-locker.gemspec
 
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-Documentation:
-  Enabled: false
-
-Encoding:
-  Enabled: false
-
-Blocks:
-  Enabled: false
-
-FileName:
-  Enabled: false
-
-RaiseArgs:
-  Enabled: false
-
-PredicateName:
-  Enabled: false
-
-DoubleNegation:
-  Enabled: false
-
-TrivialAccessors:
-  Enabled: false
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,58 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-03-12 10:43:25 -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
+Metrics/AbcSize:
+  Max: 18
+
+# Offense count: 22
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 184
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 25
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/Blocks:
+  Enabled: false
+
+# Offense count: 3
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 2
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+Style/PredicateName:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: SupportedStyles.
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+# Offense count: 2
+Style/RegexpLiteral:
+  MaxSlashes: 0
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.
+Style/TrivialAccessors:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.1 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.3.0...v0.3.1?w=1))
+
+* fixed race condition, `undefined method '-' for nil:NilClass` - #18
+
 ## 0.3.0 ([diff](https://github.com/afeld/mongoid-locker/compare/v0.2.1...v0.3.0?w=1))
 
 * change exception class to be `Mongoid::Locker::LockError` - #8

data/Gemfile

@@ -6,8 +6,8 @@ when /4/
 when /3/
   gem 'mongoid', '~> 3.1'
 when /2/
-  gem 'bson_ext', :platforms => :ruby
-  gem 'mongoid', '~> 2.4'
+  gem 'bson_ext', platforms: :ruby
+  gem 'mongoid', '~> 2.8'
 else
   gem 'mongoid', version
 end
@@ -23,5 +23,5 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'rubocop', '0.24.0'
+  gem 'rubocop', '0.29.1'
 end

data/Guardfile

@@ -3,8 +3,8 @@
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
 
-  watch('Gemfile')              { "spec" }
-  watch('Gemfile.lock')         { "spec" }
-  watch(%r{^lib/(.+)\.rb$})     { "spec" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('Gemfile')              { 'spec' }
+  watch('Gemfile.lock')         { 'spec' }
+  watch(%r{^lib/(.+)\.rb$})     { 'spec' }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/mongoid/locker.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @return [Mongoid::Criteria]
       def unlocked
-        any_of({ locked_until: nil }, { :locked_until.lte => Time.now })
+        any_of({ locked_until: nil }, :locked_until.lte => Time.now)
       end
 
       # Set the default lock timeout for this class.  Note this only applies to new locks.  Defaults to five seconds.
@@ -136,6 +136,8 @@ module Mongoid
           # if not passed a retry_sleep value, we sleep for the remaining life of the lock
           unless opts[:retry_sleep]
             locked_until = Mongoid::Locker::Wrapper.locked_until(self)
+            # the lock might be released since the last check so make another attempt
+            next unless locked_until
             retry_sleep = locked_until - Time.now
           end
 

data/mongoid-locker.gemspec

@@ -2,15 +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.0 ruby lib
+# stub: mongoid-locker 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mongoid-locker"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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 = "2014-07-01"
+  s.date = "2015-03-16"
   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 = [
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     ".rubocop.yml",
+    ".rubocop_todo.yml",
     ".travis.yml",
     "CHANGELOG.md",
     "CONTRIBUTING.md",
@@ -48,8 +50,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/afeld/mongoid-locker"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "Document-level locking for MongoDB via Mongoid"
 
   if s.respond_to? :specification_version then
@@ -63,7 +64,7 @@ Gem::Specification.new do |s|
       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.24.0"])
+      s.add_development_dependency(%q<rubocop>, ["= 0.29.1"])
     else
       s.add_dependency(%q<mongoid>, ["~> 4.0"])
       s.add_dependency(%q<rspec>, ["~> 3.0"])
@@ -72,7 +73,7 @@ Gem::Specification.new do |s|
       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.24.0"])
+      s.add_dependency(%q<rubocop>, ["= 0.29.1"])
     end
   else
     s.add_dependency(%q<mongoid>, ["~> 4.0"])
@@ -82,7 +83,7 @@ Gem::Specification.new do |s|
     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.24.0"])
+    s.add_dependency(%q<rubocop>, ["= 0.29.1"])
   end
 end
 

data/spec/mongoid-locker_spec.rb

@@ -180,6 +180,18 @@ describe Mongoid::Locker do
       }.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)

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-locker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.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
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.29.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
@@ -131,10 +131,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -168,17 +169,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: Document-level locking for MongoDB via Mongoid