with_advisory_lock 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94aa36a41376cf160850770d5a49a3d301aea4e
-  data.tar.gz: 1e7ac3e6f61566a8e2fd1da766c762405f8a7502
+  metadata.gz: 82b0119f2158391cace745c0fa71a65497198de1
+  data.tar.gz: eb7f626ed7db658000ad0db260a2692035ee4dc1
 SHA512:
-  metadata.gz: 002a011573e173b6957fc7b51023274ed7f34032f2502def7b6b1c9219aa34979552fda5a615816d3b4be246c083a7d9a8d1e71e9bb324a88183ae4a354bdc36
-  data.tar.gz: f30b67b87759cf3c085b96e995e9788728c956b1f74f585d5a198100840d65bc427d6844df99420bacf17d3c4dfbc8b108c77cf4b0ca8bc54a03aec1214991b5
+  metadata.gz: efe96bf02dc09cf167ed2058c164405c4f6d6ae9e31442b46d9e9f5ceebc7add1850861d0b6bd311087a056cab5928ad27afa680a4b11884d1474bee4ae25269
+  data.tar.gz: f9f753d910d24f6cb98fc91a47aed8dcccb82bf99f55ea193aceb8ffedf3c2732eef1c7945c64d1a5ac72aa27d89a0205307ddab72cce7113ca6c37c22496ac9

data/.travis.yml

@@ -4,11 +4,13 @@ dist: trusty
 sudo: required
 
 rvm:
+  - 2.5.1
   - 2.4.0
   - 2.3.3
-  - 2.2.6
+  - 2.2.10
 
 gemfile:
+  - gemfiles/activerecord_5.2.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_4.2.gemfile
@@ -27,11 +29,4 @@ script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace
 before_script:
   - bash .travis.install-mysql-5.7.sh
   - mysql -e 'create database with_advisory_lock_test'
-  - psql -c 'create database with_advisory_lock_test' -U postgres
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/activerecord_edge.gemfile
-    - rvm: jruby-19mode # travis' version of jruby has issues. Tests pass with jruby 1.7.13/java 1.8.0_11 on mac.
-    - rvm: rbx-2
-
+  - psql -c 'create database with_advisory_lock_test' -U postgres

data/Appraisals

@@ -1,5 +1,9 @@
 appraise "activerecord-4.2" do
   gem "activerecord", "~> 4.2.0"
+  platforms :ruby do
+      gem "pg", "~> 0.21"
+      gem "mysql2", "< 0.5"
+  end
 end
 
 appraise "activerecord-5.0" do
@@ -9,3 +13,7 @@ end
 appraise "activerecord-5.1" do
   gem "activerecord", "~> 5.1.0"
 end
+
+appraise "activerecord-5.2" do
+  gem "activerecord", "~> 5.1.0"
+end

data/Gemfile

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

data/README.md

@@ -158,10 +158,14 @@ end
 
 ## Changelog
 
+### 4.0.0
+
+* Drop support for unsupported versions of activerecord
+* Drop support for unsupported versions of ruby
+
 ### 3.2.0
 
 * [Joshua Flanagan](https://github.com/joshuaflanagan) [added a SQL comment to the lock query for PostgreSQL](https://github.com/ClosureTree/with_advisory_lock/pull/28). Thanks!
-
 * [Fernando Luizão](https://github.com/fernandoluizao) found a spurious requirement for `thread_safe`. Thanks for the [fix](https://github.com/ClosureTree/with_advisory_lock/pull/27)!
 
 ### 3.1.1

data/gemfiles/activerecord_4.2.gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.2.0"
 
 platforms :ruby do
-  gem "mysql2"
-  gem "pg"
+  gem "mysql2", "< 0.5"
+  gem "pg", "~> 0.21"
   gem "sqlite3"
 end
 
@@ -16,4 +16,4 @@ platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activerecord_5.0.gemfile

@@ -16,4 +16,4 @@ platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activerecord_5.1.gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.1.0"
 
 platforms :ruby do
-  gem "mysql2", "~> 0.3.10"
-  gem "pg", "< 0.19"
+  gem "mysql2"
+  gem "pg"
   gem "sqlite3"
 end
 

data/gemfiles/activerecord_5.2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.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/lib/with_advisory_lock.rb

@@ -14,5 +14,5 @@ module WithAdvisoryLock
 end
 
 ActiveSupport.on_load :active_record do
-  ActiveRecord::Base.send :include, WithAdvisoryLock::Concern
+  include WithAdvisoryLock::Concern
 end

data/lib/with_advisory_lock/base.rb

@@ -22,7 +22,7 @@ module WithAdvisoryLock
     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 = { timeout_seconds: options } unless options.respond_to?(:fetch)
       options.assert_valid_keys :timeout_seconds, :shared, :transaction
 
       @connection = connection
@@ -33,7 +33,7 @@ module WithAdvisoryLock
     end
 
     def lock_str
-      @lock_str ||= "#{ENV['WITH_ADVISORY_LOCK_PREFIX'].to_s}#{lock_name.to_s}"
+      @lock_str ||= "#{ENV['WITH_ADVISORY_LOCK_PREFIX']}#{lock_name}"
     end
 
     def lock_stack_item
@@ -72,7 +72,7 @@ module WithAdvisoryLock
 
     def yield_with_lock_and_timeout(&block)
       give_up_at = Time.now + @timeout_seconds if @timeout_seconds
-      while @timeout_seconds.nil? || Time.now < give_up_at do
+      while @timeout_seconds.nil? || Time.now < give_up_at
         r = yield_with_lock(&block)
         return r if r.lock_was_acquired?
         # Randomizing sleep time may help reduce contention.

data/lib/with_advisory_lock/concern.rb

@@ -6,12 +6,12 @@ module WithAdvisoryLock
     delegate :with_advisory_lock, :advisory_lock_exists?, to: 'self.class'
 
     module ClassMethods
-      def with_advisory_lock(lock_name, options={}, &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, options={}, &block)
+      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

data/lib/with_advisory_lock/database_adapter_support.rb

@@ -5,11 +5,11 @@ module WithAdvisoryLock
     end
 
     def mysql?
-      [:mysql, :mysql2].include? @sym_name
+      %i[mysql mysql2].include? @sym_name
     end
 
     def postgresql?
-      [:postgresql, :empostgresql, :postgis].include? @sym_name
+      %i[postgresql empostgresql postgis].include? @sym_name
     end
 
     def sqlite?

data/lib/with_advisory_lock/flock.rb

@@ -2,7 +2,6 @@ require 'fileutils'
 
 module WithAdvisoryLock
   class Flock < Base
-
     def filename
       @filename ||= begin
         safe = lock_str.to_s.gsub(/[^a-z0-9]/i, '')

data/lib/with_advisory_lock/mysql.rb

@@ -5,11 +5,10 @@ module WithAdvisoryLock
       unless lock_stack.empty?
         raise NestedAdvisoryLockError.new(
           "MySQL doesn't support nested Advisory Locks",
-          lock_stack.dup)
-      end
-      if shared
-        raise ArgumentError, 'shared locks are not supported on MySQL'
+          lock_stack.dup
+        )
       end
+      raise ArgumentError, 'shared locks are not supported on MySQL' if shared
       if transaction
         raise ArgumentError, 'transaction level locks are not supported on MySQL'
       end

data/lib/with_advisory_lock/nested_advisory_lock_error.rb

@@ -8,7 +8,7 @@ module WithAdvisoryLock
     end
 
     def to_s
-      super + (lock_stack ? ": lock stack = #{lock_stack}" : "")
+      super + (lock_stack ? ": lock stack = #{lock_stack}" : '')
     end
   end
 end

data/lib/with_advisory_lock/postgresql.rb

@@ -21,7 +21,7 @@ module WithAdvisoryLock
     end
 
     def execute_successful?(pg_function)
-      comment = lock_name.gsub(/(\/\*)|(\*\/)/, "--")
+      comment = lock_name.gsub(/(\/\*)|(\*\/)/, '--')
       sql = "SELECT #{pg_function}(#{lock_keys.join(',')}) AS #{unique_column_name} /* #{comment} */"
       result = connection.select_value(sql)
       # MRI returns 't', jruby returns true. YAY!
@@ -39,4 +39,3 @@ module WithAdvisoryLock
     end
   end
 end
-

data/lib/with_advisory_lock/version.rb

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

data/test/minitest_helper.rb

@@ -24,11 +24,6 @@ rescue LoadError
 end
 require 'minitest/autorun'
 require 'minitest/great_expectations'
-if ActiveRecord::VERSION::MAJOR > 3
-  # minitest-reporters-1.0.5/lib/minitest/old_activesupport_fix.rb:7:in `remove_method': method `run' not defined in ActiveSupport::Testing::SetupAndTeardown::ForMinitest (NameError)
-  require 'minitest/reporters'
-  Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-end
 require 'mocha/setup'
 
 class MiniTest::Spec

data/test/parallelism_test.rb

@@ -54,14 +54,17 @@ describe 'parallelism' do
     @workers = 10
   end
 
+  # < SQLite, understandably, throws "The database file is locked (database is locked)"
+
   it 'creates multiple duplicate rows without advisory locks' do
+    skip if env_db == :sqlite
     @use_advisory_lock = false
     @iterations = 1
     run_workers
     Tag.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
     TagAudit.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
     Label.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
-  end unless env_db == :sqlite # < SQLite, understandably, throws "The database file is locked (database is locked)"
+  end
 
   it "doesn't create multiple duplicate rows with advisory locks" do
     @use_advisory_lock = true

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,11 +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_development_dependency 'yard'
   gem.add_development_dependency 'minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: with_advisory_lock
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - gemfiles/activerecord_4.2.gemfile
 - gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
 - lib/with_advisory_lock.rb
 - lib/with_advisory_lock/base.rb
 - lib/with_advisory_lock/concern.rb
@@ -160,7 +161,7 @@ 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:
   - - ">="
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Advisory locking for ActiveRecord