active_record_mutex 2.5.1 → 3.1.0

data/test/database_mutex_test.rb

@@ -6,6 +6,10 @@ class DatabaseMutexTest < Test::Unit::TestCase
   class Foo < ActiveRecord::Base; end
 
   def setup
+    Foo.instance_eval do
+      @mutex_name = nil
+      @mutex      = nil
+    end
     ActiveRecord::Schema.define(:version => 1) do
       create_table(:foos, :force => true) { |t| t.string :bar }
     end
@@ -19,9 +23,6 @@ class DatabaseMutexTest < Test::Unit::TestCase
 
   def test_class_method_mutex
     old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], nil
-    Foo.instance_eval do
-      @mutex = nil
-    end
     mutex = Foo.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
     assert_equal Foo.name, mutex.name
@@ -31,9 +32,6 @@ class DatabaseMutexTest < Test::Unit::TestCase
 
   def test_class_method_mutex_within_env
     old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'test'
-    Foo.instance_eval do
-      @mutex = nil
-    end
     mutex = Foo.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
     assert_equal "#{Foo.name}@test", mutex.name
@@ -65,29 +63,126 @@ class DatabaseMutexTest < Test::Unit::TestCase
   def test_lock
     mutex = Implementation.new(:name => 'Lock')
     assert mutex.unlocked?
+    assert mutex.not_owned?
     assert_equal 0, mutex.send(:counter_value)
     assert mutex.lock
     assert mutex.locked?
-    assert mutex.aquired_lock?
+    assert mutex.owned?
     assert_equal 1, mutex.send(:counter_value)
     assert mutex.lock
     assert_equal 2, mutex.send(:counter_value)
   end
 
+  def test_lock_with_timeout_multiple_threads
+    done = false
+    thread = Thread.new do
+      ActiveRecord::Base.connection_pool.with_connection do
+        Implementation.new(:name => 'LockTimeout').synchronize {
+          done = true
+          sleep 2
+        }
+      end
+    ensure
+      done = true
+    end
+    mutex = Implementation.new(:name => 'LockTimeout')
+    until done
+      sleep 0.1
+    end
+    assert_false mutex.lock(timeout: 0.1, raise: false)
+    assert_raises(ActiveRecord::DatabaseMutex::MutexLocked) { mutex.lock(timeout: 0.1) }
+    thread.join
+    assert mutex.unlocked?
+    assert_false mutex.owned?
+    assert_equal 0, mutex.send(:counter_value)
+    assert mutex.lock(timeout: 1)
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 1, mutex.send(:counter_value)
+  end
+
+  def test_lock_without_timeout_multiple_threads
+    done = false
+    thread = Thread.new do
+      ActiveRecord::Base.connection_pool.with_connection do
+        Implementation.new(:name => 'SpinTimeout').synchronize {
+          done = true
+          sleep 2
+        }
+      end
+    ensure
+      done = true
+    end
+    mutex = Implementation.new(:name => 'SpinTimeout')
+    until done
+      sleep 0.1
+    end
+    thread.join
+    assert mutex.lock
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 1, mutex.send(:counter_value)
+  end
+
   def test_unlock
     mutex = Implementation.new(:name => 'Unlock')
     assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock }
     assert_equal 0, mutex.send(:counter_value)
     assert mutex.lock
     assert mutex.locked?
-    assert mutex.aquired_lock?
+    assert mutex.owned?
+    assert_equal 1, mutex.send(:counter_value)
+    assert mutex.lock
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 2, mutex.send(:counter_value)
+    assert_false mutex.unlock
+    assert_false mutex.unlocked?
+    assert_false mutex.not_owned?
     assert_equal 1, mutex.send(:counter_value)
     assert mutex.unlock
     assert mutex.unlocked?
+    assert mutex.not_owned?
     assert_equal 0, mutex.send(:counter_value)
     assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock }
   end
 
+  def test_unlock_with_force
+    mutex = Implementation.new(:name => 'Unlock')
+    assert_false mutex.unlock raise: false
+    assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock }
+    assert_equal 0, mutex.send(:counter_value)
+    assert mutex.lock
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 1, mutex.send(:counter_value)
+    assert mutex.lock
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 2, mutex.send(:counter_value)
+    assert mutex.unlock force: true
+    assert mutex.unlocked?
+    assert mutex.not_owned?
+    assert_equal 0, mutex.send(:counter_value)
+    assert_false mutex.unlock force: true, raise: false
+    assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock force: true }
+  end
+
+  def test_unlock?
+    mutex = Implementation.new(:name => 'Unlock')
+    assert_nil mutex.unlock?
+    assert_equal 0, mutex.send(:counter_value)
+    assert mutex.lock
+    assert mutex.locked?
+    assert mutex.owned?
+    assert_equal 1, mutex.send(:counter_value)
+    assert mutex.unlock?
+    assert mutex.unlocked?
+    assert mutex.not_owned?
+    assert_equal 0, mutex.send(:counter_value)
+    assert_nil mutex.unlock?
+  end
+
   def test_synchronize
     mutex = Implementation.new(:name => 'Sync1')
     assert mutex.unlocked?
@@ -100,6 +195,30 @@ class DatabaseMutexTest < Test::Unit::TestCase
     assert_equal 0, mutex.send(:counter_value)
   end
 
+  def test_synchronize_two_threads
+    done = false
+    thread = Thread.new do
+      ActiveRecord::Base.connection_pool.with_connection do
+        Implementation.new(:name => 'Sync1').synchronize {
+          done = true
+          sleep 2
+        }
+      end
+    ensure
+      done = true
+    end
+    mutex = Implementation.new(:name => 'Sync1')
+    yielded = false
+    until done
+      sleep 0.1
+    end
+    mutex.synchronize(block: false) { yielded  = true }
+    assert_false yielded
+    thread.join
+    mutex.synchronize(block: false) { yielded  = true }
+    assert yielded
+  end
+
   def test_synchronize_exception
     mutex = Implementation.new(:name => 'Sync2')
     exception = Class.new StandardError
@@ -147,8 +266,13 @@ class DatabaseMutexTest < Test::Unit::TestCase
     assert_nil mutex.synchronize {}
   end
 
+  def test_internal_name
+    mutex = Implementation.new(:name => (250..255).map(&:chr) * '')
+    assert_equal '$3i3xQvUrNPGyH6kaIOkiPw', mutex.send(:internal_name)
+  end
+
   def test_counter_name
     mutex = Implementation.new(:name => (250..255).map(&:chr) * '')
-    assert_equal '@$_vv8.f7.', mutex.send(:counter)
+    assert_equal '@$3i3xQvUrNPGyH6kaIOkiPw', mutex.send(:counter)
   end
 end

data/test/test_helper.rb

@@ -6,15 +6,14 @@ if ENV['START_SIMPLECOV'].to_i == 1
 end
 
 require 'active_record'
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record/database_mutex'
+require 'debug'
+
+database_url = URI.parse(ENV.fetch('DATABASE_URL'))
+database = File.basename(database_url.path)
+database_url_without_db = database_url.dup.tap { _1.path = '' }
+ch = ActiveRecord::Base.establish_connection(database_url_without_db.to_s)
+ch.with_connection { _1.execute %{ CREATE DATABASE IF NOT EXISTS #{database} } }
+ActiveRecord::Base.establish_connection(database_url.to_s)
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => "mysql2",
-  :database => ENV['DATABASE'] || "test",
-  :username => ENV['USER'],
-  :password => ENV['PASSWORD'],
-  :host     => ENV['HOST'] || 'localhost'
-)
 require 'test/unit'
-require 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mutex
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: all_images
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +101,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,23 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
-  name: tins
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0.6'
 description: Mutex that can be used to synchronise ruby processes via an ActiveRecord
   datababase connection. (Only Mysql is supported at the moment.)
 email: flori@ping.de
@@ -127,14 +135,16 @@ extra_rdoc_files:
 - lib/active_record/mutex.rb
 - lib/active_record_mutex.rb
 files:
-- ".gitignore"
-- ".travis.yml"
+- ".envrc"
+- CHANGES.md
 - COPYING
 - Gemfile
 - README.md
 - Rakefile
-- VERSION
 - active_record_mutex.gemspec
+- docker-compose.yml
+- examples/process1.rb
+- examples/process2.rb
 - lib/active_record/database_mutex.rb
 - lib/active_record/database_mutex/implementation.rb
 - lib/active_record/database_mutex/version.rb
@@ -146,7 +156,7 @@ homepage: http://github.com/flori/active_record_mutex
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - ActiveRecordMutex - Implementation of a Mutex for Active Record
@@ -165,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.5.18
+signing_key:
 specification_version: 4
 summary: Implementation of a Mutex for Active Record
 test_files:

data/.gitignore

@@ -1,6 +0,0 @@
-.*.sw[pon]
-.DS_Store
-.byebug_history
-Gemfile.lock
-coverage
-pkg

data/.travis.yml

@@ -1,20 +0,0 @@
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.3
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-before_script:
-    - mysql -e 'create database test;'
-script:
-  - rake && codeclimate-test-reporter --file coverage
-sudo: false
-addons:
-  code_climate:
-    repo_token: 316615e61480039c3444f59bf124cf810d31110326e51f133e9cc9852de14892
-env:
-  - START_SIMPLECOV=1

data/VERSION

@@ -1 +0,0 @@
-2.5.1