delayed_job_bulk 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c11cf8af193726ad0b4d538c0737dfbd5a69c722c1c53cbe98f3a5f10b0951
-  data.tar.gz: 02be4625112103fdb3df05d714a6d5145c796007a7ae12095e1434986f4dd682
+  metadata.gz: 7abd45f410fcaa48ca0bd2dc2632aa3c933bbe2d6cf4a42e3e2e0ae758c30b2f
+  data.tar.gz: ee8914210571586ba659ad13edf4e0c30a99f7ec815acb229a3da75b5ffc7331
 SHA512:
-  metadata.gz: 24fcebb44d2fbe234b950e99fd62ebbb575b075490c6ef9a567553cd1a7f02feb32311ed79ab11e0faf4cadf082e70739c701dfbf0d8cbf825898d844ac4f06d
-  data.tar.gz: 5292c1c9d65ea58c24afcf505a0bafc0b42bddc305f1c51584f421b6e43af0ad2c157bdc9a502eda96b223ac72dc60f0cce5a2cd78b215475b8c080ff6b14972
+  metadata.gz: 9906141a363f051a90b76e6a6b0689caee3b2cd2a4b7408526206e95acaba7cf2e6cb58db1a2664408d5ca3630e7dfc506796ec981c61be35694ecc6df8931fd
+  data.tar.gz: 2cc4a84c227378de9f20049b9a331392f48f22275c186e08501e02704f97695d348ada0df3a70ca35153436f3dd3c6a97c3de912f522e194dbed9c66d01e1864

data/.github/workflows/ci.yml

@@ -24,9 +24,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, 3.3]
-        gemfile: ['rails60', 'rails61', 'rails70', 'rails71']
+        ruby: [2.7, '3.0', 3.1, 3.2, 3.3, 3.4]
+        gemfile: ['rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80']
         database: ['postgresql', 'mysql', 'sqlite']
+        exclude:
+          - ruby: 2.7
+            gemfile: rails72
+          - ruby: 2.7
+            gemfile: rails80
+          - ruby: 3.0
+            gemfile: rails72
+          - ruby: 3.0
+            gemfile: rails80
+          - ruby: 3.1
+            gemfile: rails80
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}, ${{ matrix.database }}
 
@@ -42,6 +53,9 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+    - name: Bundle list
+      run: |
+        bundle list
     - name: Prepare test
       run: |
         cd spec/dummy

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.1.1
+
+* Support run_at setting for activejob >= 7.0.
+
+## 1.1.0
+
+* Support perform_all_later for activejob >= 7.1.
+
 ## 1.0.1
 
 * Add `frozen_string_literal: true`.

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rails"
+gem "sqlite3"
+gem "mysql2"
+gem "pg"

data/delayed_job_bulk.gemspec

@@ -24,12 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "delayed_job_active_record", ">= 4.1"
   spec.add_dependency "activesupport", ">= 6.0"
   spec.add_dependency "activerecord", ">= 6.0"
+  spec.add_dependency "activejob", ">= 6.0"
 
-  spec.add_development_dependency "rails"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "sqlite3"
 end

data/gemfiles/rails60.gemfile

@@ -2,6 +2,17 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4.0"
+gem "mysql2"
+gem "pg"
+
 gem "psych", "~> 3.3.0"
+gem "concurrent-ruby", "<= 1.3.4"
+
+if RUBY_VERSION >= "3.4"
+  gem "base64"
+  gem "bigdecimal"
+  gem "drb"
+  gem "mutex_m"
+end
 
 gemspec path: "../"

data/gemfiles/rails61.gemfile

@@ -2,5 +2,16 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 6.1.0"
 gem "sqlite3", "~> 1.4.0"
+gem "mysql2"
+gem "pg"
+
+gem "concurrent-ruby", "<= 1.3.4"
+
+if RUBY_VERSION >= "3.4"
+  gem "base64"
+  gem "bigdecimal"
+  gem "drb"
+  gem "mutex_m"
+end
 
 gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -2,5 +2,16 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 7.0.1"
 gem "sqlite3", "~> 1.4.0"
+gem "mysql2"
+gem "pg"
+
+gem "concurrent-ruby", "<= 1.3.4"
+
+if RUBY_VERSION >= "3.4"
+  gem "base64"
+  gem "bigdecimal"
+  gem "drb"
+  gem "mutex_m"
+end
 
 gemspec path: "../"

data/gemfiles/rails71.gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 7.1.0"
 gem "sqlite3", "~> 1.6.6"
+gem "mysql2"
+gem "pg"
 
 gemspec path: "../"

data/gemfiles/rails72.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 7.2.0"
+gem "sqlite3"
+gem "mysql2"
+gem "pg"
+
+gemspec path: "../"

data/gemfiles/rails80.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 8.0.0"
+gem "sqlite3"
+gem "mysql2"
+gem "pg"
+
+gemspec path: "../"

data/lib/delayed/backend/bulk/enqueue_all.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Delayed
+  module Backend
+    class Bulk
+      module EnqueueAll
+        def enqueue_all(jobs)
+          Delayed::Backend::Bulk.enqueue(jobs).size
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load :active_job do
+  ActiveJob::QueueAdapters::DelayedJobAdapter.include Delayed::Backend::Bulk::EnqueueAll
+end

data/lib/delayed/backend/bulk/version.rb

@@ -3,7 +3,7 @@
 module Delayed
   module Backend
     class Bulk
-      VERSION = "1.0.1"
+      VERSION = "1.1.1"
     end
   end
 end

data/lib/delayed/backend/bulk.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'bulk/callbacks'
+require_relative 'bulk/enqueue_all'
 
 module Delayed
   module Backend
@@ -26,7 +27,7 @@ module Delayed
           end
         end
 
-        @jobs
+        @valid_jobs
       end
 
       private
@@ -36,7 +37,8 @@ module Delayed
           Delayed::Backend::JobPreparer.new(
             ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(active_job.serialize),
             queue: active_job.queue_name,
-            priority: active_job.priority
+            priority: active_job.priority,
+            run_at: build_run_at(active_job.scheduled_at)
           ).prepare
         ).tap do |job|
           job.created_at = current_time
@@ -44,6 +46,14 @@ module Delayed
         end
       end
 
+      def build_run_at(scheduled_at)
+        if scheduled_at.is_a?(Float)
+          Time.at(scheduled_at)
+        else
+          scheduled_at
+        end
+      end
+
       def current_time
         @current_time ||= Time.zone.now
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_bulk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '6.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,48 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Bulk insert many jobs at once for delayed_job
 email:
 - kaneta@sitebridge.co.jp
@@ -184,8 +142,11 @@ files:
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
 - gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
 - lib/delayed/backend/bulk.rb
 - lib/delayed/backend/bulk/callbacks.rb
+- lib/delayed/backend/bulk/enqueue_all.rb
 - lib/delayed/backend/bulk/version.rb
 - lib/delayed_job_bulk.rb
 homepage: https://github.com/kanety/delayed_job_bulk
@@ -207,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Bulk insert many jobs at once for delayed_job