carrierwave_backgrounder 1.0.0.beta → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda9969a160f0cfc9714cb3643586d4e870b84ef63cedbba52272b2e34eef174
-  data.tar.gz: ba9f80b446ada55016553a08b31b3660d279691d59d1397f975c5a356ad26584
+  metadata.gz: 6a99c578fbe6a6a70dc4139f3d09573f21eedd63745ca9f1020639a0b11866b1
+  data.tar.gz: 4ca00a0ca9da687600ecbd15422a6cd205592cb4f65e98a91b021ce41e352e81
 SHA512:
-  metadata.gz: 833f6072005f58a56b2d25d7cd19efd8598df6f98f66607212ed1eee7f4df4f6c46432ca8ca65dae34a348f27567007ef7f4e38459bb522bc0fb391495699441
-  data.tar.gz: 90365ff21d412eeb47da2ce084b93ad4eea0287592d472d326e4dcaabf0a50f0b2ebe9e0b172bb7bec3f57d099e8689d41393a5efa9fc0b2d5cae0902b2493f1
+  metadata.gz: d6ef9643b504bff575e97ef7cce7e8d3609efa1315fe77f46f3b6581602e69df8a55696ed3bef03b67cccc9701b55d9e8f74f1cfdec06f3acf6327b6d5670c3d
+  data.tar.gz: b30c5829139120d51681bf9d36503f365e6c273c1c0af73bca63b885fffbbe61bfdc2c777a147b541e3d73d5e45dcb704dd7f3dd4e758c68891022a7acc0e486

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/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.0-beta.2
+
+### enhancements
+  * Now fully testing using different queue_adapters in CI
+
+### bugfixes
+  * Fix issue loading active_job
+
 ## 1.0.0-beta
 
 ### enhancements
@@ -9,9 +17,8 @@
   * Fix issue where a new job would be queued when a upload was removed
 
 ### breaking changes
-  * Remove support for Rails prior to after_commit
+  * Remove support for after_save in favor of after_commit
   * Remove support for queueing systems other than ActiveJob and Sidekiq.
-    This will simplify support and offload the heavy lifting to ActiveJob
 
 ## 0.4.3
 

data/README.md

@@ -161,7 +161,7 @@ Each method, #store_in_background and #process_in_background has there own worke
 
 class User < ActiveRecord::Base
   mount_uploader :avatar, AvatarUploader
-  process_in_background, :avatar, MyParanoidWorker
+  process_in_background :avatar, MyParanoidWorker
 end
 
 class MyParanoidWorker < ::CarrierWave::Workers::ProcessAsset
@@ -180,7 +180,7 @@ end
 
 class User < ActiveRecord::Base
   mount_uploader :avatar, AvatarUploader
-  process_in_background, :avatar, MyActiveJobWorker
+  process_in_background :avatar, MyActiveJobWorker
 end
 
 class MyActiveJobWorker < ::CarrierWave::Workers::ActiveJob::StoreAsset

data/lib/backgrounder/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Backgrounder
-    VERSION = "1.0.0.beta"
+    VERSION = "1.0.0"
   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/base.rb

@@ -32,10 +32,6 @@ module CarrierWave
       def constantized_resource
         klass.is_a?(String) ? klass.constantize : klass
       end
-
-      def when_not_ready
-      end
-
     end # Base
 
   end # 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

@@ -16,8 +16,6 @@ module GlobalMacros
   end
 
   def process_latest_sidekiq_job
-    job = Sidekiq::Queues["carrierwave"].pop
-    worker = job['class'].constantize.new(*job['args'])
-    worker.perform
+    Sidekiq::Job.drain_all
   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
 platform: ruby
 authors:
 - Larry Sprock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -248,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: