delayed 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e3732fe3ac6f1594f1e152d12152b695a18b7d0e74812b35302af8079fd44b
-  data.tar.gz: 523e4d4ef542ae68c4534c4106adbcbe614c4c60fa5268b92ea7d56388b856d2
+  metadata.gz: a2b90a867a985a3bf32841f0cadac600d9d9f076d30bb04c85845c65b0e97ba9
+  data.tar.gz: 7b527829bd45c8f4bff4b6c62ea15ecc62aeca4461e74e2ff0b6f0c5a1800243
 SHA512:
-  metadata.gz: b3f1d3ab2f719139330f89564d710e1e06a323a2b783efd8d1026099b09f4b3a916c2a5d5777db983c68cd806e9b4d30c93ec39e9d4e8e142ad88e5a2e7f9771
-  data.tar.gz: 8764151bcc3af54e476baedd6086ec054210b90ad0ca77dfd8d6da979c7a64b278658c7b57689005dc92c717fe5d58dc676545bd98cefbcc6cc59bc1e517b40e
+  metadata.gz: bbce505c6b79c92df2c69e56e288af6437304b8de87227058e03f31fbb9c20b6f86869c48936b170806e96469e744813e9674178d965ebdb8a4a69542da496ed
+  data.tar.gz: e6a9976ea79803f45875cddbe96639a9d2d760374ce82b8ddd3d61b7bc594abe9fcae8f2610c4e4952c026dfaf7e613db7fabed19c3bb499d3f98c0bbc6c4a93

data/lib/delayed/helpers/migration.rb

@@ -33,18 +33,20 @@ module Delayed
         end
       end
 
-      RETRY_EXCEPTIONS = [
-        ActiveRecord::LockWaitTimeout,
-        ActiveRecord::StatementTimeout,
-        (PG::LockNotAvailable if defined?(PG::LockNotAvailable)),
-      ].compact.freeze
+      def self.retry_exceptions
+        @retry_exceptions ||= [
+          ActiveRecord::LockWaitTimeout,
+          ActiveRecord::StatementTimeout,
+          (PG::LockNotAvailable if defined?(PG::LockNotAvailable)),
+        ].compact.freeze
+      end
 
       def with_retry_loop(wait_timeout: 5.minutes, **opts)
         with_timeouts(**opts) do
           loop do
             yield
             break
-          rescue *RETRY_EXCEPTIONS => e
+          rescue *Migration.retry_exceptions => e
             raise if Delayed::Job.db_time_now - @migration_start > wait_timeout
 
             Delayed.logger.warn("Index creation failed for #{opts[:name]}: #{e.message}. Retrying...")

data/lib/delayed/job_wrapper.rb

@@ -35,18 +35,12 @@ module Delayed
     # If job failed to deserialize, we can't respond to delegated methods.
     # Returning false here prevents instance method checks from blocking job cleanup.
     # Rails 8.1+ raises ActiveJob::UnknownJobClassError (rails/rails#53770).
-    if Gem::Version.new(ActiveJob.version) >= Gem::Version.new('8.1')
-      def respond_to?(*, **)
-        super
-      rescue ActiveJob::UnknownJobClassError
-        false
-      end
-    else
-      def respond_to?(*, **)
-        super
-      rescue NameError
-        false
-      end
+    def respond_to?(*, **)
+      super
+    rescue NameError => e
+      raise if defined?(ActiveJob::UnknownJobClassError) && !e.is_a?(ActiveJob::UnknownJobClassError)
+
+      false
     end
 
     def before(record)

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/spec/delayed_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'helper'
+
+describe Delayed do
+  describe "require 'delayed'" do
+    it 'loads standalone, without active_record or active_job pre-required' do
+      script = <<~RUBY
+        raise 'expected ActiveRecord to not be loaded yet' if defined?(ActiveRecord)
+        raise 'expected ActiveJob to not be loaded yet' if defined?(ActiveJob)
+
+        require 'delayed'
+
+        raise 'expected ActiveJob to not be loaded' if defined?(ActiveJob)
+
+        require 'active_job'
+        ActiveJob::Base # fire the on_load(:active_job) hook
+
+        raise 'expected DelayedAdapter to be registered' unless defined?(ActiveJob::QueueAdapters::DelayedAdapter)
+      RUBY
+
+      lib = File.expand_path('../lib', __dir__)
+      expect(system(RbConfig.ruby, '-I', lib, '-e', script)).to eq(true)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Nathan Griffith
@@ -135,6 +135,7 @@ files:
 - spec/delayed/priority_spec.rb
 - spec/delayed/serialization/active_record_spec.rb
 - spec/delayed/tasks_spec.rb
+- spec/delayed_spec.rb
 - spec/helper.rb
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
@@ -188,6 +189,7 @@ test_files:
 - spec/delayed/priority_spec.rb
 - spec/delayed/serialization/active_record_spec.rb
 - spec/delayed/tasks_spec.rb
+- spec/delayed_spec.rb
 - spec/helper.rb
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb