mongo-lock 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGRiNTY2ZDM1N2YyM2M3MjcwZGNmMTI3ZTVhM2YyMmM1MWNlNWI3Zg==
+    NjI3ZTJmYTQ0ODdmNTU3Nzc0ZDQ0OWJmZjAyYzRmYzFhY2U2YzJkNA==
   data.tar.gz: !binary |-
-    Y2VlMzFlMDU2MDljMGE3ZTI1NTQwZWE1NDU2OTJmMmMwYjUzOWRmZQ==
+    YjRhOGM3MDNlMGM1ZjYzN2RhZjc4NzdiY2E4ZmJlMzVhMDY5MDc2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDU5MmM1YTYxN2Y4ZDhjNDMxYmM5NjQzYjliMmZhN2YzZmIwODQ1NzkwMWVi
-    MmFlMGNhYmE1NTk2ZTI4NDY1M2ZlNWY1MjMxN2E5YjBhNTlmMzEwMWVmZDFk
-    ZTY3YTgyYWJhOWU3YmE3ODE4MmQ0ZjZjZTM2N2M1NTQ0ZTk0Mjc=
+    NTViMDE5MDI2MDhjOTFmOWJkNGM5ZGYzZjc1NjUxN2VkMjRiNTdlNTlmYTQy
+    NzgxYTg1NDk2ZWJkNGJiNzBkMzhjNWFmZTUzZjg4YTkxZDI5ZjVkZDcwZDUw
+    ZmY5ZjkyYzlhZDQ2OTRiNjlkM2M4Y2ZkMWYxNTIyOTM2ZDE2NTg=
   data.tar.gz: !binary |-
-    MTQzNWNiYTYxYWVkZDQ2MjNlZGEwNDYzMTQ2MzBkNTA3OTZkODZmNDczYzEx
-    YmViNzkyN2RlMzU0MDA4MDE5NGMzNzNlMzE2MWUzNTM2YjUyZTFhYTJmZDQ3
-    M2VjYjg0NDQwNWE4YzEyNTFhNzBkMWY4OWUzMDhjNTczOWQxODQ=
+    OGIwM2E1ZmRjZjQxZGUwOWZjMWNhYTU5MTRhNTk2MTAzZGY1ZmIxNjk4OGQ3
+    NDRjOWRlOGRjZTI1OWY5ZDcyMzNkYzAxMDI3NzVjYjU3YTQwMGUwOWYzNDAz
+    YWQxODEzZTIxYWY2NmQxNmI3OTlkZTY3ZTE2OWI4MTU5M2U0Nzk=

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -0,0 +1,7 @@
+script: bundle exec rspec
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+services: mongodb

data/Gemfile.lock

@@ -13,19 +13,32 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.14)
+    bson (1.9.2)
     coderay (1.1.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     diff-lcs (1.2.5)
+    docile (1.1.3)
     fuubar (1.3.2)
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.3)
     i18n (0.6.9)
     method_source (0.8.2)
+    mime-types (1.25.1)
     minitest (4.7.5)
+    mongo (1.9.2)
+      bson (~> 1.9.2)
     multi_json (1.8.4)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -35,9 +48,18 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.5)
     ruby-progressbar (1.4.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.7)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.18.1)
     thread_safe (0.1.3)
       atomic
+    tins (1.0.0)
     tzinfo (0.3.38)
 
 PLATFORMS
@@ -45,7 +67,9 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  coveralls
   fuubar
+  mongo
   mongo-lock!
   pry
   rspec

data/README.md

@@ -1,7 +1,12 @@
 Mongo::Lock
 ==========
 
+[![Gem Version](https://badge.fury.io/rb/mongo-lock.png)](http://badge.fury.io/rb/mongo-lock)
+[![Dependency Status](https://gemnasium.com/trakio/mongo-lock.png)](https://gemnasium.com/trakio/mongo-lock)
 [![Code Climate](https://codeclimate.com/github/trakio/mongo-lock.png)](https://codeclimate.com/github/trakio/mongo-lock)
+[![Build Status](https://travis-ci.org/trakio/mongo-lock.png?branch=master)](https://travis-ci.org/trakio/mongo-lock)
+[![Coverage Status](https://coveralls.io/repos/trakio/mongo-lock/badge.png)](https://coveralls.io/r/trakio/mongo-lock)
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/trakio/mongo-lock/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 Key based pessimistic locking for Ruby and MongoDB. Is this key avaliable? Yes - Lock it for me for a sec will you. No - OK I'll just wait here until its ready.
 
@@ -103,7 +108,7 @@ A lock will automatically be relinquished once its expiry has passed. Expired lo
 
 ```ruby
 Mongo::Lock.configure do |config|
-  config.expires_after = false # timeout_in in seconds for lock expiry; this defaults to 10.
+  config.expire_in = false # timeout_in in seconds for lock expiry; this defaults to 10.
 end
 ```
 
@@ -188,7 +193,7 @@ Mongo::Lock.new 'my_key', {
   timeout_in: 10, # timeout_in in seconds on acquisition; this defaults to false ie no time limit.
   limit: 10, # The limit on the number of acquisition attempts; this defaults to 100.
   frequency: 2, # Frequency in seconds for acquisition attempts ; this defaults to 1.
-  expires_after: 10,# timeout_in in seconds for lock expiry; this defaults to 10.
+  expire_in: 10,# timeout_in in seconds for lock expiry; this defaults to 10.
 }
 ```
 
@@ -202,7 +207,7 @@ Mongo::Lock.new 'my_key' do |lock|
 end
 ```
 
-You can also call Mongo::Lock#extend and it will extend by the lock's expires_after option.
+You can also call Mongo::Lock#extend and it will extend by the lock's expire_in option.
 
 ```ruby
 Mongo::Lock.new 'my_key' do |lock|
@@ -213,7 +218,7 @@ end
 ### Check you still hold a lock
 
 ```ruby
-Mongo::Lock.acquire 'my_key', expires_after: 10 do |lock|
+Mongo::Lock.acquire 'my_key', expire_in: 10 do |lock|
   sleep 9
   lock.expired? # False
   sleep 11

data/lib/mongo-lock.rb

@@ -1,8 +1,12 @@
 require 'mongo-lock/configuration'
+require 'mongo-lock/queries'
+require 'mongo-lock/class_convenience_methods'
 
 module Mongo
   class Lock
 
+    extend Mongo::Lock::ClassConvenienceMethods
+
     class NotAcquiredError < StandardError ; end
     class NotReleasedError < StandardError ; end
     class NotExtendedError < StandardError ; end
@@ -12,13 +16,14 @@ module Mongo
     attr_accessor :acquired
     attr_accessor :expires_at
     attr_accessor :released
+    attr_accessor :query
 
     def self.configure options = {}, &block
       defaults = {
-        timeout_in: 10,
+        timeout_in: false,
         limit: 100,
         frequency: 1,
-        expires_after: 10,
+        expire_in: 10,
         raise: false,
         owner: Proc.new { "#{`hostname`.strip}:#{Process.pid}:#{Thread.object_id}" }
       }
@@ -34,124 +39,87 @@ module Mongo
       end
     end
 
+
     def self.release_all options = {}
       if options.include? :collection
-        release_collection configuration.collection(options[:collection]), options[:owner]
+        Mongo::Lock::Queries.release_collection configuration.collection(options[:collection]), options[:owner]
       else
         configuration.collections.each_pair do |key,collection|
-          release_collection collection, options[:owner]
+          Mongo::Lock::Queries.release_collection collection, options[:owner]
         end
       end
     end
 
-    def self.release_collection collection, owner=nil
-      selector = if owner then { owner: owner } else {} end
-      collection.remove(selector)
-    end
-
-    def self.init_and_send key, options = {}, method
-      lock = self.new(key, options)
-      lock.send(method)
-      lock
-    end
-
-    def self.acquire key, options = {}
-      init_and_send key, options, :acquire
-    end
-
-    def self.release key, options = {}
-      init_and_send key, options, :release
-    end
-
-    def self.acquire! key, options = {}
-      init_and_send key, options, :acquire!
-    end
-
-    def self.release! key, options = {}
-      init_and_send key, options, :release!
-    end
-
-    def self.available? key, options = {}
-      init_and_send key, options, :available?
-    end
-
     def self.ensure_indexes
       configuration.collections.each_pair do |key, collection|
-        collection.create_index([
-          ['key', Mongo::ASCENDING],
-          ['owner', Mongo::ASCENDING],
-          ['expires_at', Mongo::ASCENDING]
-        ])
-        collection.create_index([['ttl', Mongo::ASCENDING]],{ expireAfterSeconds: 0 })
+        Mongo::Lock::Queries.ensure_indexes collection
       end
     end
 
     def self.clear_expired
       configuration.collections.each_pair do |key,collection|
-        collection.remove expires_at: { '$lt' => Time.now }
+        Mongo::Lock::Queries.clear_expired collection
       end
     end
 
+
     def initialize key, options = {}
       self.configuration = Configuration.new self.class.configuration.to_hash, options
       self.key = key
+      self.query = Mongo::Lock::Queries.new self
       acquire_if_acquired
     end
 
+    # API
+
     def configure options = {}, &block
       self.configuration = Configuration.new self.configuration.to_hash, options
       yield self.configuration if block_given?
     end
 
     def acquire options = {}
-      options = configuration.to_hash.merge options
+      options = inherit_options options
       i = 1
       time_spent = 0
 
       loop do
-        # If timeout has expired
-        if options[:timeout_in] && options[:timeout_in] < time_spent
-          return raise_or_false options
+        result = try_acquire options, i, time_spent
+        return result unless result.nil?
 
-        # If limit has expired
-        elsif options[:limit] && options[:limit] < i
-          return raise_or_false options
+        frequency = call_if_proc options[:frequency], i
+        sleep frequency
+        time_spent += frequency
+        i += 1
+      end
+    end
 
-        # If there is an existing lock
-        elsif existing_lock = find_or_insert(options)
+    def try_acquire options, i, time_spent
+      # If timeout has expired
+      if options[:timeout_in] && options[:timeout_in] < time_spent
+        return raise_or_false options
 
-          # If the lock is owned by me
-          if existing_lock['owner'] == options[:owner]
-            self.acquired = true
-            extend_by options[:expires_after]
-            return true
-          end
+      # If limit has expired
+      elsif options[:limit] && options[:limit] < i
+        return raise_or_false options
 
-        # If the lock was acquired
-        else
+      # If there is an existing lock
+      elsif existing_lock = query.find_or_insert(options)
+        # If the lock is owned by me
+        if existing_lock['owner'] == options[:owner]
           self.acquired = true
+          extend_by options[:expire_in]
           return true
-
         end
 
-        if options[:frequency].is_a? Proc
-          frequency = options[:frequency].call(i)
-        else
-          frequency = options[:frequency]
-        end
-        sleep frequency
-        time_spent += frequency
-        i += 1
+      # If the lock was acquired
+      else
+        self.acquired = true
+        return true
       end
     end
 
-    def acquire! options = {}
-      options[:raise] = true
-      acquire options
-    end
-
     def release options = {}
-      options = configuration.to_hash.merge options
+      options = inherit_options options
 
       # If the lock has already been released
       if released?
@@ -174,47 +142,13 @@ module Mongo
       else
         self.released = true
         self.acquired = false
-        collection.remove key: key, owner: options[:owner]
+        query.remove options
         return true
       end
     end
 
-    def release! options = {}
-      options[:raise] = true
-      release options
-    end
-
-    def raise_or_false options, error = NotAcquiredError
-      raise error if options[:raise]
-      false
-    end
-
-    def find_or_insert options
-      to_expire_at = Time.now + options[:expires_after]
-      existing_lock = collection.find_and_modify({
-        query: query,
-        update: {
-          '$setOnInsert' => {
-            key: key,
-            owner: options[:owner],
-            expires_at: to_expire_at,
-            ttl: to_expire_at
-          }
-        },
-        upsert: true
-      })
-
-      if existing_lock
-        self.expires_at = existing_lock['expires_at']
-      else
-        self.expires_at = to_expire_at
-      end
-
-      existing_lock
-    end
-
     def extend_by time, options = {}
-      options = configuration.to_hash.merge options
+      options = inherit_options options
 
       # Can't extend a lock that hasn't been acquired
       if !acquired?
@@ -225,51 +159,42 @@ module Mongo
         return raise_or_false options, NotExtendedError
 
       else
-        to_expire_at = expires_at + time
-        existing_lock = collection.find_and_modify({
-          query: query,
-          update: {
-            '$set' => {
-              key: key,
-              owner: options[:owner],
-              expires_at: to_expire_at,
-              ttl: to_expire_at
-            }
-          },
-          upsert: true
-        })
+        query.find_and_update time, options
         true
       end
     end
 
     def extend options = {}
-      time = configuration.to_hash.merge(options)[:expires_after]
+      time = configuration.to_hash.merge(options)[:expire_in]
       extend_by time, options
     end
 
-    def extend_by! time, options = {}
-      options[:raise] = true
-      extend_by time, options
+    def available? options = {}
+      options = inherit_options options
+      existing_lock = query.find_existing
+      !existing_lock || existing_lock['owner'] == options[:owner]
     end
 
-    def extend! options = {}
-      options[:raise] = true
-      extend options
+    # Raise methods
+
+    def acquire! options = {}
+      send_with_raise :acquire, options
     end
 
-    def available? options = {}
-      options = configuration.to_hash.merge options
-      existing_lock = collection.find(query).first
-      !existing_lock || existing_lock['owner'] == options[:owner]
+    def release! options = {}
+      send_with_raise :release, options
     end
 
-    def query
-      {
-        key: key,
-        expires_at: { '$gt' => Time.now }
-      }
+    def extend_by! time, options = {}
+      send_with_raise :extend_by, time, options
     end
 
+    def extend! options = {}
+      send_with_raise :extend, options
+    end
+
+    # Current state
+
     def acquired?
       !!acquired && !expired?
     end
@@ -282,13 +207,31 @@ module Mongo
       !!released
     end
 
+    # Utils
+
     def acquire_if_acquired
-      if (collection.find({
-          key: key,
-          owner: configuration.owner,
-          expires_at: { '$gt' => Time.now }
-        }).count > 0)
-        self.acquired = true
+      self.acquired = true if query.is_acquired?
+    end
+
+    def send_with_raise method, *args
+      args.last[:raise] = true
+      self.send(method, *args)
+    end
+
+    def raise_or_false options, error = NotAcquiredError
+      raise error if options[:raise]
+      false
+    end
+
+    def inherit_options options
+      configuration.to_hash.merge options
+    end
+
+    def call_if_proc proc, *args
+      if proc.is_a? Proc
+        proc.call(*args)
+      else
+        proc
       end
     end
 

data/lib/mongo-lock/class_convenience_methods.rb

@@ -0,0 +1,33 @@
+module Mongo
+  class Lock
+    module ClassConvenienceMethods
+
+      def init_and_send key, options = {}, method
+        lock = Mongo::Lock.new(key, options)
+        lock.send(method)
+        lock
+      end
+
+      def acquire key, options = {}
+        init_and_send key, options, :acquire
+      end
+
+      def release key, options = {}
+        init_and_send key, options, :release
+      end
+
+      def acquire! key, options = {}
+        init_and_send key, options, :acquire!
+      end
+
+      def release! key, options = {}
+        init_and_send key, options, :release!
+      end
+
+      def available? key, options = {}
+        init_and_send key, options, :available?
+      end
+
+    end
+  end
+end

data/lib/mongo-lock/configuration.rb

@@ -6,7 +6,7 @@ module Mongo
       attr_accessor :limit
       attr_accessor :timeout_in
       attr_accessor :frequency
-      attr_accessor :expires_after
+      attr_accessor :expire_in
       attr_accessor :owner
       attr_accessor :raise
 
@@ -53,7 +53,7 @@ module Mongo
           timeout_in: timeout_in,
           limit: limit,
           frequency: frequency,
-          expires_after: expires_after,
+          expire_in: expire_in,
           owner: owner,
           raise: raise
         }

data/lib/mongo-lock/queries.rb

@@ -0,0 +1,97 @@
+module Mongo
+  class Lock
+    class Queries
+
+      attr_accessor :lock
+
+      def self.release_collection collection, owner=nil
+        selector = if owner then { owner: owner } else {} end
+        collection.remove(selector)
+      end
+
+      def self.ensure_indexes collection
+        collection.create_index([
+          ['key', Mongo::ASCENDING],
+          ['owner', Mongo::ASCENDING],
+          ['expires_at', Mongo::ASCENDING]
+        ])
+        collection.create_index([['ttl', Mongo::ASCENDING]],{ expireAfterSeconds: 0 })
+      end
+
+      def self.clear_expired collection
+        collection.remove expires_at: { '$lt' => Time.now }
+      end
+
+      def initialize lock
+        self.lock = lock
+      end
+
+      def key
+        lock.key
+      end
+
+      def query
+        {
+          key: key,
+          expires_at: { '$gt' => Time.now }
+        }
+      end
+
+      def find_or_insert options
+        options[:expire_at] = Time.now + options[:expire_in]
+        options[:insert] = true
+        find_and_modify options
+      end
+
+      def find_and_update time, options
+        options[:expire_at] = lock.expires_at + time
+        find_and_modify options
+      end
+
+      def find_and_modify options
+        operation = options[:insert] ? '$setOnInsert' : '$set'
+        existing_lock = collection.find_and_modify({
+          query: query,
+          update: {
+            operation => {
+              key: key,
+              owner: options[:owner],
+              expires_at: options[:expire_at],
+              ttl: options[:expire_at]
+            }
+          },
+          upsert: !!options[:insert]
+        })
+
+        if existing_lock
+          lock.expires_at = existing_lock['expires_at']
+        else
+          lock.expires_at = options[:expire_at]
+        end
+
+        existing_lock
+      end
+
+      def remove options
+        collection.remove key: key, owner: options[:owner]
+      end
+
+      def is_acquired?
+        find_already_acquired.count > 0
+      end
+
+      def find_already_acquired
+        collection.find({
+          key: key,
+          owner: lock.configuration.owner,
+          expires_at: { '$gt' => Time.now }
+        })
+      end
+
+      def find_existing
+        collection.find(query).first
+      end
+
+    end
+  end
+end

data/lib/mongo-lock/version.rb

@@ -1,5 +1,5 @@
 module Mongo
   class Lock
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/mongo-lock.gemspec

@@ -23,8 +23,10 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md', 'LICENSE']
 
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'mongo'
   spec.add_development_dependency 'fuubar'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'coveralls'
 
 end

data/spec/acquire_spec.rb

@@ -52,7 +52,7 @@ describe Mongo::Lock do
       let(:lock) { Mongo::Lock.new 'my_lock' }
 
       it "should call the Proc with the attempt number" do
-        collection.insert key: 'my_lock', owner: 'tobie', expires_at: 0.04.seconds.from_now
+        collection.insert key: 'my_lock', owner: 'tobie', expires_at: 10.seconds.from_now
         proc = Proc.new{ |x| x }
         expect(proc).to receive(:call).with(1).and_return(0.01)
         expect(proc).to receive(:call).with(2).and_return(0.01)
@@ -124,7 +124,7 @@ describe Mongo::Lock do
 
       context "and acquisition timeout_in occurs" do
 
-        let(:lock) { Mongo::Lock.new 'my_lock', owner: 'tobie', timeout_in: 0.4, frequency: 0.01, raise: true }
+        let(:lock) { Mongo::Lock.new 'my_lock', owner: 'tobie', timeout_in: 0.4, limit: 3, frequency: 0.01, raise: true }
 
         it "should raise Mongo::Lock::NotAcquiredError" do
           collection.insert key: 'my_lock', owner: 'spence', expires_at: 0.2.seconds.from_now

data/spec/acquired_spec.rb

@@ -28,9 +28,9 @@ describe Mongo::Lock do
     context "when the lock was acquired but has since expired" do
 
       it "returns false" do
-        collection.insert key: 'my_lock', owner: 'spence', expires_at: 0.01.seconds.from_now
+        collection.insert key: 'my_lock', owner: 'spence', expires_at: 0.1.seconds.from_now
         lock.acquire
-        sleep 0.02
+        sleep 0.2
         expect(lock.acquired?).to be_false
       end
 

data/spec/configuration_spec.rb

@@ -188,20 +188,20 @@ describe Mongo::Lock::Configuration do
 
   end
 
-  describe "#expires_after=" do
+  describe "#expire_in=" do
 
-    it "should set the expires_after value" do
-      subject.expires_after = 9
-      expect(subject.instance_variable_get('@expires_after')).to be 9
+    it "should set the expire_in value" do
+      subject.expire_in = 9
+      expect(subject.instance_variable_get('@expire_in')).to be 9
     end
 
   end
 
-  describe "#expires_after" do
+  describe "#expire_in" do
 
-    it "should return the expires_after value" do
-      subject.instance_variable_set('@expires_after', 1)
-      expect(subject.expires_after).to be 1
+    it "should return the expire_in value" do
+      subject.instance_variable_set('@expire_in', 1)
+      expect(subject.expire_in).to be 1
     end
 
   end

data/spec/configure_spec.rb

@@ -37,15 +37,15 @@ describe Mongo::Lock do
       end
 
       it "sets default timeout_in" do
-        expect(Mongo::Lock.configuration.timeout_in).to be 10
+        expect(Mongo::Lock.configuration.timeout_in).to be false
       end
 
       it "sets default frequency" do
         expect(Mongo::Lock.configuration.frequency).to be 1
       end
 
-      it "sets default expires_after" do
-        expect(Mongo::Lock.configuration.expires_after).to be 10
+      it "sets default expire_in" do
+        expect(Mongo::Lock.configuration.expire_in).to be 10
       end
 
       it "sets default owner" do

data/spec/expired_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::Lock do
     context "when the lock has expired" do
 
       it "returns true" do
-        lock.acquire expires_after: 0.01
+        lock.acquire expire_in: 0.01
         sleep 0.02
         expect(lock.expired?).to be_true
       end
@@ -28,8 +28,7 @@ describe Mongo::Lock do
     context "when the lock hasn't expired" do
 
       it "returns false" do
-        lock.acquire expires_after: 0.02
-        sleep 0.01
+        lock.acquire expire_in: 0.1
         expect(lock.expired?).to be_false
       end
 

data/spec/extend_by_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongo::Lock do
 
-  let(:lock) { Mongo::Lock.new 'my_lock', owner: 'spence', timeout_in: 0.01, frequency: 0.01, expires_after: 0.01 }
+  let(:lock) { Mongo::Lock.new 'my_lock', owner: 'spence', timeout_in: 0.01, frequency: 0.01, expire_in: 0.1 }
 
   describe '#extend_by' do
 
@@ -25,7 +25,7 @@ describe Mongo::Lock do
 
       it "returns false" do
         lock.acquire
-        sleep 0.02
+        sleep 0.11
         expect(lock.extend_by 10).to be_false
       end
 
@@ -52,7 +52,7 @@ describe Mongo::Lock do
 
     context "when the raise option is set to true" do
 
-      let(:lock) { Mongo::Lock.new 'my_lock', owner: 'spence', timeout_in: 0.01, frequency: 0.01, expires_after: 0.01, raise: true }
+      let(:lock) { Mongo::Lock.new 'my_lock', owner: 'spence', timeout_in: 0.01, frequency: 0.01, expire_in: 0.01, raise: true }
 
       context "and the lock has expired" do
 
@@ -100,13 +100,13 @@ describe Mongo::Lock do
 
   describe '#extend' do
 
-    it "calls #extend_by with the default expires_after config setting" do
-      expect(lock).to receive(:extend_by).with(lock.configuration.expires_after, {})
+    it "calls #extend_by with the default expire_in config setting" do
+      expect(lock).to receive(:extend_by).with(lock.configuration.expire_in, {})
       lock.extend
     end
 
     it "also passes options on" do
-      expect(lock).to receive(:extend_by).with(lock.configuration.expires_after, { raise: true })
+      expect(lock).to receive(:extend_by).with(lock.configuration.expire_in, { raise: true })
       lock.extend raise: true
     end
 
@@ -124,7 +124,7 @@ describe Mongo::Lock do
   describe '#extend!' do
 
     it "calls .extend with raise errors option set to true" do
-      expect(lock).to receive(:extend_by).with(lock.configuration.expires_after, { raise: true })
+      expect(lock).to receive(:extend_by).with(lock.configuration.expire_in, { raise: true })
       lock.extend!
     end
 

data/spec/release_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongo::Lock do
 
-  let(:lock) { Mongo::Lock.acquire('my_lock', owner: 'spence', expires_after: 0.1.seconds, timeout_in: 0.01, frequency: 0.01) }
+  let(:lock) { Mongo::Lock.acquire('my_lock', owner: 'spence', expire_in: 0.1.seconds, timeout_in: 0.01, frequency: 0.01) }
 
   describe '.release' do
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'coveralls'
+Coveralls.wear!
 require 'mongo-lock'
 require 'mongo'
 require 'active_support/core_ext/numeric/time'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo-lock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Spence
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  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: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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'
 description: Key based pessimistic locking for Ruby and MongoDB. Is this key avaliable?
   Yes - Lock it for me for a sec will you. No - OK I'll just wait here until its ready.
 email: msaspence@gmail.com
@@ -75,14 +103,17 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .coveralls.yml
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - lib/mongo-lock.rb
+- lib/mongo-lock/class_convenience_methods.rb
 - lib/mongo-lock/configuration.rb
+- lib/mongo-lock/queries.rb
 - lib/mongo-lock/version.rb
 - mongo-lock.gemspec
 - mongoid.yml

data/Rakefile

@@ -1,8 +0,0 @@
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
-
-desc "Run tests"
-task :default => :test