delayed_paperclip 2.5.0.1 → 2.5.1.0

data/README.textile

@@ -60,12 +60,12 @@ To have the missing image url be outputted by paperclip while the image is being
     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"
@@ -75,6 +75,30 @@ To have the missing image url be outputted by paperclip while the image is being
   @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>
+
+
 h2. What if I'm not using images?
 
 This library works no matter what kind of post-processing you are doing with Paperclip.

data/lib/delayed_paperclip.rb

@@ -10,13 +10,15 @@ module DelayedPaperclip
     def options
       @options ||= {
         :background_job_class => detect_background_task,
-        :url_with_processing  => true
+        :url_with_processing  => true,
+        :processing_image_url => nil
       }
     end
 
     def detect_background_task
       return DelayedPaperclip::Jobs::DelayedJob if defined? ::Delayed::Job
       return DelayedPaperclip::Jobs::Resque     if defined? ::Resque
+      return DelayedPaperclip::Jobs::Sidekiq    if defined? ::Sidekiq
     end
 
     def processor
@@ -49,7 +51,8 @@ module DelayedPaperclip
       attachment_definitions[name][:delayed] = {}
       {
         :priority => 0,
-        :url_with_processing => DelayedPaperclip.options[:url_with_processing]
+        :url_with_processing => DelayedPaperclip.options[:url_with_processing],
+        :processing_image_url => options[:processing_image_url]
       }.each do |option, default|
         attachment_definitions[name][:delayed][option] = options.key?(option) ? options[option] : default
       end

data/lib/delayed_paperclip/jobs.rb

@@ -2,5 +2,6 @@ module DelayedPaperclip
   module Jobs
     autoload :DelayedJob, 'delayed_paperclip/jobs/delayed_job'
     autoload :Resque, 'delayed_paperclip/jobs/resque'
+    autoload :Sidekiq, 'delayed_paperclip/jobs/sidekiq'
   end
 end

data/lib/delayed_paperclip/jobs/sidekiq.rb

@@ -0,0 +1,18 @@
+require 'sidekiq/worker'
+
+module DelayedPaperclip
+  module Jobs
+    class Sidekiq
+      include ::Sidekiq::Worker
+      sidekiq_options :queue => :paperclip
+
+      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+        perform_async(instance_klass, instance_id, attachment_name)
+      end
+
+      def perform(instance_klass, instance_id, attachment_name)
+        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
+      end
+    end
+  end
+end

data/lib/delayed_paperclip/url_generator.rb

@@ -4,13 +4,26 @@ module DelayedPaperclip
     def self.included(base)
       base.send :include, InstanceMethods
       base.alias_method_chain :most_appropriate_url, :processed
+      base.alias_method_chain :timestamp_possible?, :processed
     end
 
     def most_appropriate_url_with_processed
       if @attachment.original_filename.nil? || delayed_default_url?
-        default_url
+        if @attachment.delayed_options.nil? || @attachment.delayed_options[:processing_image_url].nil?
+          default_url
+        else
+          @attachment.delayed_options[:processing_image_url]
+        end
       else
-         @attachment_options[:url]
+        @attachment_options[:url]
+      end
+    end
+    
+    def timestamp_possible_with_processed?
+      if delayed_default_url?
+        false
+      else
+        timestamp_possible_without_processed?
       end
     end
 

data/test/base_delayed_paperclip_test.rb

@@ -73,11 +73,20 @@ module BaseDelayedPaperclipTest
   def test_unprocessed_image_returns_missing_url
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
-    #assert_equal "/images/original/missing.png", dummy.image.url(:original, :timestamp => true)
-    dummy.image.url.starts_with?("/images/original/missing.png")
+    assert dummy.image.url.starts_with?("/images/original/missing.png")
     process_jobs
     dummy.reload
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
+  end
+
+  def test_unprocess_image_returns_reprocessing_url
+    reset_dummy :processing_image_url => "/images/original/processing.png"
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert dummy.image.url.starts_with?("/images/original/processing.png")
+    process_jobs
+    dummy.reload
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
   def test_unprocessed_image_not_returning_missing_url_if_turned_of_globally
@@ -85,27 +94,27 @@ module BaseDelayedPaperclipTest
     reset_dummy :with_processed => false
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
     process_jobs
     dummy.reload
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
   def test_unprocessed_image_not_returning_missing_url_if_turned_of_on_instance
     reset_dummy :with_processed => false, :url_with_processing => false
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
     process_jobs
     dummy.reload
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
   def test_original_url_when_no_processing_column
     reset_dummy :with_processed => false
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")  
+    assert dummy.reload.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
   def test_original_url_if_image_changed
@@ -113,9 +122,9 @@ module BaseDelayedPaperclipTest
     dummy.save!
     dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
     dummy.save!
-    dummy.image.url.starts_with?("/images/original/missing.png")
+    assert dummy.image.url.starts_with?("/images/original/missing.png")
     process_jobs
-    dummy.image.url.starts_with?("/system/images/1/original/12k.png")
+    assert dummy.reload.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
   def test_missing_url_if_image_hasnt_changed

data/test/sidekiq_paperclip.rb

@@ -0,0 +1,39 @@
+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

data/test/test_helper.rb

@@ -57,6 +57,7 @@ def reset_class(class_name, options)
   klass.class_eval do
     include Paperclip::Glue
     has_attached_file     :image
+
     process_in_background :image, options if options[:with_processed]
     after_update :reprocess if options[:with_after_update_callback]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.5.0.1
+  version: 2.5.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -93,6 +93,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Process your Paperclip attachments in the background with delayed_job,
   Resque or your own processor.
 email: james@jamesrgifford.com
@@ -104,19 +120,21 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- lib/delayed_paperclip.rb
 - lib/delayed_paperclip/railtie.rb
-- lib/delayed_paperclip/attachment.rb
-- lib/delayed_paperclip/url_generator.rb
-- lib/delayed_paperclip/jobs/resque.rb
 - lib/delayed_paperclip/jobs/delayed_job.rb
+- lib/delayed_paperclip/jobs/resque.rb
+- lib/delayed_paperclip/jobs/sidekiq.rb
+- lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/jobs.rb
+- lib/delayed_paperclip/url_generator.rb
+- lib/delayed_paperclip.rb
+- test/database.yml
+- test/sidekiq_paperclip.rb
+- test/delayed_paperclip_test.rb
+- test/resque_paperclip_test.rb
 - test/base_delayed_paperclip_test.rb
 - test/test_helper.rb
 - test/fixtures/12k.png
-- test/delayed_paperclip_test.rb
-- test/database.yml
-- test/resque_paperclip_test.rb
 - rails/init.rb
 homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
@@ -138,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Process your Paperclip attachments in the background.