delayed_paperclip 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9010ad7ec352347ca5ced4c58ad626abdd107884
-  data.tar.gz: d1cf800afb079df8745c01b64195dc49cbf8d723
+  metadata.gz: d9d8e927d5a6ecdf619755a0593874e1d6aa9125
+  data.tar.gz: e3408926c0a1b18b5f850dd2396ffcb767edd893
 SHA512:
-  metadata.gz: c766c2943099e7002d32750efff2d7e89563b01cb0d79d564323bc33768ff8e2a052c70b22e777a926d346a3943495a4421cc6ce6f5679eb9e4ab5d526ded1ee
-  data.tar.gz: c05abd61fc10c51a0fe5299dfa9b1d0bf5b7b697cbf24e6284923bd18e5a328c9274d71aaeef7548f72e2c0391b44deff848940dcd2ecc7685ccf9a29011b470
+  metadata.gz: 4e2c42c5a2babfc35dc485b990a587d6eb77081c6e26d23c163926c2152a981a3a1a08c11a5f463b351e115db20436cf43c2771d20d96fc9a1ef7633ce468dfc
+  data.tar.gz: e4168634498e359e1b6969feecf5c164be9858b521172a6f8ef79977cf17ef7add5d105586af5d3bddeca85734bbfae0d03f466737f29c6cfba859f280d53a6e

data/.travis.yml

@@ -1,21 +1,23 @@
 language: ruby
+
 rvm:
-  - 2.1.0
-  - 1.9.3
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
+  - 2.1
+  - 2.0
+
+gemfile:
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+
+sudo: false
+
 services:
   - redis
-script: "bundle exec rake clean test spec"
+
+script: "bundle exec rake clean spec"
+
 notifications:
   email:
     - james@jamesrgifford.com
     - scott@artsicle.com
-gemfile:
-  - gemfiles/rails3_1.gemfile
-  - gemfiles/rails3_2.gemfile
-  - gemfiles/rails4.gemfile
-
 

data/Appraisals

@@ -1,11 +1,19 @@
-appraise "rails3_1" do
-  gem "rails", "~> 3.1.12"
+appraise "3.2" do
+  gem "rails", "~> 3.2.15"
+  gem "delayed_paperclip", path: "../"
 end
 
-appraise "rails3_2" do
-  gem "rails", "~> 3.2.17"
+appraise "4.0" do
+  gem "rails", "~> 4.0.0"
+  gem "delayed_paperclip", path: "../"
 end
 
-appraise "rails4" do
-  gem "rails", "~> 4.0.3"
+appraise "4.1" do
+  gem "rails", "~> 4.1.0"
+  gem "delayed_paperclip", path: "../"
+end
+
+appraise "4.2" do
+  gem "rails", "~> 4.2.0"
+  gem "delayed_paperclip", path: "../"
 end

data/README.md

@@ -0,0 +1,275 @@
+Delayed::Paperclip [![Build Status](https://travis-ci.org/jrgifford/delayed_paperclip.svg?branch=master)](https://travis-ci.org/jrgifford/delayed_paperclip) [![Code Climate](https://codeclimate.com/github/jrgifford/delayed_paperclip.png)](https://codeclimate.com/github/jrgifford/delayed_paperclip)
+======================================================================================
+
+
+DelayedPaperclip lets you process your [Paperclip](http://github.com/thoughtbot/paperclip) attachments in a
+background task with [DelayedJob](https://github.com/collectiveidea/delayed_job), [Resque](https://github.com/resque/resque) or [Sidekiq](https://github.com/mperham/sidekiq).
+
+Why?
+----
+
+The most common use case for Paperclip is to easily attach image files
+to ActiveRecord models. Most of the time these image files will have
+multiple styles and will need to be resized when they are created. This
+is usually a pretty [slow operation](http://www.jstorimer.com/ruby/2010/01/05/speep-up-your-paperclip-tests.html) and should be handled in a
+background task.
+
+I’m sure that everyone knows this, this gem just makes it easy to do.
+
+Installation
+------------
+
+Install the gem:
+
+````
+gem install delayed_paperclip
+````
+
+Or even better, add it to your Gemfile.
+
+````
+source "https://rubygems.org"
+gem 'delayed_paperclip'
+````
+
+Dependencies:
+
+-   Paperclip
+-   DJ, Resque or Sidekiq
+
+Usage
+-----
+
+In your model:
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, styles: {
+                                       medium: "300x300>",
+                                       thumb: "100x100>"
+                                     }
+
+  process_in_background :avatar
+end
+````
+
+Use your Paperclip attachment just like always in controllers and views.
+
+To select between using Resque or Delayed::Job, just install and
+configure your choice properly within your application, and
+delayed_paperclip will do the rest. It will detect which library is
+loaded and make a decision about which sort of job to enqueue at that
+time.
+
+### Resque
+
+Make sure that you have [Resque](https://github.com/resque/resque) up and running. The jobs will be
+dispatched to the <code>:paperclip</code> queue, so you can correctly
+dispatch your worker. Configure resque and your workers exactly as you
+would otherwise.
+
+### DJ
+
+Just make sure that you have DJ up and running.
+
+### Sidekiq
+
+Make sure that [Sidekiq](http://github.com/mperham/sidekiq) is running and listening to the
+`paperclip` queue, either by adding it to your
+`sidekiq.yml` config file under `- queues:` or by
+passing the command line argument `-q paperclip` to Sidekiq.
+
+### Displaying images during processing
+
+In the default setup, when you upload an image for the first time and
+try to display it before the job has been completed, Paperclip will be
+none the wiser and output the url of the image which is yet to be
+processed, which will result in a broken image link being displayed on
+the page.
+
+To have the missing image url be outputted by paperclip while the image is being processed, all you need to do is add a
+`#{attachment_name}_processing` column to the specific model you want
+to enable this feature for. This feature gracefully degrades and will not affect models which do not have the column added to them.
+
+````ruby
+class AddAvatarProcessingToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :avatar_processing, :boolean
+  end
+
+  def self.down
+    remove_column :users, :avatar_processing
+  end
+end
+
+@user = User.new(avatar: File.new(...))
+@user.save
+@user.avatar.url #=> "/images/original/missing.png"
+Delayed::Worker.new.work_off
+
+@user.reload
+@user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
+````
+
+#### Custom image for processing
+
+This is useful if you have a difference between missing images and
+images currently being processed.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar
+
+  process_in_background :avatar, processing_image_url: "/images/original/processing.jpg"
+end
+
+@user = User.new(avatar: File.new(...))
+@user.save
+@user.avatar.url #=> "/images/original/processing.png"
+Delayed::Worker.new.work_off
+
+@user.reload
+@user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
+````
+
+You can also define a custom logic for `processing_image_url`, for
+example to display the original\
+picture while specific formats are being processed.
+
+````ruby
+class Item < ActiveRecord::Base
+  has_attached_file :photo
+
+  process_in_background :photo, processing_image_url: :processing_image_fallback
+
+  def processing_image_fallback
+    options = photo.options
+    options[:interpolator].interpolate(options[:url], photo, :original)
+  end
+end
+````
+
+#### Have processing? status available, but construct image URLs as if delayed_paperclip wasn’t present
+
+If you define the `#{attachment_name}_processing` column, but set the
+`url_with_processing` option to false, this opens up other options (other than modifying the url that paperclip returns) for giving feedback to the user while the image is processing. This is useful for advanced situations, for example when dealing with caching systems.
+
+Note especially the method #processing? which passes through the value
+of the boolean created via migration.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar
+
+  process_in_background :avatar, url_with_processing: false
+end
+
+@user = User.new(avatar: File.new(...))
+@user.save
+@user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
+@user.avatar.processing? #=> true
+Delayed::Worker.new.work_off
+
+@user.reload
+@user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
+@user.avatar.processing? #=> false
+````
+
+#### Only process certain styles
+
+This is useful if you don’t want the background job to reprocess all
+styles.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+
+  process_in_background :avatar, only_process: [:small]
+end
+````
+
+Like paperclip, you could also supply a lambda function to define
+`only_process` dynamically.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+
+  process_in_background :avatar, only_process: lambda { |a| a.instance.small_supported? ? [:small, :large] : [:large] }
+end
+````
+
+#### Split processing
+
+You can process some styles in the foreground and some in the background
+by setting `only_process` on both `has_attached_file` and
+`process_in_background`.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }, only_process: [:small]
+
+  process_in_background :avatar, only_process: [:medium]
+end
+````
+
+#### Reprocess Without Delay
+
+This is useful if you don’t want the background job. It accepts
+individual styles to. Take note, normal `reprocess!` does not accept styles as arguments anymore. It will delegate to DelayedPaperclip and
+reprocess all styles.
+
+````ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+
+  process_in_background :avatar
+end
+
+@user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
+@user.avatar.reprocess_without_delay!(:medium)
+````
+
+Defaults
+--------
+
+Global defaults for all delayed_paperclip instances in your app can be
+defined by changing the DelayedPaperclip.options Hash, this can be useful for setting a default ‘processing image,’ so you won’t have to define it in every `process_in_background` definition.
+
+If you’re using Rails you can define a Hash with default options in
+config/application.rb or in any of the config/environments/\*.rb files on `config.delayed_paperclip_defaults`, these will get merged into DelayedPaperclip.options as your Rails app boots. An example:
+
+````
+module YourApp
+  class Application < Rails::Application
+    # Other code...
+
+    config.delayed_paperclip_defaults = {
+        url_with_processing: true,
+        processing_image_url: 'custom_processing.png'
+    }
+  end
+end
+````
+
+What if I’m not using images?
+-----------------------------
+
+This library works no matter what kind of post-processing you are doing
+with Paperclip.
+
+Does it work with s3?
+---------------------
+
+Yes.
+
+Contributing
+------------
+
+Checkout out CONTRIBUTING. In short, you’ll need a redis server running
+for testing. Run all tests with
+
+````
+# Rspec on all versions
+rake appraisal spec
+````

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 
 desc 'Default: run unit tests.'
-task :default => [:clean, 'appraisal:install', :all]
+task default: [:clean, 'appraisal:install', :all]
 
 desc 'Test the delayed paperclip plugin under all supported Rails versions.'
 task :all do |t|

data/delayed_paperclip.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'paperclip', [">= 3.3"]
 
   s.add_development_dependency 'mocha'
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", '< 3.0'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'delayed_job'
   s.add_development_dependency 'delayed_job_active_record'
   s.add_development_dependency 'resque'
-  s.add_development_dependency 'sidekiq'
+  s.add_development_dependency 'sidekiq', '< 3.0'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'

data/gemfiles/3.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2.15"
+gem "delayed_paperclip", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/{rails3_2.gemfile.lock → 3.2.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
-    delayed_paperclip (2.7.1)
+    delayed_paperclip (2.8.0)
       paperclip (>= 3.3)
 
 GEM
@@ -34,27 +34,28 @@ GEM
     activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    appraisal (0.5.2)
+    appraisal (1.0.2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (3.0.3)
     builder (3.0.4)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (2.0.0)
-    delayed_job (4.0.0)
-      activesupport (>= 3.0, < 4.1)
-    delayed_job_active_record (4.0.0)
-      activerecord (>= 3.0, < 4.1)
+    connection_pool (2.1.0)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     journey (1.0.4)
     json (1.8.1)
     mail (2.5.4)
@@ -62,11 +63,11 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mocha (1.0.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.8.4)
-    paperclip (4.1.1)
+    multi_json (1.10.1)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -75,7 +76,7 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-ssl (1.3.3)
       rack
@@ -96,33 +97,33 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.1)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    redis (3.2.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sidekiq (2.17.7)
-      celluloid (>= 0.15.2)
-      connection_pool (>= 1.0.0)
+    rspec-mocks (2.99.2)
+    sidekiq (2.17.8)
+      celluloid (= 0.15.2)
+      connection_pool (~> 2.0)
       json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    sinatra (1.4.4)
+      redis (~> 3.1)
+      redis-namespace (~> 1.3)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -131,8 +132,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    thor (0.18.1)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
     tilt (1.4.1)
     timers (1.1.0)
     treetop (1.4.15)
@@ -152,10 +153,10 @@ DEPENDENCIES
   delayed_job_active_record
   delayed_paperclip!
   mocha
-  rails (~> 3.2.17)
+  rails (~> 3.2.15)
   railties
   rake
   resque
-  rspec
-  sidekiq
+  rspec (< 3.0)
+  sidekiq (< 3.0)
   sqlite3

data/gemfiles/4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "delayed_paperclip", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/{rails4.gemfile.lock → 4.0.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
-    delayed_paperclip (2.7.1)
+    delayed_paperclip (2.8.0)
       paperclip (>= 3.3)
 
 GEM
@@ -31,28 +31,28 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (4.0.2)
-    atomic (1.1.14)
     builder (3.1.4)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (2.0.0)
-    delayed_job (4.0.0)
-      activesupport (>= 3.0, < 4.1)
-    delayed_job_active_record (4.0.0)
-      activerecord (>= 3.0, < 4.1)
+    connection_pool (2.1.0)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -60,18 +60,18 @@ GEM
     metaclass (0.0.4)
     mime-types (1.25.1)
     minitest (4.7.5)
-    mocha (1.0.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.8.4)
-    paperclip (4.1.1)
+    multi_json (1.10.1)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     polyglot (0.3.4)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -88,35 +88,35 @@ GEM
       activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    rake (10.4.2)
+    redis (3.2.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sidekiq (2.17.7)
-      celluloid (>= 0.15.2)
-      connection_pool (>= 1.0.0)
+    rspec-mocks (2.99.2)
+    sidekiq (2.17.8)
+      celluloid (= 0.15.2)
+      connection_pool (~> 2.0)
       json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    sinatra (1.4.4)
+      redis (~> 3.1)
+      redis-namespace (~> 1.3)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.10.1)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -125,10 +125,9 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
     treetop (1.4.15)
@@ -148,10 +147,10 @@ DEPENDENCIES
   delayed_job_active_record
   delayed_paperclip!
   mocha
-  rails (~> 4.0.3)
+  rails (~> 4.0.0)
   railties
   rake
   resque
-  rspec
-  sidekiq
+  rspec (< 3.0)
+  sidekiq (< 3.0)
   sqlite3