carrierwave_backgrounder 1.0.0.beta → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda9969a160f0cfc9714cb3643586d4e870b84ef63cedbba52272b2e34eef174
-  data.tar.gz: ba9f80b446ada55016553a08b31b3660d279691d59d1397f975c5a356ad26584
+  metadata.gz: 29bf0a9e2454432c72a9799addeb1f6f059fb910766d946bb999d8b616d9d078
+  data.tar.gz: 9ab201113526a8c1cb9529f5361b6023349f7f73959ad13c075c7468d68a86c1
 SHA512:
-  metadata.gz: 833f6072005f58a56b2d25d7cd19efd8598df6f98f66607212ed1eee7f4df4f6c46432ca8ca65dae34a348f27567007ef7f4e38459bb522bc0fb391495699441
-  data.tar.gz: 90365ff21d412eeb47da2ce084b93ad4eea0287592d472d326e4dcaabf0a50f0b2ebe9e0b172bb7bec3f57d099e8689d41393a5efa9fc0b2d5cae0902b2493f1
+  metadata.gz: f7dee9bd5893f749599fb804e40400f7d4b54cba1e0ea295962a9442cfbcb02b1d08fd643096d8d242adc2911e65cfcccb97e4f7ef23922d298cada2a2ec8575
+  data.tar.gz: e9465ab71a2fe0fc263121f9fc0aee60475cfe4a0f0bec2675d9194abceeaa6372272ed9bacf3867a671b7d4169c5bd51ab414897e06173c52f7aa3e67f700d8

data/.travis.yml

@@ -7,6 +7,10 @@ rvm:
  - 3.2
  - ruby-head
 
+env:
+- QUEUE_ADAPTER='sidekiq'
+- QUEUE_ADAPTER='active_job'
+
 before_install:
  - yes | gem update --system --force
  - gem install bundler

data/lib/backgrounder/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Backgrounder
-    VERSION = "1.0.0.beta"
+    VERSION = "1.0.0.beta.2"
   end
 end

data/lib/backgrounder/workers/active_job/process_asset.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require active_job
+require 'backgrounder/workers/process_asset_mixin'
 
 module CarrierWave
   module Workers

data/lib/backgrounder/workers/active_job/store_asset.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require active_job
+require 'backgrounder/workers/store_asset_mixin'
 
 module CarrierWave
   module Workers

data/lib/backgrounder/workers/process_asset.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'backgrounder/workers/process_asset_mixin'
+
 module CarrierWave
   module Workers
 

data/lib/backgrounder/workers/store_asset.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'backgrounder/workers/store_asset_mixin'
+
 module CarrierWave
   module Workers
 

data/lib/backgrounder/workers.rb

@@ -1,6 +1,4 @@
 require 'backgrounder/workers/base'
 require 'backgrounder/workers/class_methods'
-require 'backgrounder/workers/process_asset_mixin'
-require 'backgrounder/workers/store_asset_mixin'
 require 'backgrounder/workers/process_asset'
 require 'backgrounder/workers/store_asset'

data/lib/carrierwave_backgrounder.rb

@@ -18,6 +18,19 @@ module CarrierWave
       case backend
       when :active_job
         @worker_klass = "CarrierWave::Workers::ActiveJob"
+
+        require 'active_job'
+        require 'backgrounder/workers/active_job/process_asset'
+        require 'backgrounder/workers/active_job/store_asset'
+
+        queue_name = queue_options['queue'] || 'carrierwave'
+
+        ::CarrierWave::Workers::ActiveJob::ProcessAsset.class_eval do
+          queue_as queue_name
+        end
+        ::CarrierWave::Workers::ActiveJob::StoreAsset.class_eval do
+          queue_as queue_name
+        end
       when :sidekiq
         @worker_klass = "CarrierWave::Workers"
 

data/spec/support/dummy_app/config/environments/test.rb

@@ -53,6 +53,8 @@ Rails.application.configure do
   # Tell Active Support which deprecation messages to disallow.
   config.active_support.disallowed_deprecation_warnings = []
 
+  config.active_job.queue_adapter = :sidekiq
+
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 

data/spec/support/dummy_app/config/initializers/carrierwave_backgrounder.rb

@@ -1,4 +1,5 @@
+queue_adapter = ENV['QUEUE_ADAPTER'] || :active_job
 CarrierWave::Backgrounder.configure do |c|
-  # c.backend :active_job, queue: :carrierwave
-  c.backend :sidekiq, queue: :carrierwave
+  c.backend queue_adapter.to_sym, queue: :carrierwave
+  # c.backend :sidekiq, queue: :carrierwave
 end

data/spec/support/global_macros.rb

@@ -17,7 +17,13 @@ module GlobalMacros
 
   def process_latest_sidekiq_job
     job = Sidekiq::Queues["carrierwave"].pop
-    worker = job['class'].constantize.new(*job['args'])
-    worker.perform
+    worker_class = job['class']
+    worker = worker_class.constantize.new
+
+    if worker_class =~ /JobWrapper/
+      worker.perform job['args'].first
+    else
+      worker.perform(*job['args'])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_backgrounder
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Larry Sprock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave