delayed_paperclip 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fd7daaa3126fd153f1448405465ab92d983833
-  data.tar.gz: 5953ed040cea15002ca58e269dd9b12eace3ed9c
+  metadata.gz: 6cd279c1d4024765a17e736762beaf90e355ae5c
+  data.tar.gz: abc9e943e6dbfd164e749edda10ae93847b80bd0
 SHA512:
-  metadata.gz: 0558c10976a587d713e68e4b22f3bbfe0d5cbeaf84abad212d510b282bc0e33918dd3e3a98c60b5d05c56efd2e0a5a6255b35346214c0a9acb4d310a8e4bea3f
-  data.tar.gz: c0db6281bbf54e20ef7489ae2ae094809471ad2d8fccc5578d8a52f00b507d49f6d37dbf148adfc82887a6a15a602a30f8b8d9062480ed56891cac0450d0c40b
+  metadata.gz: d8a46607f55622cc639ba1b94af952afa5d69bff67add0634789f681708ddd3b92b93a6f2b9b7fe8561dd7dbd9fb8d8838ff6cd239085bc7311026bfb92ea601
+  data.tar.gz: d9fcbafdcda62b4ebdf627f8a3a43ffda2397bf8e1e7fe09ff383ba0dde7b34a4499658f24d31ee90b475845670de522bb2a2623633b582dd30218c4a7c79382

data/.gitignore

@@ -4,6 +4,6 @@ pkg/
 public/
 Gemfile.lock
 *.gem
-./gemfiles/rails*.lock
+gemfiles/*.lock
 .ruby-gemset
-.ruby-version
+.ruby-version

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
+cache: bundler
+sudo: false
 
 rvm:
+  - 2.3.0
+  - 2.2
   - 2.1
   - 2.0
 
@@ -8,11 +12,7 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
-
-sudo: false
-
-services:
-  - redis
+  - gemfiles/4.2.gemfile
 
 script: "bundle exec rake clean spec"
 
@@ -20,4 +20,3 @@ notifications:
   email:
     - james@jamesrgifford.com
     - scott@artsicle.com
-

data/Appraisals

@@ -1,19 +1,15 @@
 appraise "3.2" do
   gem "rails", "~> 3.2.15"
-  gem "delayed_paperclip", path: "../"
 end
 
 appraise "4.0" do
   gem "rails", "~> 4.0.0"
-  gem "delayed_paperclip", path: "../"
 end
 
 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
+end

data/CONTRIBUTING

@@ -8,9 +8,6 @@ Testing
 
 Please don't commit code without tests. You can bootstrap the development environment by running `bundle install`. After that, running `rake` should just work. If it doesn't then file a bug.
 
-Dependencies for Testing:
-  - Redis. You need redis. For linux users, you can install the redis-server package and roll, Mac users will need to install it with homebrew, and I'm not entirely sure how to make it work with Windows users.
-
 Versioning
 =========
 

data/README.md

@@ -2,8 +2,11 @@ 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 [DelayedJob](https://github.com/collectiveidea/delayed_job), [Resque](https://github.com/resque/resque) or [Sidekiq](https://github.com/mperham/sidekiq).
+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).
 
 Why?
 ----
@@ -61,6 +64,23 @@ 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
 
 Make sure that you have [Resque](https://github.com/resque/resque) up and running. The jobs will be
@@ -120,7 +140,7 @@ images currently being processed.
 class User < ActiveRecord::Base
   has_attached_file :avatar
 
-  process_in_background :avatar, processing_image_url: "/images/original/processing.jpg"
+  process_in_background :avatar, processing_image_url: "/images/:style/processing.jpg"
 end
 
 @user = User.new(avatar: File.new(...))
@@ -182,7 +202,7 @@ styles.
 
 ````ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }
 
   process_in_background :avatar, only_process: [:small]
 end
@@ -193,7 +213,7 @@ Like paperclip, you could also supply a lambda function to define
 
 ````ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+  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
@@ -207,7 +227,7 @@ by setting `only_process` on both `has_attached_file` and
 
 ````ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }, only_process: [:small]
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }, only_process: [:small]
 
   process_in_background :avatar, only_process: [:medium]
 end
@@ -221,7 +241,7 @@ reprocess all styles.
 
 ````ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50x" }
+  has_attached_file :avatar, styles: { small: "25x25#", medium: "50x50#" }
 
   process_in_background :avatar
 end
@@ -230,6 +250,19 @@ end
 @user.avatar.reprocess_without_delay!(:medium)
 ````
 
+#### Set queue name
+
+You can set queue name for background job. By default it's called "paperclip".
+You can set it by changing global default options or by:
+
+```
+class User < ActiveRecord::Base
+  has_attached_file :avatar
+
+  process_in_background :avatar, queue: "default"
+end
+```
+
 Defaults
 --------
 
@@ -239,7 +272,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
 module YourApp
   class Application < Rails::Application
     # Other code...
@@ -266,10 +299,9 @@ Yes.
 Contributing
 ------------
 
-Checkout out CONTRIBUTING. In short, you’ll need a redis server running
-for testing. Run all tests with
+Checkout out CONTRIBUTING. Run all tests with
 
 ````
 # Rspec on all versions
 rake appraisal spec
-````
+````

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler/setup'
 
 require 'appraisal'
@@ -6,8 +5,6 @@ require 'appraisal'
 require 'rake'
 require 'rake/testtask'
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
-
 desc 'Default: run unit tests.'
 task default: [:clean, 'appraisal:install', :all]
 
@@ -22,20 +19,10 @@ task :clean do |t|
   FileUtils.rm_rf "tmp"
   FileUtils.rm_rf "pkg"
   FileUtils.rm_rf "public"
-  FileUtils.rm    "test/debug.log" rescue nil
-  FileUtils.rm    "test/paperclip.db" rescue nil
   Dir.glob("paperclip-*.gem").each{|f| FileUtils.rm f }
 end
 
-desc 'Test the paperclip plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib:test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
-

data/delayed_paperclip.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'delayed_job'
   s.add_development_dependency 'delayed_job_active_record'
   s.add_development_dependency 'resque'
-  s.add_development_dependency 'sidekiq', '< 3.0'
+  s.add_development_dependency 'sidekiq', '>= 4.0'
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10.5.0'
   s.add_development_dependency 'bundler'
   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")
 end
-

data/gemfiles/3.2.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.2.15"
-gem "delayed_paperclip", :path => "../"
 
 gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.0.0"
-gem "delayed_paperclip", :path => "../"
 
 gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.1.0"
-gem "delayed_paperclip", :path => "../"
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.2.0"
-gem "delayed_paperclip", :path => "../"
 
 gemspec :path => "../"

data/lib/delayed_paperclip.rb

@@ -11,7 +11,8 @@ module DelayedPaperclip
       @options ||= {
         :background_job_class => detect_background_task,
         :url_with_processing  => true,
-        :processing_image_url => nil
+        :processing_image_url => nil,
+        :queue => "paperclip"
       }
     end
 
@@ -31,9 +32,9 @@ module DelayedPaperclip
     end
 
     def process_job(instance_klass, instance_id, attachment_name)
-      instance_klass.constantize.unscoped.find(instance_id).
-        send(attachment_name).
-        process_delayed!
+      if instance = instance_klass.constantize.unscoped.where(id: instance_id).first
+        instance.send(attachment_name).process_delayed!
+      end
     end
 
   end
@@ -59,11 +60,9 @@ module DelayedPaperclip
         :only_process => only_process_default,
         :url_with_processing => DelayedPaperclip.options[:url_with_processing],
         :processing_image_url => DelayedPaperclip.options[:processing_image_url],
-        :queue => nil
+        :queue => DelayedPaperclip.options[:queue]
       }.each do |option, default|
-
         paperclip_definitions[name][:delayed][option] = options.key?(option) ? options[option] : default
-
       end
 
       # Sets callback

data/lib/delayed_paperclip/attachment.rb

@@ -4,9 +4,15 @@ module DelayedPaperclip
     def self.included(base)
       base.send :include, InstanceMethods
       base.send :attr_accessor, :job_is_processing
-      base.alias_method_chain :post_processing, :delay
-      base.alias_method_chain :post_processing=, :delay
-      base.alias_method_chain :save, :prepare_enqueueing
+
+      base.send :alias_method, :post_processing_without_delay, :post_processing
+      base.send :alias_method, :post_processing, :post_processing_with_delay
+
+      base.send :alias_method, :post_processing_without_delay=, :post_processing=
+      base.send :alias_method, :post_processing=, :post_processing_with_delay=
+
+      base.send :alias_method, :save_without_prepare_enqueueing, :save
+      base.send :alias_method, :save, :save_with_prepare_enqueueing
     end
 
     module InstanceMethods
@@ -36,7 +42,7 @@ module DelayedPaperclip
 
       def split_processing?
         options[:only_process] && delayed_options &&
-          options[:only_process] != delayed_options[:only_process]
+          options[:only_process] != delayed_only_process
       end
 
       def processing?
@@ -47,11 +53,11 @@ module DelayedPaperclip
       def processing_style?(style)
         return false if !processing?
 
-        !split_processing? || delayed_options[:only_process].include?(style)
+        !split_processing? || delayed_only_process.include?(style)
       end
 
       def delayed_only_process
-        only_process = delayed_options[:only_process].dup
+        only_process = delayed_options.fetch(:only_process, []).dup
         only_process = only_process.call(self) if only_process.respond_to?(:call)
         only_process.map(&:to_sym)
       end

data/lib/delayed_paperclip/jobs/active_job.rb

@@ -1,11 +1,9 @@
 module DelayedPaperclip
   module Jobs
     class ActiveJob < ActiveJob::Base
-      queue_as :paperclip
-
       def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-        # ActiveJob currently does not support symbol arguments
-        self.perform_later(instance_klass, instance_id, attachment_name.to_s)
+        queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
+        set(:queue => queue_name).perform_later(instance_klass, instance_id, attachment_name.to_s)
       end
 
       def perform(instance_klass, instance_id, attachment_name)
@@ -13,4 +11,4 @@ module DelayedPaperclip
       end
     end
   end
-end
+end

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -4,7 +4,8 @@ module DelayedPaperclip
   module Jobs
     class DelayedJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
 
-      if Gem.loaded_specs['delayed_job'].version >= Gem::Version.new("2.1.0") # this is available in newer versions of DelayedJob. Using the newee Job api thus.
+      # This is available in newer versions of DelayedJob. Using the newee Job api thus.
+      if Gem.loaded_specs['delayed_job'].version >= Gem::Version.new("2.1.0")
 
         def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
           ::Delayed::Job.enqueue(
@@ -31,4 +32,4 @@ module DelayedPaperclip
       end
     end
   end
-end
+end

data/lib/delayed_paperclip/jobs/resque.rb

@@ -3,9 +3,8 @@ require 'resque'
 module DelayedPaperclip
   module Jobs
     class Resque
-      @queue = :paperclip
-
       def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+        @queue = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
         ::Resque.enqueue(self, instance_klass, instance_id, attachment_name)
       end
 
@@ -14,4 +13,4 @@ module DelayedPaperclip
       end
     end
   end
-end
+end

data/lib/delayed_paperclip/jobs/sidekiq.rb

@@ -4,9 +4,15 @@ module DelayedPaperclip
   module Jobs
     class Sidekiq
       include ::Sidekiq::Worker
-      sidekiq_options :queue => :paperclip
 
       def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+        queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
+        # Sidekiq >= 4.1.0
+        if respond_to?(:set)
+          set(:queue => queue_name)
+        else
+          sidekiq_options :queue => queue_name
+        end
         perform_async(instance_klass, instance_id, attachment_name)
       end
 

data/lib/delayed_paperclip/railtie.rb

@@ -26,7 +26,7 @@ module DelayedPaperclip
     def self.insert
       ActiveRecord::Base.send(:include, DelayedPaperclip::Glue)
       Paperclip::Attachment.send(:include, DelayedPaperclip::Attachment)
-      Paperclip::UrlGenerator.send(:include, DelayedPaperclip::UrlGenerator)
+      Paperclip::Attachment.default_options[:url_generator] = DelayedPaperclip::UrlGenerator
     end
   end
 end