coil 1.5.3 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407af370c8e8e90f90f405080773d402ee8839b224d9d0f425f00b141864d039
-  data.tar.gz: a55d8cad9418bbaac9fb11b0e0b205978ab1de9d076dbfb45c5f9cd937924ab9
+  metadata.gz: 4e06deca7bbca4aaeb692c3b438da2fd668f709d1f7e4a2abbb0caae7edc2aba
+  data.tar.gz: 5a629055bfc265a3162b25744dfe78efb5910f1f609c13c912f897e862c00fc8
 SHA512:
-  metadata.gz: fd54ea422cc7b12821838ca16e5be8fe18243fdfc5c9c830815eb4a37def6af9b2a6e38d73b4557b04d0c5e15932d5c70cb579976cd346bebd349970b788b686
-  data.tar.gz: 02d7c35b193e56998f0d4a91cd8ca7aab94ae289628e767484229e8451a40740873c40b130b6c410d4de3d015bd90ee90364a26d2ee0b3bef14fe1e42302886d
+  metadata.gz: da9af31450e4132693a7d9a514892fedaa6f66df725cc23c9b667038d3dfc15688524ce530d10cf4cdaf9d5ce1fa8e5fdbd6e003fa0ff0a894d16df673d13139
+  data.tar.gz: ec35ff6c3ecc9a18739e15adf93822ad103043cc8bdfb213f2c7c0e767b1364cef180fe572586e79414d4eec481680ea70b014ad6e403ff343ff686ec4c1255c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## main
 
+## [1.5.5](https://github.com/OdekoTeam/coil/compare/1.5.4...1.5.5) (2025-03-24)
+#### Added
+- Rails 8 support ([bcc6885](https://github.com/OdekoTeam/coil/commit/bcc6885bdbe3a7dedbc505edee0482d215fe9d91))
+
+## [1.5.4](https://github.com/OdekoTeam/coil/compare/1.5.3...1.5.4) (2025-03-24)
+#### Added
+- Rails 7.2 support ([be1cdc4](https://github.com/OdekoTeam/coil/commit/be1cdc4bde1fb73d1ac24f3b786a1d58a748d87f))
+
 ## [1.5.3](https://github.com/OdekoTeam/coil/compare/1.5.2...1.5.3) (2025-03-24)
 #### Added
 - Ruby 3.2 and 3.3 support ([a4ceb7c](https://github.com/OdekoTeam/coil/commit/a4ceb7cf2cefc47ae3c14a876a0782aaec0e5c43))

data/lib/coil/queue_locking.rb

@@ -60,8 +60,9 @@ module Coil
       ks = keys.uniq(&:int64).sort_by(&:int64).reverse
 
       fn = ks.reduce(blk) do |f, key|
-        -> do
-          with_lock(key:, wait:, &f)
+        ->(*args) do
+          lock(key:, wait:)
+          f.call(*args)
         end
       end
 
@@ -70,22 +71,21 @@ module Coil
 
     private
 
-    def with_lock(key:, wait:, &blk)
-      wait ? lock(key:) : try_lock(key:)
-      blk.call
+    def lock(key:, wait:)
+      wait ? acquire_lock(key:) : try_acquire_lock(key:)
     end
 
     ACQUIRE_LOCK = "pg_advisory_xact_lock"
     TRY_ACQUIRE_LOCK = "pg_try_advisory_xact_lock"
 
-    def lock(key:)
+    def acquire_lock(key:)
       command = sql(fn: ACQUIRE_LOCK, key:)
       connection.execute(command)
     rescue ActiveRecord::LockWaitTimeout
       raise LockWaitTimeout
     end
 
-    def try_lock(key:)
+    def try_acquire_lock(key:)
       query = sql(fn: TRY_ACQUIRE_LOCK, key:)
       return if connection.select_value(query)
       raise LockWaitTimeout

data/lib/coil/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Coil
-  VERSION = "1.5.3"
+  VERSION = "1.5.5"
 end

data/lib/coil.rb

@@ -4,6 +4,7 @@ require "rails"
 require "coil/version"
 require "coil/engine"
 require "coil/queue_locking"
+require "active_support/core_ext/integer/time"
 
 module Coil
   mattr_accessor :sidekiq_queue, default: "default"

data/rbi/coil.rbi

@@ -187,7 +187,12 @@ module Coil::QueueLocking
         message_type: String,
         message_keys: T::Array[T.untyped],
         wait: T::Boolean,
-        blk: T.proc.returns(T.type_parameter(:P))
+        blk: T.any(
+          # ActiveRecord versions 7.2 and newer yield a transaction as the block arg.
+          T.proc.params(arg0: ActiveRecord::Transaction).returns(T.type_parameter(:P)),
+          # Earlier versions yield to the block with no args.
+          T.proc.returns(T.type_parameter(:P))
+        )
       ).returns(T.type_parameter(:P))
   end
   def locking(queue_type:, message_type:, message_keys:, wait: T.unsafe(nil), &blk); end
@@ -198,23 +203,16 @@ module Coil::QueueLocking
   def connection; end
 
   sig { params(key: Key).void }
-  def lock(key:); end
+  def acquire_lock(key:); end
 
   sig { params(fn: String, key: Key).returns(String) }
   def sql(fn:, key:); end
 
   sig { params(key: Key).void }
-  def try_lock(key:); end
+  def try_acquire_lock(key:); end
 
-  sig do
-    type_parameters(:P)
-      .params(
-        key: Key,
-        wait: T::Boolean,
-        blk: T.proc.returns(T.type_parameter(:P))
-      ).returns(T.type_parameter(:P))
-  end
-  def with_lock(key:, wait:, &blk); end
+  sig { params(key: Key, wait: T::Boolean).void }
+  def lock(key:, wait:); end
 end
 
 Coil::QueueLocking::ACQUIRE_LOCK = T.let(T.unsafe(nil), String)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coil
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.5
 platform: ruby
 authors:
 - Ivan Brennan
@@ -20,7 +20,7 @@ dependencies:
         version: 6.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 6.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +75,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -179,14 +179,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -221,14 +221,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: parlour
   requirement: !ruby/object:Gem::Requirement