delayed_paperclip 2.6.1 → 2.7.0

data/gemfiles/rails4.gemfile

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

data/gemfiles/rails4.gemfile.lock

@@ -0,0 +1,157 @@
+PATH
+  remote: ..
+  specs:
+    delayed_paperclip (2.7.0)
+      paperclip (>= 3.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.2)
+    atomic (1.1.14)
+    builder (3.1.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.3)
+      climate_control (>= 0.0.3, < 1.0)
+    connection_pool (1.2.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.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.3)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    mono_logger (1.1.0)
+    multi_json (1.8.4)
+    paperclip (4.1.0)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.1)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.2)
+      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.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
+    sidekiq (2.17.6)
+      celluloid (>= 0.15.2)
+      connection_pool (>= 1.0.0)
+      json
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sprockets (2.10.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    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 (~> 4.0.3)
+  railties
+  rake
+  resque
+  rspec
+  sidekiq
+  sqlite3

data/lib/delayed_paperclip.rb

@@ -30,7 +30,7 @@ module DelayedPaperclip
     end
 
     def process_job(instance_klass, instance_id, attachment_name)
-      instance_klass.constantize.find(instance_id).
+      instance_klass.constantize.unscoped.find(instance_id).
         send(attachment_name).
         process_delayed!
     end
@@ -51,11 +51,14 @@ module DelayedPaperclip
       paperclip_definitions[name][:delayed] = {}
 
       # Set Defaults
+      only_process_default = paperclip_definitions[name][:only_process]
+      only_process_default ||= []
       {
         :priority => 0,
-        :only_process => paperclip_definitions[name][:only_process],
+        :only_process => only_process_default,
         :url_with_processing => DelayedPaperclip.options[:url_with_processing],
-        :processing_image_url => options[:processing_image_url]
+        :processing_image_url => options[:processing_image_url],
+        :queue => nil
       }.each do |option, default|
 
         paperclip_definitions[name][:delayed][option] = options.key?(option) ? options[option] : default

data/lib/delayed_paperclip/attachment.rb

@@ -13,12 +13,12 @@ module DelayedPaperclip
     module InstanceMethods
 
       def delayed_options
-        @instance.class.paperclip_definitions[@name][:delayed]
+        @options[:delayed]
       end
 
       # Attr accessor in Paperclip
       def post_processing_with_delay
-        !delay_processing?
+        !delay_processing? || split_processing?
       end
 
       def post_processing_with_delay=(value)
@@ -35,8 +35,21 @@ module DelayedPaperclip
         end
       end
 
+      def split_processing?
+        options[:only_process] &&
+          options[:only_process] !=
+            options[:delayed][:only_process]
+      end
+
       def processing?
-        @instance.send(:"#{@name}_processing?")
+        column_name = :"#{@name}_processing?"
+        @instance.respond_to?(column_name) && @instance.send(column_name)
+      end
+
+      def processing_style?(style)
+        return false if !processing?
+
+        !split_processing? || delayed_options[:only_process].include?(style)
       end
 
       def process_delayed!
@@ -47,7 +60,7 @@ module DelayedPaperclip
       end
 
       def processing_image_url
-        processing_image_url = @options[:delayed][:processing_image_url]
+        processing_image_url = delayed_options[:processing_image_url]
         processing_image_url = processing_image_url.call(self) if processing_image_url.respond_to?(:call)
         processing_image_url
       end

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -4,12 +4,13 @@ module DelayedPaperclip
   module Jobs
     class DelayedJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
 
-      if defined?(::Delayed::DeserializationError) # 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") # this is available in newer versions of DelayedJob. Using the newee Job api thus.
 
         def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
           ::Delayed::Job.enqueue(
             :payload_object => new(instance_klass, instance_id, attachment_name),
-            :priority => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i
+            :priority => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,
+            :queue => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
           )
         end
 
@@ -18,7 +19,8 @@ module DelayedPaperclip
         def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
           ::Delayed::Job.enqueue(
             new(instance_klass, instance_id, attachment_name),
-            instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i
+            instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,
+            instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
           )
         end
 

data/lib/delayed_paperclip/url_generator.rb

@@ -5,10 +5,21 @@ module DelayedPaperclip
     def self.included(base)
       base.alias_method_chain :most_appropriate_url, :processed
       base.alias_method_chain :timestamp_possible?, :processed
+      base.alias_method_chain :for, :processed
     end
 
-    def most_appropriate_url_with_processed
-      if @attachment.original_filename.nil? || delayed_default_url?
+    def for_with_processed(style_name, options)
+      most_appropriate_url = most_appropriate_url(style_name)
+
+      escape_url_as_needed(
+        timestamp_as_needed(
+          @attachment_options[:interpolator].interpolate(most_appropriate_url, @attachment, style_name),
+          options
+      ), options)
+    end
+
+    def most_appropriate_url_with_processed(style = nil)
+      if @attachment.original_filename.nil? || delayed_default_url?(style)
         if @attachment.delayed_options.nil? || @attachment.processing_image_url.nil? || !@attachment.processing?
           default_url
         else
@@ -27,11 +38,11 @@ module DelayedPaperclip
       end
     end
 
-    def delayed_default_url?
+    def delayed_default_url?(style = nil)
       return false if @attachment.job_is_processing
       return false if @attachment.dirty?
       return false if not @attachment.delayed_options.try(:[], :url_with_processing)
-      return false if not (@attachment.instance.respond_to?(:"#{@attachment.name}_processing?") && @attachment.processing?)
+      return false if not processing?(style)
       true
 
       # OLD CRAZY CONDITIONAL
@@ -43,6 +54,13 @@ module DelayedPaperclip
       #   !(@attachment.instance.respond_to?(:"#{@attachment.name}_processing?") && @attachment.processing?)
       # )
     end
+
+    private
+    def processing?(style)
+      return true if @attachment.processing?
+
+      return @attachment.processing_style?(style) if style
+    end
   end
 
 end

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe DelayedPaperclip::Attachment do
 
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    reset_dummy
+    reset_dummy(dummy_options)
   end
 
+  let(:dummy_options) { {} }
   let(:dummy) { Dummy.create }
 
   describe "#delayed_options" do
@@ -14,12 +15,12 @@ describe DelayedPaperclip::Attachment do
     it "returns the specific options for delayed paperclip" do
       dummy.image.delayed_options.should == {
         :priority => 0,
-        :only_process => nil,
+        :only_process => [],
         :url_with_processing => true,
-        :processing_image_url => nil
+        :processing_image_url => nil,
+        :queue => nil
       }
     end
-
   end
 
   describe "#post_processing_with_delay" do
@@ -51,6 +52,59 @@ describe DelayedPaperclip::Attachment do
       dummy.expects(:image_processing?)
       dummy.image.processing?
     end
+
+    context "without a processing column" do
+      let(:dummy_options) { { with_processed: false } }
+
+      it "returns false" do
+        expect(dummy.image.processing?).to be_false
+      end
+    end
+  end
+
+  describe "processing_stye?" do
+    let(:style) { :background }
+    let(:processing_style?) { dummy.image.processing_style?(style) }
+
+    context "without a processing column" do
+      let(:dummy_options) { { with_processed: true, process_column: false } }
+
+      specify { expect(processing_style?).to be_false }
+    end
+
+    context "with a processing column" do
+      context "when not processing" do
+        before { dummy.image_processing = false }
+
+        specify { expect(processing_style?).to be_false }
+      end
+
+      context "when processing" do
+        before { dummy.image_processing = true }
+
+        context "when not split processing" do
+          specify { expect(processing_style?).to be_true }
+        end
+
+        context "when split processing" do
+          let(:dummy_options) { {
+            paperclip: {
+              styles: {
+                online: "400x400x",
+                background: "600x600x"
+              },
+              only_process: [:online]
+            },
+
+            delayed_paperclip: {
+              only_process: [:background]
+            }
+          }}
+
+          specify { expect(processing_style?).to be }
+        end
+      end
+    end
   end
 
   describe "process_delayed!" do
@@ -120,6 +174,13 @@ describe DelayedPaperclip::Attachment do
 
       dummy.image_processing.should be_false
     end
+
+    it "still flushes temp files" do
+      dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
+      paths = dummy.image.queued_for_write.values.map(&:path)
+      dummy.image.after_flush_writes_with_processing
+      paths.none?{ |path| File.exists?(path) }.should be_true
+    end
   end
 
   describe "#save_with_prepare_enqueueing" do
@@ -150,4 +211,4 @@ describe DelayedPaperclip::Attachment do
       dummy.image.instance_variable_get(:@post_processing_with_delay).should == true
     end
   end
-end
+end

data/spec/delayed_paperclip/class_methods_spec.rb

@@ -18,9 +18,10 @@ describe DelayedPaperclip::ClassMethods do
       Dummy.paperclip_definitions.should == { :image => {
         :delayed => {
           :priority => 0,
-          :only_process => nil,
+          :only_process => [],
           :url_with_processing => true,
-          :processing_image_url => nil}
+          :processing_image_url => nil,
+          :queue => nil}
         }
       }
     end
@@ -34,9 +35,10 @@ describe DelayedPaperclip::ClassMethods do
         Dummy.paperclip_definitions.should == { :image => {
           :delayed => {
             :priority => 0,
-            :only_process => nil,
+            :only_process => [],
             :url_with_processing => true,
-            :processing_image_url => "/processing/url"}
+            :processing_image_url => "/processing/url",
+            :queue => nil}
           }
         }
       end
@@ -55,7 +57,8 @@ describe DelayedPaperclip::ClassMethods do
             :priority => 0,
             :only_process => [:small, :large],
             :url_with_processing => true,
-            :processing_image_url => nil }
+            :processing_image_url => nil,
+            :queue => nil}
           }
         }
       end