with_advisory_lock 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb99a0ddec77a51eeb59a41a26411a25390c65b
-  data.tar.gz: 3ee6f67835cbd6f3fe515f41b8134478ef2102ce
+  metadata.gz: d83c8384aa5b5b063851f1bcef61584c552c6845
+  data.tar.gz: 2ff00f6afba93642d8d2bcb0c6ae639dec2ff913
 SHA512:
-  metadata.gz: 58919a4b30f793b056f8c9f2af7f06f40673f5e9e6ef68213760f49b348f9044087ab16a1b398619e7c47bcba14db7eecadaf50a6f5652bfa5e36bb0ef1d9fc7
-  data.tar.gz: a819c9b4d0c2607505b90f9dbb8f981c041c3608ae69a63e7dac621d105479be268b5d425f1ec946c225b36175d595ed2115782a9a239cd3ad671c6e3b25d665
+  metadata.gz: 2b1529ea567b8f99008590582827e0b7b4a5c03af8fa779253f68c40aac1c9eaaa0cea4537f1007027c3148422af3ca59579416443443328aa27775560deda22
+  data.tar.gz: 06f6b2a54dc18806663041c0954a5d222ed533023e8e01a5c61a21e078836cc9e4fd00a822b35f825da1e144cdedeaf8ee396e2224ff83db413ae792288ad83a

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.history
 *.idea
 .bundle
 .config

data/.travis.yml

@@ -1,21 +1,21 @@
 language: ruby
 
 rvm:
-  - jruby-19mode
-  - 2.1.2
-  - 1.9.3
-# TODO  - rbx-2
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
 
 gemfile:
-  - gemfiles/activerecord_3.2.gemfile
-  - gemfiles/activerecord_4.0.gemfile
-  - gemfiles/activerecord_4.1.gemfile
-  - gemfiles/activerecord_edge.gemfile
+  - gemfiles/activerecord_5.0.gemfile
+  - gemfiles/activerecord_4.2.gemfile
 
 env:
-  - DB=sqlite
-  - DB=mysql
   - DB=postgresql
+  - DB=mysql
+  - DB=sqlite
+
+before_install:
+  - gem install bundler
 
 script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace
 

data/Appraisals

@@ -1,16 +1,7 @@
-appraise "activerecord-3.2" do
-  gem 'activerecord', '~> 3.2.0'
+appraise "activerecord-4.2" do
+  gem "activerecord", "~> 4.2.0"
 end
 
-appraise "activerecord-4.0" do
-  gem "activerecord", "~> 4.0.0"
-end
-
-appraise "activerecord-4.1" do
-  gem "activerecord", "~> 4.1.0"
-end
-
-appraise "activerecord-edge" do
-  gem "activerecord", github: "rails/rails"
-  gem 'arel', github: 'rails/arel'
+appraise "activerecord-5.0" do
+  gem "activerecord", "~> 5.0.0"
 end

data/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :ruby do
-  gem 'mysql2'
-  gem 'pg'
+  gem 'mysql2', '~> 0.3.10' # Rails 3.2 requires 0.3.x
+  gem 'pg', '< 0.19' # 0.19 requires Ruby 2.0+
   gem 'sqlite3'
 end
 

data/README.md

@@ -1,6 +1,6 @@
 # with_advisory_lock
 
-Adds advisory locking (mutexes) to ActiveRecord 3.2, 4.0 and 4.1 when used with
+Adds advisory locking (mutexes) to ActiveRecord 4.2 and 5.0, with ruby 2.4, 2.3 or 2.2, when used with
 [MySQL](http://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_get-lock)
 or [PostgreSQL](http://www.postgresql.org/docs/9.3/static/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS).
 SQLite resorts to file locking.
@@ -34,8 +34,8 @@ end
 
 ### Lock wait timeouts
 
-The second parameter for ```with_advisory_lock``` is ```timeout_seconds```, and defaults to ```nil```,
-which means wait indefinitely for the lock.
+```with_advisory_lock``` takes an options hash as the second parameter.
+The ```timeout_seconds``` option defaults to ```nil```, which means wait indefinitely for the lock.
 
 A value of zero will try the lock only once. If the lock is acquired, the block
 will be yielded to. If the lock is currently being held, the block will not be called.
@@ -43,6 +43,23 @@ will be yielded to. If the lock is currently being held, the block will not be c
 Note that if a non-nil value is provided for `timeout_seconds`, the block will not be invoked if
 the lock cannot be acquired within that time-frame.
 
+For backwards compatability, the timeout value can be specified directly as the second parameter.
+
+### Shared locks
+
+The ```shared``` option defaults to ```false``` which means an exclusive lock will be obtained.
+Setting ```shared``` to ```true``` will allow locks to be obtained by multiple actors
+as long as they are all shared locks.
+
+Note: MySQL does not support shared locks.
+
+### Transaction-level locks
+
+PostgreSQL supports transaction-level locks which remain held until the transaction completes.
+You can enable this by setting the ```transaction``` option to ```true```.
+
+Note: transaction-level locks will not be reflected by `.current_advisory_lock` when the block has returned.
+
 ### Return values
 
 The return value of `with_advisory_lock_result` is a `WithAdvisoryLock::Result` instance,
@@ -117,6 +134,10 @@ you will be releasing the parent lock (!!!). A ```NestedAdvisoryLockError```will
 in this case. If you ask for the same lock name, ```with_advisory_lock``` won't ask for the
 lock again, and the block given will be yielded to.
 
+### Is clustered MySQL supported?
+
+[No.](https://github.com/mceachen/with_advisory_lock/issues/16)
+
 ### There are many ```lock-*``` files in my project directory after test runs
 
 This is expected if you aren't using MySQL or Postgresql for your tests.
@@ -139,6 +160,12 @@ end
 
 ## Changelog
 
+### 3.1.0
+
+* [Jason Weathered](https://github.com/jasoncodes) Added new shared and transaction-level lock options ([Pull request 21](https://github.com/mceachen/with_advisory_lock/pull/21)). Thanks!
+* Added ActiveRecord 5.0 to build matrix. Dropped 3.2, 4.0, and 4.1 (which no longer get security updates: http://rubyonrails.org/security/)
+* Replaced ruby 1.9 and 2.0 (both EOL) with ruby 2.2 and 2.3 (see https://www.ruby-lang.org/en/downloads/)
+
 ### 3.0.0
 
 * Added jruby/PostgreSQL support for Rails 4.x 

data/gemfiles/{activerecord_3.2.gemfile → activerecord_4.2.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2.0"
+gem "activerecord", "~> 4.2.0"
 
 platforms :ruby do
   gem "mysql2"

data/gemfiles/{activerecord_4.0.gemfile → activerecord_5.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.0.0"
+gem "activerecord", "~> 5.0.0"
 
 platforms :ruby do
   gem "mysql2"

data/lib/with_advisory_lock/base.rb

@@ -16,19 +16,30 @@ module WithAdvisoryLock
 
   FAILED_TO_LOCK = Result.new(false)
 
+  LockStackItem = Struct.new(:name, :shared)
+
   class Base
-    attr_reader :connection, :lock_name, :timeout_seconds
+    attr_reader :connection, :lock_name, :timeout_seconds, :shared, :transaction
+
+    def initialize(connection, lock_name, options)
+      options = {timeout_seconds: options} unless options.respond_to?(:fetch)
+      options.assert_valid_keys :timeout_seconds, :shared, :transaction
 
-    def initialize(connection, lock_name, timeout_seconds)
       @connection = connection
       @lock_name = lock_name
-      @timeout_seconds = timeout_seconds
+      @timeout_seconds = options.fetch(:timeout_seconds, nil)
+      @shared = options.fetch(:shared, false)
+      @transaction = options.fetch(:transaction, false)
     end
 
     def lock_str
       @lock_str ||= "#{ENV['WITH_ADVISORY_LOCK_PREFIX'].to_s}#{lock_name.to_s}"
     end
 
+    def lock_stack_item
+      @lock_stack_item ||= LockStackItem.new(lock_str, shared)
+    end
+
     def self.lock_stack
       # access doesn't need to be synchronized as it is only accessed by the current thread.
       Thread.current[:with_advisory_lock_stack] ||= []
@@ -36,7 +47,7 @@ module WithAdvisoryLock
     delegate :lock_stack, to: 'self.class'
 
     def already_locked?
-      lock_stack.include? lock_str
+      lock_stack.include? lock_stack_item
     end
 
     def with_advisory_lock_if_needed(&block)
@@ -73,7 +84,7 @@ module WithAdvisoryLock
     def yield_with_lock
       if try_lock
         begin
-          lock_stack.push(lock_str)
+          lock_stack.push(lock_stack_item)
           result = block_given? ? yield : nil
           Result.new(true, result)
         ensure

data/lib/with_advisory_lock/concern.rb

@@ -6,13 +6,13 @@ module WithAdvisoryLock
     delegate :with_advisory_lock, :advisory_lock_exists?, to: 'self.class'
 
     module ClassMethods
-      def with_advisory_lock(lock_name, timeout_seconds=nil, &block)
-        result = with_advisory_lock_result(lock_name, timeout_seconds, &block)
+      def with_advisory_lock(lock_name, options={}, &block)
+        result = with_advisory_lock_result(lock_name, options, &block)
         result.lock_was_acquired? ? result.result : false
       end
 
-      def with_advisory_lock_result(lock_name, timeout_seconds=nil, &block)
-        impl = impl_class.new(connection, lock_name, timeout_seconds)
+      def with_advisory_lock_result(lock_name, options={}, &block)
+        impl = impl_class.new(connection, lock_name, options)
         impl.with_advisory_lock_if_needed(&block)
       end
 
@@ -22,7 +22,8 @@ module WithAdvisoryLock
       end
 
       def current_advisory_lock
-        WithAdvisoryLock::Base.lock_stack.first
+        lock_stack_key = WithAdvisoryLock::Base.lock_stack.first
+        lock_stack_key && lock_stack_key[0]
       end
 
       private

data/lib/with_advisory_lock/flock.rb

@@ -20,7 +20,10 @@ module WithAdvisoryLock
     end
 
     def try_lock
-      0 == file_io.flock(File::LOCK_EX|File::LOCK_NB)
+      if transaction
+        raise ArgumentError, 'transaction level locks are not supported on SQLite'
+      end
+      0 == file_io.flock((shared ? File::LOCK_SH : File::LOCK_EX) | File::LOCK_NB)
     end
 
     def release_lock

data/lib/with_advisory_lock/mysql.rb

@@ -7,6 +7,12 @@ module WithAdvisoryLock
           "MySQL doesn't support nested Advisory Locks",
           lock_stack.dup)
       end
+      if shared
+        raise ArgumentError, 'shared locks are not supported on MySQL'
+      end
+      if transaction
+        raise ArgumentError, 'transaction level locks are not supported on MySQL'
+      end
       execute_successful?("GET_LOCK(#{quoted_lock_str}, 0)")
     end
 
@@ -21,7 +27,7 @@ module WithAdvisoryLock
 
     # MySQL doesn't support nested locks:
     def already_locked?
-      lock_stack.last == lock_str
+      lock_stack.last == lock_stack_item
     end
 
     # MySQL wants a string as the lock key.

data/lib/with_advisory_lock/postgresql.rb

@@ -2,11 +2,22 @@ module WithAdvisoryLock
   class PostgreSQL < Base
     # See http://www.postgresql.org/docs/9.1/static/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS
     def try_lock
-      execute_successful?('pg_try_advisory_lock')
+      pg_function = "pg_try_advisory#{transaction ? '_xact' : ''}_lock#{shared ? '_shared' : ''}"
+      execute_successful?(pg_function)
     end
 
     def release_lock
-      execute_successful?('pg_advisory_unlock')
+      return if transaction
+      pg_function = "pg_advisory_unlock#{shared ? '_shared' : ''}"
+      execute_successful?(pg_function)
+    rescue ActiveRecord::StatementInvalid => e
+      raise unless e.message =~ / ERROR: +current transaction is aborted,/
+      begin
+        connection.rollback_db_transaction
+        execute_successful?(pg_function)
+      ensure
+        connection.begin_db_transaction
+      end
     end
 
     def execute_successful?(pg_function)

data/lib/with_advisory_lock/version.rb

@@ -1,3 +1,3 @@
 module WithAdvisoryLock
-  VERSION = Gem::Version.new('3.0.0')
+  VERSION = Gem::Version.new('3.1.0')
 end

data/test/nesting_test.rb

@@ -15,12 +15,12 @@ describe "lock nesting" do
     impl = WithAdvisoryLock::Base.new(nil, nil, nil)
     impl.lock_stack.must_be_empty
     Tag.with_advisory_lock("first") do
-      impl.lock_stack.must_equal %w(first)
+      impl.lock_stack.map(&:name).must_equal %w(first)
       # Even MySQL should be OK with this:
       Tag.with_advisory_lock("first") do
-        impl.lock_stack.must_equal %w(first)
+        impl.lock_stack.map(&:name).must_equal %w(first)
       end
-      impl.lock_stack.must_equal %w(first)
+      impl.lock_stack.map(&:name).must_equal %w(first)
     end
     impl.lock_stack.must_be_empty
   end
@@ -33,7 +33,7 @@ describe "lock nesting" do
         end
       end
     }.must_raise WithAdvisoryLock::NestedAdvisoryLockError
-    exc.lock_stack.must_equal %w(first)
+    exc.lock_stack.map(&:name).must_equal %w(first)
   end
 
   it "supports nested advisory locks with !MySQL" do
@@ -41,19 +41,19 @@ describe "lock nesting" do
     impl = WithAdvisoryLock::Base.new(nil, nil, nil)
     impl.lock_stack.must_be_empty
     Tag.with_advisory_lock("first") do
-      impl.lock_stack.must_equal %w(first)
+      impl.lock_stack.map(&:name).must_equal %w(first)
       Tag.with_advisory_lock("second") do
-        impl.lock_stack.must_equal %w(first second)
+        impl.lock_stack.map(&:name).must_equal %w(first second)
         Tag.with_advisory_lock("first") do
           # Shouldn't ask for another lock:
-          impl.lock_stack.must_equal %w(first second)
+          impl.lock_stack.map(&:name).must_equal %w(first second)
           Tag.with_advisory_lock("second") do
             # Shouldn't ask for another lock:
-            impl.lock_stack.must_equal %w(first second)
+            impl.lock_stack.map(&:name).must_equal %w(first second)
           end
         end
       end
-      impl.lock_stack.must_equal %w(first)
+      impl.lock_stack.map(&:name).must_equal %w(first)
     end
     impl.lock_stack.must_be_empty
   end

data/test/options_test.rb

@@ -0,0 +1,64 @@
+require 'minitest_helper'
+
+describe 'options parsing' do
+  def parse_options(options)
+    WithAdvisoryLock::Base.new(mock, mock, options)
+  end
+
+  specify 'defaults (empty hash)' do
+    impl = parse_options({})
+    impl.timeout_seconds.must_equal nil
+    impl.shared.must_equal false
+    impl.transaction.must_equal false
+  end
+
+  specify 'nil sets timeout to nil' do
+    impl = parse_options(nil)
+    impl.timeout_seconds.must_equal nil
+    impl.shared.must_equal false
+    impl.transaction.must_equal false
+  end
+
+  specify 'integer sets timeout to value' do
+    impl = parse_options(42)
+    impl.timeout_seconds.must_equal 42
+    impl.shared.must_equal false
+    impl.transaction.must_equal false
+  end
+
+  specify 'hash with invalid key errors' do
+    proc {
+      parse_options(foo: 42)
+    }.must_raise ArgumentError
+  end
+
+  specify 'hash with timeout_seconds sets timeout to value' do
+    impl = parse_options(timeout_seconds: 123)
+    impl.timeout_seconds.must_equal 123
+    impl.shared.must_equal false
+    impl.transaction.must_equal false
+  end
+
+  specify 'hash with shared option sets shared to true' do
+    impl = parse_options(shared: true)
+    impl.timeout_seconds.must_equal nil
+    impl.shared.must_equal true
+    impl.transaction.must_equal false
+  end
+
+  specify 'hash with transaction option set transaction to true' do
+    impl = parse_options(transaction: true)
+    impl.timeout_seconds.must_equal nil
+    impl.shared.must_equal false
+    impl.transaction.must_equal true
+  end
+
+  specify 'hash with multiple keys sets options' do
+    foo = mock
+    bar = mock
+    impl = parse_options(timeout_seconds: foo, shared: bar)
+    impl.timeout_seconds.must_equal foo
+    impl.shared.must_equal bar
+    impl.transaction.must_equal false
+  end
+end

data/test/parallelism_test.rb

@@ -4,7 +4,7 @@ require 'forwardable'
 describe 'parallelism' do
   class FindOrCreateWorker
     extend Forwardable
-    def_delegators :@thread, :join, :wakeup, :join, :status, :to_s
+    def_delegators :@thread, :join, :wakeup, :status, :to_s
 
     def initialize(name, use_advisory_lock)
       @name = name
@@ -72,4 +72,3 @@ describe 'parallelism' do
     Label.all.size.must_equal @iterations # <- any duplicated rows will NOT make me happy.
   end
 end
-

data/test/shared_test.rb

@@ -0,0 +1,131 @@
+require 'minitest_helper'
+
+describe 'shared locks' do
+  def supported?
+    env_db != :mysql
+  end
+
+  class SharedTestWorker
+    def initialize(shared)
+      @shared = shared
+
+      @locked = nil
+      @cleanup = false
+      @thread = Thread.new { work }
+    end
+
+    def locked?
+      sleep 0.01 while @locked.nil? && @thread.alive?
+      @locked
+    end
+
+    def cleanup!
+      @cleanup = true
+      @thread.join
+      raise if @thread.status.nil?
+    end
+
+    private
+
+    def work
+      ActiveRecord::Base.connection_pool.with_connection do
+        Tag.with_advisory_lock('test', timeout_seconds: 0, shared: @shared) do
+          @locked = true
+          sleep 0.01 until @cleanup
+        end
+        @locked = false
+        sleep 0.01 until @cleanup
+      end
+    end
+  end
+
+  it 'does not allow two exclusive locks' do
+    one = SharedTestWorker.new(false)
+    one.locked?.must_equal true
+
+    two = SharedTestWorker.new(false)
+    two.locked?.must_equal false
+
+    one.cleanup!
+    two.cleanup!
+  end
+
+  describe 'not supported' do
+    before do
+      skip if supported?
+    end
+
+    it 'raises an error when attempting to use a shared lock' do
+      one = SharedTestWorker.new(true)
+      one.locked?.must_equal nil
+      exception = proc {
+        one.cleanup!
+      }.must_raise ArgumentError
+      exception.message.must_include 'not supported'
+    end
+  end
+
+  describe 'supported' do
+    before do
+      skip unless supported?
+    end
+
+    it 'does allow two shared locks' do
+      one = SharedTestWorker.new(true)
+      one.locked?.must_equal true
+
+      two = SharedTestWorker.new(true)
+      two.locked?.must_equal true
+
+      one.cleanup!
+      two.cleanup!
+    end
+
+    it 'does not allow exclusive lock with shared lock' do
+      one = SharedTestWorker.new(true)
+      one.locked?.must_equal true
+
+      two = SharedTestWorker.new(false)
+      two.locked?.must_equal false
+
+      three = SharedTestWorker.new(true)
+      three.locked?.must_equal true
+
+      one.cleanup!
+      two.cleanup!
+      three.cleanup!
+    end
+
+    it 'does not allow shared lock with exclusive lock' do
+      one = SharedTestWorker.new(false)
+      one.locked?.must_equal true
+
+      two = SharedTestWorker.new(true)
+      two.locked?.must_equal false
+
+      one.cleanup!
+      two.cleanup!
+    end
+
+    describe 'PostgreSQL' do
+      before do
+        skip unless env_db == :postgresql
+      end
+
+      def pg_lock_modes
+        ActiveRecord::Base.connection.select_values("SELECT mode FROM pg_locks WHERE locktype = 'advisory';")
+      end
+
+      it 'allows shared lock to be upgraded to an exclusive lock' do
+        pg_lock_modes.must_equal %w[]
+        Tag.with_advisory_lock 'test', shared: true do
+          pg_lock_modes.must_equal %w[ShareLock]
+          Tag.with_advisory_lock 'test', shared: false do
+            pg_lock_modes.must_equal %w[ShareLock ExclusiveLock]
+          end
+        end
+        pg_lock_modes.must_equal %w[]
+      end
+    end
+  end
+end

data/test/transaction_test.rb

@@ -0,0 +1,70 @@
+require 'minitest_helper'
+
+describe 'transaction scoping' do
+  def supported?
+    env_db == :postgresql
+  end
+
+  describe 'not supported' do
+    before do
+      skip if supported?
+    end
+
+    it 'raises an error when attempting to use transaction level locks' do
+      Tag.transaction do
+        exception = proc {
+          Tag.with_advisory_lock 'test', transaction: true do
+            raise 'should not get here'
+          end
+        }.must_raise ArgumentError
+        exception.message.must_include 'not supported'
+      end
+    end
+  end
+
+  describe 'supported' do
+    before do
+      skip unless env_db == :postgresql
+    end
+
+    def pg_lock_count
+      ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM pg_locks WHERE locktype = 'advisory';").to_i
+    end
+
+    specify 'session locks release after the block executes' do
+      Tag.transaction do
+        pg_lock_count.must_equal 0
+        Tag.with_advisory_lock 'test' do
+          pg_lock_count.must_equal 1
+        end
+        pg_lock_count.must_equal 0
+      end
+    end
+
+    specify 'session locks release when transaction fails inside block' do
+      Tag.transaction do
+        pg_lock_count.must_equal 0
+
+        exception = proc {
+          Tag.with_advisory_lock 'test' do
+            Tag.connection.execute 'SELECT 1/0;'
+          end
+        }.must_raise ActiveRecord::StatementInvalid
+        exception.message.must_include 'division by zero'
+
+        pg_lock_count.must_equal 0
+      end
+    end
+
+    specify 'transaction level locks hold until the transaction completes' do
+      Tag.transaction do
+        pg_lock_count.must_equal 0
+        Tag.with_advisory_lock 'test', transaction: true do
+          pg_lock_count.must_equal 1
+        end
+        pg_lock_count.must_equal 1
+      end
+      pg_lock_count.must_equal 0
+    end
+  end
+end

data/tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 export DB
 
-for RUBY in 2.1.2 jruby-1.7.13 ; do
+for RUBY in 2.4.0 jruby-1.7.13 ; do
   rbenv local $RUBY
   for DB in mysql postgresql sqlite ; do
     echo "$DB | $(ruby -v)"

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: with_advisory_lock
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matthew McEachen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-  name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: thread_safe
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: yard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: minitest-great_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest-great_expectations
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest-reporters
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: mocha
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: appraisal
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Advisory locking for ActiveRecord
@@ -129,17 +129,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_edge.gemfile
+- gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_5.0.gemfile
 - lib/with_advisory_lock.rb
 - lib/with_advisory_lock/base.rb
 - lib/with_advisory_lock/concern.rb
@@ -154,33 +152,36 @@ files:
 - test/lock_test.rb
 - test/minitest_helper.rb
 - test/nesting_test.rb
+- test/options_test.rb
 - test/parallelism_test.rb
+- test/shared_test.rb
 - test/test_models.rb
 - test/thread_test.rb
+- test/transaction_test.rb
 - tests.sh
 - with_advisory_lock.gemspec
 homepage: https://github.com/mceachen/with_advisory_lock
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Advisory locking for ActiveRecord
 test_files:
@@ -189,7 +190,9 @@ test_files:
 - test/lock_test.rb
 - test/minitest_helper.rb
 - test/nesting_test.rb
+- test/options_test.rb
 - test/parallelism_test.rb
+- test/shared_test.rb
 - test/test_models.rb
 - test/thread_test.rb
-has_rdoc:
+- test/transaction_test.rb

data/gemfiles/activerecord_4.1.gemfile

@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-
-platforms :ruby do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
-
-platforms :ruby do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"