with_advisory_lock 3.0.0 → 4.6.0

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)"

data/with_advisory_lock.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'with_advisory_lock/version'
@@ -14,12 +13,12 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^test/})
   gem.require_paths = %w(lib)
+  gem.required_ruby_version = '>= 2.2.10'
+
+  gem.add_runtime_dependency 'activerecord', '>= 4.2'
 
-  gem.add_runtime_dependency 'activerecord', '>= 3.2'
-  gem.add_runtime_dependency 'thread_safe'
 
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'minitest'

metadata

@@ -1,125 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: with_advisory_lock
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Matthew McEachen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
   name: activerecord
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: thread_safe
-  prerelease: false
+        version: '4.2'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !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,23 +115,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".tool-versions"
+- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - 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
+- gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_6.0.gemfile
 - lib/with_advisory_lock.rb
 - lib/with_advisory_lock/base.rb
 - lib/with_advisory_lock/concern.rb
 - lib/with_advisory_lock/database_adapter_support.rb
 - lib/with_advisory_lock/flock.rb
 - lib/with_advisory_lock/mysql.rb
+- lib/with_advisory_lock/mysql_no_nesting.rb
 - lib/with_advisory_lock/nested_advisory_lock_error.rb
 - lib/with_advisory_lock/postgresql.rb
 - lib/with_advisory_lock/version.rb
@@ -154,33 +144,35 @@ 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'
+      version: 2.2.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Advisory locking for ActiveRecord
 test_files:
@@ -189,7 +181,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