Merge pull request #184 from jrgifford/3-0

Get ready for 3.0

Author: Scott Carleton

.travis.yml

@@ -9,13 +9,10 @@ rvm:
   - 2.0
 
 gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
 
-# Rails 5.0 requires Ruby >= 2.2
+# Rails 5.0 requires Ruby >= 2.2.2
 matrix:
   exclude:
     - rvm: 2.1.10

Appraisals

@@ -1,15 +1,3 @@
-appraise "3.2" do
-  gem "rails", "~> 3.2.15"
-end
-
-appraise "4.0" do
-  gem "rails", "~> 4.0.0"
-end
-
-appraise "4.1" do
-  gem "rails", "~> 4.1.0"
-end
-
 appraise "4.2" do
   gem "rails", "~> 4.2.0"
 end

README.md

@@ -3,19 +3,15 @@ Delayed::Paperclip [![Build Status](https://travis-ci.org/jrgifford/delayed_pape
 
 
 DelayedPaperclip lets you process your [Paperclip](http://github.com/thoughtbot/paperclip)
-attachments in a background task with
-[ActiveJob](https://github.com/rails/rails/tree/master/activejob),
-[DelayedJob](https://github.com/collectiveidea/delayed_job),
-[Resque](https://github.com/resque/resque) or [Sidekiq](https://github.com/mperham/sidekiq).
+attachments in a background task with [ActiveJob](https://github.com/rails/rails/tree/master/activejob)
 
 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.
+is usually a pretty slow operation and should be handled in a background task.
 
 I’m sure that everyone knows this, this gem just makes it easy to do.
 
@@ -24,28 +20,23 @@ 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
+gem "delayed_paperclip"
+```
 
 Usage
 -----
 
 In your model:
 
-````ruby
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: {
                                        medium: "300x300>",
@@ -54,57 +45,10 @@ class User < ActiveRecord::Base
 
   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.
-
-### Active Job
-
-[Active Job](https://github.com/rails/rails/tree/master/activejob) will take
-precedence over any other installed library. Since it is installed as a
-dependency with Rails 4.2.1 this might cause some confusion, so make sure that
-Active Job is configured to use the correct queue adapter:
-
-````ruby
-module YourApp
-  class Application < Rails::Application
-    # Other code...
-
-    config.active_job.queue_adapter = :resque  # Or :delayed_job or :sidekiq
-  end
-end
-````
-
-### Resque
-
-Resque adapter is deprecated. Please use ActiveJob one.
-
-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
-
-DelayedJob adapter is deprecated. Please use ActiveJob one.
-
-Just make sure that you have DJ up and running.
-
-### Sidekiq
-
-Sidekiq adapter is deprecated. Please use ActiveJob one.
-
-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
@@ -117,7 +61,7 @@ To have the missing image url be outputted by paperclip while the image is being
 `#{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
+```ruby
 class AddAvatarProcessingToUser < ActiveRecord::Migration
   def self.up
     add_column :users, :avatar_processing, :boolean
@@ -131,18 +75,19 @@ end
 @user = User.new(avatar: File.new(...))
 @user.save
 @user.avatar.url #=> "/images/original/missing.png"
-Delayed::Worker.new.work_off
+
+# Process job
 
 @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
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar
 
@@ -152,17 +97,17 @@ end
 @user = User.new(avatar: File.new(...))
 @user.save
 @user.avatar.url #=> "/images/original/processing.png"
-Delayed::Worker.new.work_off
+
+# Process job
 
 @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.
+example to display the original picture while specific formats are being processed.
 
-````ruby
+```ruby
 class Item < ActiveRecord::Base
   has_attached_file :photo
 
@@ -173,7 +118,7 @@ class Item < ActiveRecord::Base
     options[:interpolator].interpolate(options[:url], photo, :original)
   end
 end
-````
+```
 
 #### Have processing? status available, but construct image URLs as if delayed_paperclip wasn’t present
 
@@ -183,7 +128,7 @@ If you define the `#{attachment_name}_processing` column, but set the
 Note especially the method #processing? which passes through the value
 of the boolean created via migration.
 
-````ruby
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar
 
@@ -194,58 +139,59 @@ end
 @user.save
 @user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
 @user.avatar.processing? #=> true
-Delayed::Worker.new.work_off
+
+# Process job
 
 @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
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }
 
   process_in_background :avatar, only_process: [:small]
 end
-````
+```
 
 Like paperclip, you could also supply a lambda function to define
 `only_process` dynamically.
 
-````ruby
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }
 
   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
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }, 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 too. Take note, normal `reprocess!` does not accept styles as arguments anymore. It will delegate to DelayedPaperclip and
 reprocess all styles.
 
-````ruby
+```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }
 
@@ -254,7 +200,7 @@ end
 
 @user.avatar.url #=> "/system/images/3/original/IMG_2772.JPG?1267562148"
 @user.avatar.reprocess_without_delay!(:medium)
-````
+```
 
 #### Set queue name
 
@@ -278,7 +224,7 @@ defined by changing the DelayedPaperclip.options Hash, this can be useful for se
 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:
 
-````ruby
+```ruby
 module YourApp
   class Application < Rails::Application
     # Other code...
@@ -289,7 +235,7 @@ module YourApp
     }
   end
 end
-````
+```
 
 What if I’m not using images?
 -----------------------------
@@ -301,7 +247,7 @@ Paperclip Post-processors are not working
 -----------------------------------------
 
 If you are using custom [post-processing processors](https://github.com/thoughtbot/paperclip#post-processing)
-like this: 
+like this:
 
 ```ruby
 # ...
@@ -311,14 +257,14 @@ process_in_background :avatar
 
 def rotate!
   # ...
-  avatar.reprocess! 
+  avatar.reprocess!
   # ...
 end
 
 # ...
 ```
 
-...you may encounter an issue where your post-processors are ignored 
+...you may encounter an issue where your post-processors are ignored
 ([more info](https://github.com/jrgifford/delayed_paperclip/issues/171)).
 In order to avoid this use `reprocess_without_delay!`
 
@@ -327,7 +273,7 @@ In order to avoid this use `reprocess_without_delay!`
 
 def rotate!
   # ...
-  avatar.reprocess_without_delay! 
+  avatar.reprocess_without_delay!
   # ...
 end
 
@@ -344,7 +290,7 @@ Contributing
 
 Checkout out [CONTRIBUTING](https://github.com/jrgifford/delayed_paperclip/blob/master/CONTRIBUTING). Run specs with:
 
-````
+```
 # Rspec on all versions
 bundle exec appraisal install
 bundle exec appraisal rake
@@ -354,4 +300,4 @@ bundle exec rake
 
 # Rspec on specific rails version
 bundle exec appraisal 5.0 rake
-````
+```

delayed_paperclip.gemspec

@@ -6,25 +6,24 @@ Gem::Specification.new do |s|
   s.version     = DelayedPaperclip::VERSION
 
   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 DelayedJob, Resque, Sidekiq or your own processor.}
+  s.summary     = %q{Process your Paperclip attachments in the background}
+  s.description = %q{Process your Paperclip attachments in the background with ActiveJob}
   s.email       = %w{[email protected] [email protected]}
-  s.homepage    = %q{http://github.com/jrgifford/delayed_paperclip}
+  s.homepage    = %q{https://github.com/jrgifford/delayed_paperclip}
+
+  s.required_ruby_version = ">= 2.0.0"
 
   s.add_dependency 'paperclip', [">= 3.3"]
+  s.add_dependency 'activejob', ">= 4.2"
 
   s.add_development_dependency 'mocha'
   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', '>= 4.0'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake', '~> 10.5.0'
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'activerecord'
   s.add_development_dependency 'railties'
-  s.add_development_dependency 'fakeredis'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")