carrierwave_backgrounder 0.1.5 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.0
+
+### enhancements
+  * [Breaking Change] Require configure block to be set in an initializer removing autodetect backend.
+
+### bug fixes
+  * [#108] Remove the need to set an order in the Gemfile when using sidekiq [matthewsmart].
+
 ## 0.1.5
 
 ### bug fixes

data/lib/backgrounder/support/backends.rb

@@ -12,21 +12,7 @@ module Support
       def backend(queue_name=nil, args={})
         return @backend if @backend
         @queue_options = args
-        @backend = queue_name and return if queue_name
-        determine_backend
-      end
-
-      def available_backends
-        @available_backends ||= begin
-          backends = []
-          backends << :girl_friday if defined? ::GirlFriday
-          backends << :delayed_job if defined? ::Delayed::Job
-          backends << :resque      if defined? ::Resque
-          backends << :qu          if defined? ::Qu
-          backends << :sidekiq     if defined? ::Sidekiq
-          backends << :qc          if defined? ::QC
-          backends
-        end
+        @backend = queue_name
       end
 
       def enqueue_for_backend(worker, class_name, subject_id, mounted_as)
@@ -35,18 +21,6 @@ module Support
 
       private
 
-      def determine_backend
-        @backend = if available_backends.empty?
-          warn 'WARNING: No available queue backends found for CarrierWave::Backgrounder. Using the :immediate.'
-          :immediate
-        elsif available_backends.size > 1
-          raise ::CarrierWave::Backgrounder::TooManyBackendsAvailableError,
-            "You have too many backends available: #{available_backends.inspect}. Please specify which one to use in configuration block"
-        else
-          available_backends.first
-        end
-      end
-
       def enqueue_delayed_job(worker, *args)
         ::Delayed::Job.enqueue worker.new(*args), :queue => queue_options[:queue]
       end

data/lib/backgrounder/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Backgrounder
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/lib/backgrounder/workers/process_asset.rb

@@ -3,8 +3,6 @@ module CarrierWave
   module Workers
 
     class ProcessAsset < Struct.new(:klass, :id, :column)
-      include ::Sidekiq::Worker if defined?(::Sidekiq)
-
       def self.perform(*args)
         new(*args).perform
       end

data/lib/backgrounder/workers/store_asset.rb

@@ -3,7 +3,6 @@ module CarrierWave
   module Workers
 
     class StoreAsset < Struct.new(:klass, :id, :column)
-      include ::Sidekiq::Worker if defined?(::Sidekiq)
       attr_reader :cache_path, :tmp_directory
 
       def self.perform(*args)

data/lib/carrierwave_backgrounder.rb

@@ -12,6 +12,16 @@ module CarrierWave
 
     def self.configure
       yield self
+      if @backend == :sidekiq
+        ::CarrierWave::Workers::ProcessAsset.class_eval do
+          require 'sidekiq'
+          include ::Sidekiq::Worker
+        end
+        ::CarrierWave::Workers::StoreAsset.class_eval do
+          require 'sidekiq'
+          include ::Sidekiq::Worker
+        end
+      end
     end
 
   end

data/spec/backgrounder/support/backends_spec.rb

@@ -9,32 +9,6 @@ describe Support::Backends do
     mock_module.send :include, Support::Backends
   end
 
-  describe 'enumerating available backends' do
-    it 'detects GirlFriday' do
-      expect(mock_module.available_backends).to include(:girl_friday)
-    end
-
-    it 'detects Delayed::Job' do
-      expect(mock_module.available_backends).to include(:delayed_job)
-    end
-    
-    it 'detects Resque' do
-      expect(mock_module.available_backends).to include(:resque)
-    end
-    
-    it 'detects Qu' do
-      expect(mock_module.available_backends).to include(:qu)
-    end
-    
-    it 'detects Sidekiq' do
-      expect(mock_module.available_backends).to include(:sidekiq)
-    end
-    
-    it 'detects QC' do
-      expect(mock_module.available_backends).to include(:qc)
-    end
-  end
-
   describe 'setting backend' do
     it 'using #backend=' do
       mock_module.backend = :delayed_job
@@ -52,36 +26,6 @@ describe Support::Backends do
     end
   end
 
-  describe 'auto detect backends' do
-    before do
-      mock_module.instance_variable_set('@backend', nil)
-    end
-
-    it 'sets the backend to immediate if none available' do
-      suppress_warnings do
-        mock_module.stubs(:available_backends).returns([])
-        expect(mock_module.backend).to eql(:immediate)
-      end
-    end
-
-    it 'sets a backend automatically if only one is available' do
-      mock_module.stubs(:available_backends).returns([ :qu ])
-      expect(mock_module.backend).to eql(:qu)
-    end
-    
-    it 'raises an error if more than one backend is available' do
-      mock_module.stubs(:available_backends).returns([:qu, :resque])
-      expect {
-       mock_module.backend
-      }.to raise_error(CarrierWave::Backgrounder::TooManyBackendsAvailableError)
-    end
-
-    it 'does not clobber a manually set backend' do
-      mock_module.backend = :not_a_backend
-      expect(mock_module.backend).to eql(:not_a_backend)
-    end
-  end
-
   describe '#enqueue_for_backend' do
     let!(:worker) { MockWorker.new('FakeClass', 1, :image) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_backgrounder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3846294144545899718
+      hash: 517086272646554403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3846294144545899718
+      hash: 517086272646554403
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24