delayed_paperclip 2.8.0 → 2.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -45,16 +45,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +115,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -191,26 +191,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rbenv-version"
 - ".travis.yml"
 - Appraisals
 - CONTRIBUTING
 - ChangeLog
 - Gemfile
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
 - delayed_paperclip.gemspec
-- gemfiles/rails3_1.gemfile
-- gemfiles/rails3_1.gemfile.lock
-- gemfiles/rails3_2.gemfile
-- gemfiles/rails3_2.gemfile.lock
-- gemfiles/rails4.gemfile
-- gemfiles/rails4.gemfile.lock
+- gemfiles/3.2.gemfile
+- gemfiles/3.2.gemfile.lock
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
+- gemfiles/4.2.gemfile
+- gemfiles/4.2.gemfile.lock
 - init.rb
 - lib/delayed_paperclip.rb
 - lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/jobs.rb
+- lib/delayed_paperclip/jobs/active_job.rb
 - lib/delayed_paperclip/jobs/delayed_job.rb
 - lib/delayed_paperclip/jobs/resque.rb
 - lib/delayed_paperclip/jobs/sidekiq.rb
@@ -225,6 +227,9 @@ files:
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
 - spec/fixtures/missing.png
+- spec/integration/active_job_inline_spec.rb
+- spec/integration/active_job_resque_spec.rb
+- spec/integration/active_job_sidekiq_spec.rb
 - spec/integration/base_delayed_paperclip_spec.rb
 - spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
@@ -233,10 +238,6 @@ files:
 - spec/spec_helper.rb
 - test/base_delayed_paperclip_test.rb
 - test/database.yml
-- test/delayed_paperclip_test.rb
-- test/fixtures/12k.png
-- test/resque_paperclip_test.rb
-- test/sidekiq_paperclip.rb
 - test/test_helper.rb
 homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
@@ -257,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Process your Paperclip attachments in the background.
@@ -269,6 +270,9 @@ test_files:
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
 - spec/fixtures/missing.png
+- spec/integration/active_job_inline_spec.rb
+- spec/integration/active_job_resque_spec.rb
+- spec/integration/active_job_sidekiq_spec.rb
 - spec/integration/base_delayed_paperclip_spec.rb
 - spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
@@ -277,8 +281,4 @@ test_files:
 - spec/spec_helper.rb
 - test/base_delayed_paperclip_test.rb
 - test/database.yml
-- test/delayed_paperclip_test.rb
-- test/fixtures/12k.png
-- test/resque_paperclip_test.rb
-- test/sidekiq_paperclip.rb
 - test/test_helper.rb

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p429

data/README.textile

@@ -1,219 +0,0 @@
-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, "Resque":https://github.com/resque/resque or "Sidekiq":http://github.com/mperham/sidekiq.
-
-h2. 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.
-
-h2. Installation
-
-Install the gem:
-
-<pre><code>gem install delayed_paperclip</code></pre>
-
-Or even better, add it to your Gemfile.
-
-<pre><code>source "https://rubygems.org"
-gem 'delayed_paperclip'
-</code></pre>
-
-
-Dependencies:
-* Paperclip
-* DJ, Resque or Sidekiq
-
-h2. Usage
-
-In your model:
-
-<pre><code>
-  class User < ActiveRecord::Base
-    has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
-
-    process_in_background :avatar
-  end
-</code></pre>
-
-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.
-
-h3. 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.
-
-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.
-
-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.
-
-<pre><code>
-  class AddAvatarProessingToUser < 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"
-</code></pre>
-
-h4. Custom image for processing
-
-This is useful if you have a difference between missing images and images currently
-being processed.
-
-<pre><code>
-
-  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"
-
-</code></pre>
-
-h4. 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.
-
-<pre><code>
-
-  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
-
-</code></pre>
-
-h4. Only process certain styles
-
-This is useful if you don't want the background job to reprocess all styles.
-
-<pre><code>
-  class User < ActiveRecord::Base
-    has_attached_file :avatar, :styles => { :small => "25x25#", :medium => "50x50x" }
-
-    process_in_background :avatar, :only_process => [:small]
-  end
-</code></pre>
-
-Like paperclip, you could also supply a lambda function to define only_process dynamically.
-
-<pre><code>
-  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
-</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
-styles as arguments anymore.  It will delegate to DelayedPaperclip and reprocess all styles.
-
-<pre><code>
-  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)
-</code></pre>
-
-h2. 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:
-
-<pre><code>
-  module YourApp
-    class Application < Rails::Application
-      # Other code...
-
-      config.delayed_paperclip_defaults = {
-          :url_with_processing => true,
-          :processing_image_url => 'custom_processing.png'
-      }
-    end
-  end
-</code></pre>
-
-h2. What if I'm not using images?
-
-This library works no matter what kind of post-processing you are doing with Paperclip.
-
-h2. Does it work with s3?
-
-Yes.
-
-h2. Contributing
-
-Checkout out CONTRIBUTING.  In short, you'll need a redis server running for testing.  Run all tests with
-
-<pre><code>rake</code></pre>

data/gemfiles/rails3_1.gemfile

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

data/gemfiles/rails3_1.gemfile.lock

@@ -1,163 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    delayed_paperclip (2.7.1)
-      paperclip (>= 3.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    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)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    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.15.2)
-      timers (~> 1.1.0)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.4)
-      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)
-      delayed_job (>= 3.0, < 4.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    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.4)
-    mime-types (1.25.1)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    mono_logger (1.1.0)
-    multi_json (1.8.4)
-    paperclip (4.1.1)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
-      mime-types
-    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.2)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    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.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.1.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 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)
-      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)
-      json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    thor (0.14.6)
-    tilt (1.4.1)
-    timers (1.1.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler
-  delayed_job
-  delayed_job_active_record
-  delayed_paperclip!
-  mocha
-  rails (~> 3.1.12)
-  railties
-  rake
-  resque
-  rspec
-  sidekiq
-  sqlite3

data/gemfiles/rails3_2.gemfile

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

data/gemfiles/rails4.gemfile

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

data/test/delayed_paperclip_test.rb

@@ -1,47 +0,0 @@
-require 'test_helper'
-require 'base_delayed_paperclip_test'
-require 'delayed_job'
-
-Delayed::Worker.backend = :active_record
-
-class DelayedPaperclipTest < Test::Unit::TestCase
-  include BaseDelayedPaperclipTest
-
-  def setup
-    super
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::DelayedJob
-    build_delayed_jobs
-  end
-
-  def process_jobs
-    Delayed::Worker.new.work_off
-  end
-
-  def jobs_count
-    Delayed::Job.count
-  end
-
-  def test_perform_job
-    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
-    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-    Paperclip::Attachment.any_instance.expects(:reprocess!)
-    dummy.save!
-    Delayed::Job.last.payload_object.perform
-  end
-
-  def build_delayed_jobs
-    ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      table.text     :handler                      # YAML-encoded string of the object that will do work
-      table.string   :last_error                   # reason for last failure (See Note below)
-      table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
-      table.datetime :locked_at                    # Set when a client is working on this object
-      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string   :locked_by                    # Who is working on this object (if locked)
-      table.string   :queue
-      table.timestamps
-    end
-  end
-
-end

data/test/resque_paperclip_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-require 'base_delayed_paperclip_test'
-require 'resque'
-
-class ResquePaperclipTest < Test::Unit::TestCase
-  include BaseDelayedPaperclipTest
-
-  def setup
-    super
-    # Make sure that we just test Resque in here
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    Resque.remove_queue(:paperclip)
-  end
-
-  def process_jobs
-    worker = Resque::Worker.new(:paperclip)
-    worker.process
-  end
-
-  def jobs_count
-    Resque.size(:paperclip)
-  end
-
-  def test_perform_job
-    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
-    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-    Paperclip::Attachment.any_instance.expects(:reprocess!)
-    dummy.save!
-    DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)
-  end
-
-end

data/test/sidekiq_paperclip.rb

@@ -1,39 +0,0 @@
-require 'test_helper'
-require 'base_delayed_paperclip_test'
-require 'sidekiq'
-
-class SidekiqPaperclipTest < Test::Unit::TestCase
-  include BaseDelayedPaperclipTest
-
-  def setup
-    super
-    # Make sure that we just test Sidekiq in here
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Sidekiq
-    Sidekiq::Queue.new(:paperclip).clear
-  end
-
-  def process_jobs
-    Sidekiq::Queue.new(:paperclip).each do |job|
-      worker = job.klass.constantize.new
-      args   = job.args
-      begin
-        worker.perform(*args)
-      rescue # Assume sidekiq handle exception properly
-      end
-      job.delete
-    end
-  end
-
-  def jobs_count
-    Sidekiq::Queue.new(:paperclip).size
-  end
-
-  def test_perform_job
-    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
-    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-    Paperclip::Attachment.any_instance.expects(:reprocess!)
-    dummy.save!
-    DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image)
-  end
-
-end