delayed_paperclip 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1f0d20282bdd5e3eab8d4ff43625509b220a0e
-  data.tar.gz: 5b0297d6217bc386de53c31acda6f23fe3f4084f
+  metadata.gz: 39e783ff8099e58b8da9162334e1d129f0103030
+  data.tar.gz: 07f048dfc6d2f630972d05e1884da1877885b3d5
 SHA512:
-  metadata.gz: 96e7f3f1478bc5a00de81315773293ade4b58787ca2fe20f031f8db3a5143862dfe635992975fb62f4c135a32f89340edcb97ed1b9c08c4ac9e9bf3ab5edb9d8
-  data.tar.gz: faafa46d8ba2e66ae30abe9af3b55b921d8eda49a2308c35900b7eaf92413116a8c0d01128beb7fc53374ce2ddfef356dc6a4dab31ea521213e2d625caf3cc3a
+  metadata.gz: 0e54b03d471c7f99d997bc61e0dba8b3cb3ad198ade0876d411152c5fe7324ce08fe121b4883da69f5dc29b8a6cbf985009e24c4142966d175bc609d1021a6f5
+  data.tar.gz: a87ba2994e205635505b28859c58147ab7af689b3ec146421b4f6a224e903b689a313cfb443d8ebc188b8279d852dd0aa035b2a6d4bcde8157a6a7e57ccc548d

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p195
+2.0.0-p195

data/.travis.yml

@@ -1,27 +1,21 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.0
   - 1.9.3
   - rbx-19mode
-
 matrix:
   allow_failures:
     - rvm: rbx-19mode
-
 services:
   - redis
-
-script:
-- bundle exec rake clean test spec
-
+script: "bundle exec rake clean test spec"
 notifications:
   email:
     - james@jamesrgifford.com
     - scott@artsicle.com
-
 gemfile:
-  - gemfiles/rails3.gemfile
   - gemfiles/rails3_1.gemfile
   - gemfiles/rails3_2.gemfile
+  - gemfiles/rails4.gemfile
 
 

data/Appraisals

@@ -1,15 +1,11 @@
-appraise "rails3" do
-  gem "rails", "~> 3.0.10"
-end
-
 appraise "rails3_1" do
-  gem "rails", "~> 3.1.0"
+  gem "rails", "~> 3.1.12"
 end
 
 appraise "rails3_2" do
-  gem "rails", "~> 3.2.8"
+  gem "rails", "~> 3.2.17"
 end
 
-appraise "paperclip3_5" do
-  gem "paperclip", "~> 3.5"
+appraise "rails4" do
+  gem "rails", "~> 4.0.3"
 end

data/Gemfile

@@ -1,11 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
-
-gem "appraisal"
-
-gem "json",         :platforms => :ruby_18
-
-gem "delayed_job_active_record", :require => false
-
-gem 'rails'
+gemspec

data/README.textile

@@ -1,6 +1,6 @@
 h1. Delayed::Paperclip !https://travis-ci.org/jrgifford/delayed_paperclip.png?branch=master!:https://travis-ci.org/jrgifford/delayed_paperclip "!https://codeclimate.com/github/jrgifford/delayed_paperclip.png!":https://codeclimate.com/github/jrgifford/delayed_paperclip
 
-Delayed_paperclip lets you process your "Paperclip":http://github.com/thoughtbot/paperclip attachments in a background task with "delayed_job":http://github.com/tobi/delayed_job or "Resque":http://github.com/defunkt/resque.
+Delayed_paperclip lets you process your "Paperclip":http://github.com/thoughtbot/paperclip attachments in a background task with "delayed_job":http://github.com/tobi/delayed_job, "Resque":https://github.com/resque/resque or "Sidekiq":http://github.com/mperham/sidekiq.
 
 h2. Why?
 
@@ -23,7 +23,7 @@ gem 'delayed_paperclip'
 
 Dependencies:
 * Paperclip
-* DJ or Resque
+* DJ, Resque or Sidekiq
 
 h2. Usage
 
@@ -43,12 +43,16 @@ To select between using Resque or Delayed::Job, just install and configure your
 
 h3. Resque
 
-Make sure that you have "Resque":http://github.com/defunkt/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.
+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.
 
 h3. DJ
 
 Just make sure that you have DJ up and running.
 
+h3. Sidekiq
+
+Make sure that "Sidekiq":http://github.com/mperham/sidekiq is running and listening to the <code>paperclip</code> queue, either by adding it to your <code>sidekiq.yml</code> config file under <code>- queues:</code> or by passing the command line argument <code>-q paperclip</code> to Sidekiq.
+
 h3. 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.
@@ -110,6 +114,18 @@ This is useful if you don't want the background job to reprocess all styles.
   end
 </code></pre>
 
+h4. 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.
+
+<pre><code>
+  class User < ActiveRecord::Base
+    has_attached_file :avatar, :styles => { :small => "25x25#", :medium => "50x50x" }, :only_process => [:small]
+
+    process_in_background :avatar, :only_process => [:medium]
+  end
+</code></pre>
+
 h4. 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

data/Rakefile

@@ -13,7 +13,7 @@ task :default => [:clean, 'appraisal:install', :all]
 
 desc 'Test the delayed paperclip plugin under all supported Rails versions.'
 task :all do |t|
-  exec('rake appraisal test')
+  exec('rake appraisal test spec')
 end
 
 desc 'Clean up files.'

data/delayed_paperclip.gemspec

@@ -7,18 +7,23 @@ Gem::Specification.new do |s|
 
   s.authors     = ["Jesse Storimer", "Bert Goethals", "James Gifford", "Scott Carleton"]
   s.summary     = %q{Process your Paperclip attachments in the background.}
-  s.description = %q{Process your Paperclip attachments in the background with delayed_job, Resque or your own processor.}
-  s.email       = %q{james@jamesrgifford.com}
+  s.description = %q{Process your Paperclip attachments in the background with DelayedJob, Resque, Sidekiq or your own processor.}
+  s.email       = %w{james@jamesrgifford.com scott@artsicle.com}
   s.homepage    = %q{http://github.com/jrgifford/delayed_paperclip}
 
-  s.add_dependency 'paperclip', [">= 3.3.0"]
+  s.add_dependency 'paperclip', [">= 3.3"]
 
   s.add_development_dependency 'mocha'
   s.add_development_dependency "rspec"
   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 'appraisal'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'railties'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/rails3_1.gemfile

@@ -2,9 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "appraisal"
-gem "json", :platforms=>:ruby_18
-gem "delayed_job_active_record", :require=>false
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 3.1.12"
 
 gemspec :path=>"../"

data/gemfiles/rails3_1.gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: ..
   specs:
-    delayed_paperclip (2.6.1)
-      paperclip (>= 3.3.0)
+    delayed_paperclip (2.7.0)
+      paperclip (>= 3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.8)
-      actionpack (= 3.1.8)
-      mail (~> 2.3.3)
-    actionpack (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    actionmailer (3.1.12)
+      actionpack (= 3.1.12)
+      mail (~> 2.4.4)
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -21,91 +21,91 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-    activesupport (3.1.8)
-      multi_json (>= 1.0, < 1.3)
+    activeresource (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
     appraisal (0.5.2)
       bundler
       rake
     arel (2.2.3)
     builder (3.0.4)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (1.0.0)
-    delayed_job (3.0.5)
-      activesupport (~> 3.0)
-    delayed_job_active_record (0.4.4)
-      activerecord (>= 2.1.0, < 4)
-      delayed_job (~> 3.0)
-    diff-lcs (1.2.4)
+    connection_pool (1.2.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    delayed_job_active_record (4.0.0)
+      activerecord (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 4.1)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    json (1.8.0)
-    mail (2.3.3)
+    hike (1.2.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.14.0)
+    metaclass (0.0.3)
+    mime-types (1.25.1)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.2.0)
-    paperclip (3.5.0)
+    multi_json (1.8.4)
+    paperclip (4.1.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
-    polyglot (0.3.3)
-    rack (1.3.6)
+    polyglot (0.3.4)
+    rack (1.3.10)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-protection (1.5.0)
+    rack-protection (1.5.2)
       rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.8)
-      actionmailer (= 3.1.8)
-      actionpack (= 3.1.8)
-      activerecord (= 3.1.8)
-      activeresource (= 3.1.8)
-      activesupport (= 3.1.8)
+    rails (3.1.12)
+      actionmailer (= 3.1.12)
+      actionpack (= 3.1.12)
+      activerecord (= 3.1.12)
+      activeresource (= 3.1.12)
+      activesupport (= 3.1.12)
       bundler (~> 1.0)
-      railties (= 3.1.8)
-    railties (3.1.8)
-      actionpack (= 3.1.8)
-      activesupport (= 3.1.8)
+      railties (= 3.1.12)
+    railties (3.1.12)
+      actionpack (= 3.1.12)
+      activesupport (= 3.1.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (10.0.4)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
-    resque (1.24.1)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.2)
@@ -115,16 +115,16 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sidekiq (2.12.1)
-      celluloid (>= 0.14.1)
+    rspec-mocks (2.14.5)
+    sidekiq (2.17.6)
+      celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
-      redis (>= 3.0)
-      redis-namespace
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -133,14 +133,14 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     thor (0.14.6)
     tilt (1.4.1)
     timers (1.1.0)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -149,12 +149,14 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bundler
   delayed_job
   delayed_job_active_record
   delayed_paperclip!
-  json
   mocha
-  rails (~> 3.1.0)
+  rails (~> 3.1.12)
+  railties
+  rake
   resque
   rspec
   sidekiq

data/gemfiles/rails3_2.gemfile

@@ -2,9 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "appraisal"
-gem "json", :platforms=>:ruby_18
-gem "delayed_job_active_record", :require=>false
-gem "rails", "~> 3.2.8"
+gem "rails", "~> 3.2.17"
 
 gemspec :path=>"../"

data/gemfiles/rails3_2.gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: ..
   specs:
-    delayed_paperclip (2.6.1)
-      paperclip (>= 3.3.0)
+    delayed_paperclip (2.7.0)
+      paperclip (>= 3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -20,89 +20,89 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
+    arel (3.0.3)
     builder (3.0.4)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    connection_pool (1.0.0)
-    delayed_job (3.0.5)
-      activesupport (~> 3.0)
-    delayed_job_active_record (0.4.4)
-      activerecord (>= 2.1.0, < 4)
-      delayed_job (~> 3.0)
-    diff-lcs (1.2.4)
+    connection_pool (1.2.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    delayed_job_active_record (4.0.0)
+      activerecord (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 4.1)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
+    hike (1.2.3)
+    i18n (0.6.9)
     journey (1.0.4)
-    json (1.8.0)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.14.0)
+    metaclass (0.0.3)
+    mime-types (1.25.1)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.7.5)
-    paperclip (3.5.0)
+    multi_json (1.8.4)
+    paperclip (4.1.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.0)
+    rack-protection (1.5.2)
       rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
-    resque (1.24.1)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.2)
@@ -112,33 +112,33 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sidekiq (2.12.1)
-      celluloid (>= 0.14.1)
+    rspec-mocks (2.14.5)
+    sidekiq (2.17.6)
+      celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
-      redis (>= 3.0)
-      redis-namespace
-    sinatra (1.3.6)
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
+    sinatra (1.4.4)
       rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     thor (0.18.1)
     tilt (1.4.1)
     timers (1.1.0)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -147,12 +147,14 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bundler
   delayed_job
   delayed_job_active_record
   delayed_paperclip!
-  json
   mocha
-  rails (~> 3.2.8)
+  rails (~> 3.2.17)
+  railties
+  rake
   resque
   rspec
   sidekiq