active_record_mutex 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e4fb422fbe0336eee934df7fdeb49843c4b0335fe4222db9d8df1728b7d477
-  data.tar.gz: c3dc8c6fe86409160ded37ed5941cef3033d03b82e60c630c950ade50fc1d901
+  metadata.gz: 36b8a40a6140ecdfcd0e3892d2e008d502acdce96826ef3aecc797cadb65fa89
+  data.tar.gz: 38bf80d5ed330479f5a8399633048c606f7d03b71aaccacf512509c9cdcbb58e
 SHA512:
-  metadata.gz: bd1437072b603f1dd5641d70970fe3bd2a24e77862a88d035222b4b1c0c360eb99ce14a573be87fc2e331e85955283262380be09c709e3bad936944a36b6615a
-  data.tar.gz: 2f4528e9a7d63ce3e2f9584f0b0099c783b07bf518174fd50c107237e0ad994fed77519f408ef27daa3aa752d3df1452fdc7a0139a312c21fe6d708d77cc5f0c
+  metadata.gz: a580eda2be88864af2b8aec078b09b5757992063f9078e64afb195c167bfc6b858f1d0674f2c348e66659c9f759e2cb47bb147a9b6118e9817510cdf6b77cb05
+  data.tar.gz: 51e00870718236b49c3271a0164d68fe6708e5b2451daad87b9f211090b3d7979a06546665d25082dadaca028fbb773c544ac33f7932c3a8d04150c2e31ff369

data/CHANGES.md

@@ -1,5 +1,19 @@
 # Changes
 
+## 2024-10-16 v3.2.1
+
+* Refactor DatabaseMutex implementation:
+  * Change `@name` and `mutex.name` to downcase and freeze values
+  * Update tests to reflect new behavior
+
+## 2024-10-16 v3.2.0
+
+* DatabaseMutex improvements:
+  * Improved lock name generation in `lock_name` method.
+  * Modified SQL queries to use `lock_name` instead of `internal_name`.
+  * Added `lock_exists?` and `test_all_mutexes` methods for testing mutex
+    creation and querying.
+
 ## 2024-10-16 v3.1.0
 
 * Changes for **3.1.0**:

data/active_record_mutex.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 3.2.0 ruby lib
+# stub: active_record_mutex 3.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex".freeze
-  s.version = "3.2.0".freeze
+  s.version = "3.2.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/active_record/database_mutex/implementation.rb

@@ -20,9 +20,10 @@ module ActiveRecord
       #
       # @raise [ ArgumentError ] if no **name** option is provided in the options hash.
       def initialize(opts = {})
-        @name = opts[:name].to_s
+        @name = opts[:name].to_s.downcase
         @name.size != 0 or raise ArgumentError, "mutex requires a nonempty :name argument"
-        internal_name # create/check internal_name
+        @name.freeze
+        lock_name # create/check internal_name and lock_name
       end
 
       # Returns the name of this mutex as given via the constructor argument.
@@ -35,7 +36,8 @@ module ActiveRecord
       def internal_name
         @internal_name and return @internal_name
         encoded_name = ?$ + Digest::MD5.base64digest([ self.class.name, name ] * ?#).
-          delete('^A-Za-z0-9+/').gsub(/[+\/]/, ?+ => ?_, ?/ => ?.)
+          delete('^A-Za-z0-9+/').gsub(/[+\/]/, ?+ => ?_, ?/ => ?.).
+          downcase.freeze
         if encoded_name.size <= 64
           @internal_name = encoded_name
         else
@@ -50,8 +52,11 @@ module ActiveRecord
       #
       # @return [ String ] the generated lock name
       def lock_name
+        @lock_name and return @lock_name
         prefix_name = name.gsub(/[^[:print:]]/, '')[0, 32]
-        prefix_name + ?= + internal_name
+        @lock_name = prefix_name + ?= + internal_name
+        @lock_name.downcase!
+        @lock_name.freeze
       end
 
       # The synchronize method attempts to acquire a mutex lock for the given name

data/lib/active_record/database_mutex/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord::DatabaseMutex
   # ActiveRecord::DatabaseMutex version
-  VERSION         = '3.2.0'
+  VERSION         = '3.2.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/test/database_mutex_test.rb

@@ -25,7 +25,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
     old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], nil
     mutex = Foo.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
-    assert_equal Foo.name, mutex.name
+    assert_equal Foo.name.downcase, mutex.name
   ensure
     ENV['RAILS_ENV'] = old
   end
@@ -34,7 +34,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
     old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'test'
     mutex = Foo.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
-    assert_equal "#{Foo.name}@test", mutex.name
+    assert_equal "#{Foo.name}@test".downcase, mutex.name
   ensure
     ENV['RAILS_ENV'] = old
   end
@@ -47,7 +47,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
     assert_equal true, instance.save
     mutex = instance.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
-    assert_equal "#{instance.id}@#{Foo.name}", mutex.name
+    assert_equal "#{instance.id}@#{Foo.name}".downcase, mutex.name
   end
 
   def test_factory_method_for
@@ -56,6 +56,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
   end
 
   private def lock_exists?(string)
+    string = string.downcase
     ActiveRecord::Base.all_mutexes.map(&:OBJECT_NAME).any? {
       _1.include?(string)
     }
@@ -73,7 +74,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
 
   def test_create
     mutex = Implementation.new(:name => 'Create')
-    assert_equal 'Create', mutex.name
+    assert_equal 'create', mutex.name
   end
 
   def test_lock
@@ -284,11 +285,11 @@ class DatabaseMutexTest < Test::Unit::TestCase
 
   def test_internal_name
     mutex = Implementation.new(:name => (250..255).map(&:chr) * '')
-    assert_equal '$3i3xQvUrNPGyH6kaIOkiPw', mutex.send(:internal_name)
+    assert_equal '$3i3xqvurnpgyh6kaiokipw', mutex.send(:internal_name)
   end
 
   def test_counter_name
     mutex = Implementation.new(:name => (250..255).map(&:chr) * '')
-    assert_equal '@$3i3xQvUrNPGyH6kaIOkiPw', mutex.send(:counter)
+    assert_equal '@$3i3xqvurnpgyh6kaiokipw', mutex.send(:counter)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mutex
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Florian Frank