carrierwave_backgrounder 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,7 +1,17 @@
+## 0.1.4
+
+### bug fixes
+  * [#109] Fix issue where setting Carrierwave.cache_dir to a full path would raise an exception [Sastopher].
+  * [#108] Remove the need to set an order in the Gemfile when using sidekiq [matthewsmart].
+
 ## 0.1.3
 
 ### enhancements
   * CarrierWave::Workers::ProcessAsset now uses #update_attribute when setting [column]_processing.
+  * [#104] Change the Sidekiq integration to use client_push [petergoldstein]
+
+### bug fixes
+  * [#103] Fix determine_backend behavior so that it doesn't throw an exception [petergoldstein].
 
 ## 0.1.2
 

data/README.md

@@ -1,7 +1,8 @@
-# CarrierWave Backgrounder 
+# CarrierWave Backgrounder
 
 [![Build Status](https://secure.travis-ci.org/lardawge/carrierwave_backgrounder.png)](http://travis-ci.org/lardawge/carrierwave_backgrounder)
 [![Code Quality](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lardawge/carrierwave_backgrounder)
+[![Still Maintained](http://stillmaintained.com/lardawge/carrierwave_backgrounder.png)](http://stillmaintained.com/lardawge/carrierwave_backgrounder)
 
 I like CarrierWave. That being said, I don't like tying up app instances waiting for images to process.
 
@@ -38,8 +39,6 @@ These instructions assume you have previously set up [CarrierWave](https://githu
 In Rails, add the following your Gemfile:
 
 ```ruby
-# IMPORTANT: Be sure to list the backend job processor you intend to use, before carrierwave_backgrounder
-gem 'sidekiq' # or delayed_job, resque, ect...
 gem 'carrierwave_backgrounder'
 ```
 
@@ -131,6 +130,35 @@ We use the after_commit hook when using active_record. This creates a problem wh
 if you're using trasactional fixtures. One solution to the problem is to use the [TestAfterCommit gem](https://github.com/grosser/test_after_commit).
 There are various other solutions in which case google is your friend.
 
+### Uploaders mounted on mongoid embedded documents
+The workers fetch the document with the mounted uploader using the model class name and id. Uploads on embedded documents
+cannot be obtained this way. If the position of the document in the root document structure is known, a workaround is to override the embedded models
+find method like this:
+
+```ruby
+class SomeRootDocument
+  include Mongoid::Document
+
+  embeds_many :embedded_documents
+end
+
+class EmbeddedDocument
+  include Mongoid::Document
+
+  embedded_in :some_root_document
+
+  mount_uploader :image, ImageUploader
+  process_in_background :image
+
+  def self.find(id)
+    bson_id = Moped::BSON::ObjectId.from_string(id) # needed for Mongoid 3
+
+    root = SomeRootDocument.where('embedded_documents._id' => bson_id).first
+    root.embedded_documents.find(id)
+  end
+end
+```
+
 ## License
 
 Copyright (c) 2011 Larry Sprock

data/lib/backgrounder/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Backgrounder
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   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)
@@ -37,7 +36,7 @@ module CarrierWave
 
       def store_directories(record)
         asset, asset_tmp = record.send(:"#{column}"), record.send(:"#{column}_tmp")
-        cache_directory  = File.join(asset.root, asset.cache_dir)
+        cache_directory  = File.expand_path(asset.cache_dir, asset.root)
         @cache_path      = File.join(cache_directory, asset_tmp)
         @tmp_directory   = File.join(cache_directory, asset_tmp.split("/").first)
       end

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/workers/store_asset_spec.rb

@@ -86,4 +86,53 @@ describe CarrierWave::Workers::StoreAsset do
       expect(worker.column).to eql(:avatar)
     end
   end
+
+  describe '#store_directories' do
+    let(:record) { mock('Record') }
+    let(:root) { '/home/chris/dev/my-rails-project/public' }
+
+    context 'cache_path' do
+      it 'sets the cache_path correctly if a full path is set for the cache_dir' do
+        root = '/Users/lar/Sites/bunker/public'
+        cache_dir = '/Users/lar/Sites/bunker/tmp/uploads'
+        asset = mock(:cache_dir => cache_dir, :root => root)
+        record.expects(:image).returns(asset)
+        record.expects(:image_tmp).returns('images/test.jpg')
+        worker.send :store_directories, record
+        expect(worker.cache_path).to eql('/Users/lar/Sites/bunker/tmp/uploads/images/test.jpg')
+      end
+
+      it 'sets the cache_path correctly if a partial path is set for cache_dir' do
+        root = '/Users/lar/Sites/bunker/public'
+        cache_dir = 'uploads/tmp'
+        asset = mock(:cache_dir => cache_dir, :root => root)
+        record.expects(:image).returns(asset)
+        record.expects(:image_tmp).returns('images/test.jpg')
+        worker.send :store_directories, record
+        expect(worker.cache_path).to eql('/Users/lar/Sites/bunker/public/uploads/tmp/images/test.jpg')
+      end
+    end
+
+    context 'tmp_directory' do
+      it 'sets the tmp_directory correctly if a full path is set for the cache_dir' do
+        root = '/Users/lar/Sites/bunker/public'
+        cache_dir = '/Users/lar/Sites/bunker/tmp/uploads'
+        asset = mock(:cache_dir => cache_dir, :root => root)
+        record.expects(:image).returns(asset)
+        record.expects(:image_tmp).returns('images/test.jpg')
+        worker.send :store_directories, record
+        expect(worker.tmp_directory).to eql('/Users/lar/Sites/bunker/tmp/uploads/images')
+      end
+
+      it 'sets the tmp_directory correctly if a partial path is set for cache_dir' do
+        root = '/Users/lar/Sites/bunker/public'
+        cache_dir = 'uploads/tmp'
+        asset = mock(:cache_dir => cache_dir, :root => root)
+        record.expects(:image).returns(asset)
+        record.expects(:image_tmp).returns('images/test.jpg')
+        worker.send :store_directories, record
+        expect(worker.tmp_directory).to eql('/Users/lar/Sites/bunker/public/uploads/tmp/images')
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_backgrounder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2596358502417703338
+      hash: 1765216748357494122
 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: -2596358502417703338
+      hash: 1765216748357494122
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24