delayed_paperclip 2.5.1.0 → 2.6.0.0

data/README.textile

@@ -1,4 +1,4 @@
-h1. Delayed::Paperclip !https://secure.travis-ci.org/jrgifford/delayed_paperclip.png!
+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.
 
@@ -98,6 +98,34 @@ being processed.
 
 </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>
+
+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. What if I'm not using images?
 

data/lib/delayed_paperclip/attachment.rb

@@ -39,24 +39,32 @@ module DelayedPaperclip
       def process_delayed!
         self.job_is_processing = true
         self.post_processing = true
-        reprocess!
+        reprocess!(*delayed_options[:only_process])
         self.job_is_processing = false
       end
 
+      def processing_image_url
+        processing_image_url = @options[:delayed][:processing_image_url]
+        processing_image_url = processing_image_url.call(self) if processing_image_url.respond_to?(:call)
+        processing_image_url
+      end
+
+
       def after_flush_writes_with_processing(*args)
         after_flush_writes_without_processing(*args)
 
         # update_column is available in rails 3.1 instead we can do this to update the attribute without callbacks
 
-        #instance.update_column("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
+        # instance.update_column("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
         if instance.respond_to?(:"#{name}_processing?")
           instance.send("#{name}_processing=", false)
-          instance.class.update_all({ "#{name}_processing" => false }, instance.class.primary_key => instance.id)
+          instance.class.where(instance.class.primary_key => instance.id).update_all({ "#{name}_processing" => false })
         end
       end
 
       def save_with_prepare_enqueueing
         was_dirty = @dirty
+
         save_without_prepare_enqueueing.tap do
           if delay_processing? && was_dirty
             instance.prepare_enqueueing_for name
@@ -64,6 +72,11 @@ module DelayedPaperclip
         end
       end
 
+      def reprocess_without_delay!(*style_args)
+        @post_processing_with_delay = true
+        reprocess!(*style_args)
+      end
+
     end
   end
 end

data/lib/delayed_paperclip/url_generator.rb

@@ -9,16 +9,16 @@ module DelayedPaperclip
 
     def most_appropriate_url_with_processed
       if @attachment.original_filename.nil? || delayed_default_url?
-        if @attachment.delayed_options.nil? || @attachment.delayed_options[:processing_image_url].nil?
+        if @attachment.delayed_options.nil? || @attachment.processing_image_url.nil? || !@attachment.processing?
           default_url
         else
-          @attachment.delayed_options[:processing_image_url]
+          @attachment.processing_image_url
         end
       else
         @attachment_options[:url]
       end
     end
-    
+
     def timestamp_possible_with_processed?
       if delayed_default_url?
         false

data/lib/delayed_paperclip.rb

@@ -51,10 +51,13 @@ module DelayedPaperclip
       attachment_definitions[name][:delayed] = {}
       {
         :priority => 0,
+        :only_process => attachment_definitions[name][:only_process],
         :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
 
       if respond_to?(:after_commit)
@@ -70,10 +73,10 @@ module DelayedPaperclip
     # setting each inididual NAME_processing to true, skipping the ActiveModel dirty setter
     # Then immediately push the state to the database
     def mark_enqueue_delayed_processing
-      unless @_enqued_for_processing_with_processing.blank? # catches nil and empy arrays
+      unless @_enqued_for_processing_with_processing.blank? # catches nil and empty arrays
         updates = @_enqued_for_processing_with_processing.collect{|n| "#{n}_processing = :true" }.join(", ")
         updates = ActiveRecord::Base.send(:sanitize_sql_array, [updates, {:true => true}])
-        self.class.update_all(updates, "id = #{self.id}")
+        self.class.where(:id => self.id).update_all(updates)
       end
     end
 
@@ -81,6 +84,7 @@ module DelayedPaperclip
     # then create
     def enqueue_delayed_processing
       mark_enqueue_delayed_processing
+
       (@_enqued_for_processing || []).each do |name|
         enqueue_post_processing_for(name)
       end
@@ -98,6 +102,7 @@ module DelayedPaperclip
         @_enqued_for_processing_with_processing ||= []
         @_enqued_for_processing_with_processing << name
       end
+
       @_enqued_for_processing ||= []
       @_enqued_for_processing << name
     end

data/test/base_delayed_paperclip_test.rb

@@ -110,6 +110,20 @@ module BaseDelayedPaperclipTest
     assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
   end
 
+  def test_unprocessed_processing_url_when_file
+    reset_dummy :with_processed => true, :processing_image_url => "processing"
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert dummy.reload.image.url.starts_with?("processing")
+  end
+
+  def test_processed_default_url_when_no_file
+    reset_dummy :with_processed => true, :processing_image_url => "processing"
+    dummy = Dummy.new()
+    dummy.save!
+    assert dummy.reload.image.url.starts_with?("/images/original/missing.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"))
@@ -157,4 +171,66 @@ module BaseDelayedPaperclipTest
     dummy.name = "foobar123"
   end
 
+  def test_delayed_paperclip_functioning_with_only_process_option
+    reset_class "Dummy", :with_processed => true, :only_process => [:thumbnail]
+    Paperclip::Attachment.any_instance.expects(:reprocess!).with(:thumbnail)
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+  end
+
+  def test_delayed_paperclip_functioning_with_paperclip_only_process_option
+    reset_class "Dummy", :with_processed => true, :paperclip => { :only_process => [:thumbnail] }
+    Paperclip::Attachment.any_instance.expects(:reprocess!).with(:thumbnail)
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+  end
+
+  def test_delayed_paperclip_should_convert_image_formats
+    reset_class "Dummy", :with_processed => true, :paperclip => { :styles => {:thumbnail => ['12x12', :jpg]} }
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+    assert dummy.reload.image.url(:thumbnail).starts_with?("/system/dummies/images/000/000/001/thumbnail/12k.jpg")
+    assert File.exists?("#{RAILS_ROOT}/public/system/dummies/images/000/000/001/thumbnail/12k.jpg")
+  end
+
+  def test_delayed_paperclip_without_delay
+    reset_class "Dummy", :with_processed => true, :paperclip => { :styles => {:thumbnail => ['12x12', :jpg]} }
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    existing_jobs_count = jobs_count
+    dummy.update_attribute(:image_processing, false)
+    dummy.image.reprocess_without_delay!(:thumbnail)
+    Paperclip::Attachment.any_instance.expects(:reprocess!).never
+    assert_equal existing_jobs_count, jobs_count
+    assert_equal false, dummy.image_processing?
+    assert File.exists?("#{RAILS_ROOT}/public/system/dummies/images/000/000/001/thumbnail/12k.jpg")
+  end
+
+  def test_unprocess_image_interpolates_reprocessing_url
+    reset_class "Dummy", :paperclip => { :styles => {:thumbnail => '12x12'} }
+    reset_dummy :processing_image_url => "/images/:style/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")
+    assert dummy.image.url(:thumbnail).starts_with?("/images/thumbnail/processing.png")
+    process_jobs
+    dummy.reload
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
+  end
+
+  def test_unprocess_image_accepts_proc_for_reprocessing_url
+    reset_class "Dummy", :paperclip => { :styles => {:thumbnail => '12x12'} }
+    reset_dummy :processing_image_url => lambda { |attachment| attachment.instance.reprocessing_url }
+    Dummy.send(:define_method, :reprocessing_url) { 'done' }
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert dummy.image.url.starts_with?("done")
+    process_jobs
+    dummy.reload
+    assert dummy.image.url.starts_with?("/system/dummies/images/000/000/001/original/12k.png")
+  end
+
 end

data/test/delayed_paperclip_test.rb

@@ -39,6 +39,7 @@ class DelayedPaperclipTest < Test::Unit::TestCase
       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

data/test/test_helper.rb

@@ -5,6 +5,8 @@ require 'active_record'
 require 'logger'
 require 'sqlite3'
 require 'paperclip/railtie'
+require 'debugger'
+
 Paperclip::Railtie.insert
 
 ROOT       = File.join(File.dirname(__FILE__), '..')
@@ -51,19 +53,22 @@ def build_dummy_table(with_processed)
 end
 
 def reset_class(class_name, options)
+  options[:paperclip] = {} if options[:paperclip].nil?
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
   klass.class_eval do
     include Paperclip::Glue
-    has_attached_file     :image
+    has_attached_file  :image, options[:paperclip]
 
+    options.delete(:paperclip)
     process_in_background :image, options if options[:with_processed]
     after_update :reprocess if options[:with_after_update_callback]
 
     def reprocess
       image.reprocess!
     end
+
   end
   klass.reset_column_information
   klass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.5.1.0
+  version: 2.6.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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
@@ -120,21 +136,21 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- lib/delayed_paperclip/railtie.rb
-- lib/delayed_paperclip/jobs/delayed_job.rb
+- lib/delayed_paperclip.rb
+- lib/delayed_paperclip/url_generator.rb
+- lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/jobs/resque.rb
+- lib/delayed_paperclip/jobs/delayed_job.rb
 - lib/delayed_paperclip/jobs/sidekiq.rb
-- lib/delayed_paperclip/attachment.rb
+- lib/delayed_paperclip/railtie.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/delayed_paperclip_test.rb
+- test/database.yml
+- test/fixtures/12k.png
 - test/base_delayed_paperclip_test.rb
+- test/sidekiq_paperclip.rb
 - test/test_helper.rb
-- test/fixtures/12k.png
 - rails/init.rb
 homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
@@ -156,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Process your Paperclip attachments in the background.