delayed_paperclip 2.9.1 → 2.9.2

data/lib/delayed_paperclip/url_generator.rb

@@ -1,15 +1,10 @@
 require 'uri'
+require 'paperclip/url_generator'
 
 module DelayedPaperclip
-  module UrlGenerator
-    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 for_with_processed(style_name, options)
-      most_appropriate_url = @attachment.processing_style?(style_name) ? most_appropriate_url(style_name) : most_appropriate_url_without_processed
+  class UrlGenerator < ::Paperclip::UrlGenerator
+    def for(style_name, options)
+      most_appropriate_url = @attachment.processing_style?(style_name) ? most_appropriate_url(style_name) : most_appropriate_url()
 
       timestamp_as_needed(
         escape_url_as_needed(
@@ -20,27 +15,28 @@ module DelayedPaperclip
     end
 
     # This method is a mess
-    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?
+    def most_appropriate_url(style = nil)
+      if @attachment.processing_style?(style)
+        if @attachment.original_filename.nil? || delayed_default_url?(style)
+
+          if @attachment.delayed_options.nil? ||
+            @attachment.processing_image_url.nil? ||
+            !@attachment.processing?
+            default_url
+          else
+            @attachment.processing_image_url
+          end
 
-          default_url
         else
-          @attachment.processing_image_url
+          @attachment_options[:url]
         end
       else
-        @attachment_options[:url]
+        super()
       end
     end
 
-    def timestamp_possible_with_processed?
-      if delayed_default_url?
-        false
-      else
-        timestamp_possible_without_processed?
-      end
+    def timestamp_possible?
+      delayed_default_url? ? false : super
     end
 
     def delayed_default_url?(style = nil)
@@ -55,9 +51,7 @@ module DelayedPaperclip
 
     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.9.1"
+  VERSION = "2.9.2"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe DelayedPaperclip::Attachment do
-
   before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy(dummy_options)
@@ -11,27 +10,26 @@ describe DelayedPaperclip::Attachment do
   let(:dummy) { Dummy.create }
 
   describe "#delayed_options" do
-
     it "returns the specific options for delayed paperclip" do
-      dummy.image.delayed_options.should == {
+      expect(dummy.image.delayed_options).to eq({
         :priority => 0,
         :only_process => [],
         :url_with_processing => true,
         :processing_image_url => nil,
-        :queue => nil
-      }
+        :queue => "paperclip"
+      })
     end
   end
 
   describe "#post_processing_with_delay" do
     it "is true if delay_processing? is false" do
       dummy.image.stubs(:delay_processing?).returns false
-      dummy.image.post_processing_with_delay.should be_true
+      dummy.image.post_processing_with_delay.should be_truthy
     end
 
     it "is false if delay_processing? is true" do
       dummy.image.stubs(:delay_processing?).returns true
-      dummy.image.post_processing_with_delay.should be_false
+      dummy.image.post_processing_with_delay.should be_falsey
     end
 
     context "on a non-delayed image" do
@@ -39,7 +37,7 @@ describe DelayedPaperclip::Attachment do
 
       it "is false if delay_processing? is true" do
         dummy.image.stubs(:delay_processing?).returns true
-        dummy.image.post_processing_with_delay.should be_false
+        dummy.image.post_processing_with_delay.should be_falsey
       end
     end
   end
@@ -47,12 +45,12 @@ describe DelayedPaperclip::Attachment do
   describe "#delay_processing?" do
     it "returns delayed_options existence if post_processing_with_delay is nil" do
       dummy.image.post_processing_with_delay = nil
-      dummy.image.delay_processing?.should be_true
+      dummy.image.delay_processing?.should be_truthy
     end
 
     it "returns inverse of post_processing_with_delay if it's set" do
       dummy.image.post_processing_with_delay = true
-      dummy.image.delay_processing?.should be_false
+      dummy.image.delay_processing?.should be_falsey
     end
   end
 
@@ -66,7 +64,7 @@ describe DelayedPaperclip::Attachment do
       let(:dummy_options) { { with_processed: false } }
 
       it "returns false" do
-        expect(dummy.image.processing?).to be_false
+        expect(dummy.image.processing?).to be_falsey
       end
     end
   end
@@ -78,39 +76,55 @@ describe DelayedPaperclip::Attachment do
     context "without a processing column" do
       let(:dummy_options) { { with_processed: true, process_column: false } }
 
-      specify { expect(processing_style?).to be_false }
+      specify { expect(processing_style?).to be_falsey }
     end
 
     context "with a processing column" do
       context "when not processing" do
         before { dummy.image_processing = false }
 
-        specify { expect(processing_style?).to be_false }
+        specify { expect(processing_style?).to be_falsey }
       end
 
       context "when processing" do
         before { dummy.image_processing = true }
 
         context "when not split processing" do
-          specify { expect(processing_style?).to be_true }
+          specify { expect(processing_style?).to be_truthy }
         end
 
         context "when split processing" do
-          let(:dummy_options) { {
-            paperclip: {
-              styles: {
-                online: "400x400x",
-                background: "600x600x"
+          context "when delayed :only_process is an Array" do
+            let(:dummy_options) { {
+              paperclip: {
+                styles: {
+                  online: "400x400x",
+                  background: "600x600x"
+                },
+                only_process: [:online]
               },
-              only_process: [:online]
-            },
 
-            delayed_paperclip: {
               only_process: [:background]
-            }
-          }}
+            }}
+
+            specify { expect(processing_style?).to be }
+          end
+
+          context "when delayed :only_process is callable" do
+            let(:dummy_options) { {
+              paperclip: {
+                styles: {
+                  online: "400x400x",
+                  background: "600x600x"
+                },
+                only_process: [:online]
+              },
+
+              only_process: lambda { |a| [:background] }
+            }}
 
-          specify { expect(processing_style?).to be }
+            specify { expect(processing_style?).to be }
+          end
         end
       end
     end
@@ -220,7 +234,7 @@ describe DelayedPaperclip::Attachment do
 
       dummy.image.send(:update_processing_column)
 
-      dummy.image_processing.should be_false
+      dummy.image_processing.should be_falsey
     end
   end
 
@@ -252,4 +266,62 @@ describe DelayedPaperclip::Attachment do
       dummy.image.instance_variable_get(:@post_processing_with_delay).should == true
     end
   end
+
+  describe "#split_processing?" do
+    let(:split_processing?) { dummy.image.split_processing? }
+
+    let(:paperclip_styles) { {
+      online: "400x400x",
+      background: "600x600x"
+    } }
+
+    context ":only_process option is set on attachment" do
+      let(:dummy_options) { {
+        paperclip: {
+          styles: paperclip_styles,
+          only_process: [:online]
+        },
+
+        only_process: delayed_only_process
+      }}
+
+      context "processing different styles in background" do
+        context "when delayed :only_process is an Array" do
+          let(:delayed_only_process) { [:background] }
+
+          specify { expect(split_processing?).to be true }
+        end
+
+        context "when delayed :only_process is callable" do
+          let(:delayed_only_process) { lambda { |a| [:background] } }
+
+          specify { expect(split_processing?).to be true }
+        end
+      end
+
+      context "processing same styles in background" do
+        context "when delayed :only_process is an Array" do
+          let(:delayed_only_process) { [:online] }
+
+          specify { expect(split_processing?).to be false }
+        end
+
+        context "when delayed :only_process is callable" do
+          let(:delayed_only_process) { lambda { |a| [:online] } }
+
+          specify { expect(split_processing?).to be false }
+        end
+      end
+    end
+
+    context ":only_process option is not set on attachment" do
+      let(:dummy_options) { {
+        paperclip: {
+          styles: paperclip_styles
+        }
+      }}
+
+      specify { expect(split_processing?).to be false }
+    end
+  end
 end

data/spec/delayed_paperclip/class_methods_spec.rb

@@ -1,14 +1,12 @@
 require 'spec_helper'
 
 describe DelayedPaperclip::ClassMethods do
-
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy(with_processed: false)
   end
 
   describe ".process_in_background" do
-
     it "is empty to start" do
       Dummy.paperclip_definitions.should == { :image => {} }
     end
@@ -21,11 +19,24 @@ describe DelayedPaperclip::ClassMethods do
           :only_process => [],
           :url_with_processing => true,
           :processing_image_url => nil,
-          :queue => nil}
+          :queue => "paperclip"}
         }
       }
     end
 
+    it "allows to set queue name" do
+      Dummy.process_in_background(:image, :queue => "custom")
+      expect(Dummy.paperclip_definitions).to eq({ :image => {
+        :delayed => {
+          :priority => 0,
+          :only_process => [],
+          :url_with_processing => true,
+          :processing_image_url => nil,
+          :queue => "custom"}
+        }
+      })
+    end
+
     context "with processing_image_url" do
       before :each do
         Dummy.process_in_background(:image, processing_image_url: "/processing/url")
@@ -38,7 +49,7 @@ describe DelayedPaperclip::ClassMethods do
             :only_process => [],
             :url_with_processing => true,
             :processing_image_url => "/processing/url",
-            :queue => nil}
+            :queue => "paperclip"}
           }
         }
       end
@@ -58,7 +69,7 @@ describe DelayedPaperclip::ClassMethods do
             :only_process => [:small, :large],
             :url_with_processing => true,
             :processing_image_url => nil,
-            :queue => nil}
+            :queue => "paperclip"}
           }
         }
       end
@@ -73,16 +84,13 @@ describe DelayedPaperclip::ClassMethods do
       end
 
       context "save" do
-        before :each do
-          Dummy.stubs(:respond_to?).with(:after_commit).returns(false)
-        end
-
         it "sets after_save callback" do
+          Dummy.stubs(:respond_to?).with(:attachment_definitions).returns(true)
+          Dummy.stubs(:respond_to?).with(:after_commit).returns(false)
           Dummy.expects(:after_save).with(:enqueue_delayed_processing)
           Dummy.process_in_background(:image)
         end
       end
     end
   end
-
-end
+end

data/spec/delayed_paperclip/instance_methods_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe DelayedPaperclip::InstanceMethods do
-
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy
   end
@@ -10,7 +9,6 @@ describe DelayedPaperclip::InstanceMethods do
   let(:dummy) { Dummy.create }
 
   describe "#enqueue_delayed_processing" do
-
     it "marks enqueue_delayed_processing" do
       dummy.expects(:mark_enqueue_delayed_processing)
       dummy.enqueue_delayed_processing
@@ -25,25 +23,25 @@ describe DelayedPaperclip::InstanceMethods do
     it "clears instance variables" do
       dummy.instance_variable_set(:@_enqued_for_processing, ['foo'])
       dummy.instance_variable_set(:@_enqued_for_processing_with_processing, ['image'])
+      dummy.expects(:enqueue_post_processing_for).with('foo')
       dummy.enqueue_delayed_processing
       dummy.instance_variable_get(:@_enqued_for_processing).should == []
       dummy.instance_variable_get(:@_enqued_for_processing_with_processing).should == []
     end
-
   end
 
   describe "#mark_enqueue_delayed_processing" do
     it "updates columns of _processing" do
-      dummy.image_processing.should be_false
+      dummy.image_processing.should be_falsey
       dummy.instance_variable_set(:@_enqued_for_processing_with_processing, ['image'])
       dummy.mark_enqueue_delayed_processing
-      dummy.reload.image_processing.should be_true
+      dummy.reload.image_processing.should be_truthy
     end
 
     it "does nothing if instance variable not set" do
-      dummy.image_processing.should be_false
+      dummy.image_processing.should be_falsey
       dummy.mark_enqueue_delayed_processing
-      dummy.reload.image_processing.should be_false
+      dummy.reload.image_processing.should be_falsey
     end
   end
 
@@ -56,9 +54,9 @@ describe DelayedPaperclip::InstanceMethods do
 
   describe "#prepare_enqueueing_for" do
     it "updates processing column to true" do
-      dummy.image_processing.should be_false
+      dummy.image_processing.should be_falsey
       dummy.prepare_enqueueing_for("image")
-      dummy.image_processing.should be_true
+      dummy.image_processing.should be_truthy
     end
 
     it "sets instance variables for column updating" do
@@ -71,6 +69,4 @@ describe DelayedPaperclip::InstanceMethods do
       dummy.instance_variable_get(:@_enqued_for_processing).should == ["image"]
     end
   end
-
-
 end

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -10,13 +10,13 @@ describe DelayedPaperclip::UrlGenerator do
   let(:attachment) { dummy.image }
   let(:dummy_options) { {} }
 
-  describe "for_with_processed" do
-    before do
+  describe "for" do
+    before :each do
       attachment.stubs(:original_filename).returns "12k.png"
     end
 
     context "with split processing" do
-      # everything in this hash is passed to delayed_paperclip, expect for the
+      # everything in this hash is passed to delayed_paperclip, except for the
       # paperclip stuff
       let(:dummy_options) { {
         paperclip: {
@@ -31,7 +31,7 @@ describe DelayedPaperclip::UrlGenerator do
       }}
 
       context "processing" do
-        before do
+        before :each do
           attachment.stubs(:processing?).returns true
         end
 
@@ -45,7 +45,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       context "not processing" do
-        before do
+        before :each do
           attachment.stubs(:processing?).returns false
         end
 
@@ -86,9 +86,9 @@ describe DelayedPaperclip::UrlGenerator do
     end
   end
 
-  describe "#most_appropriate_url_with_processed" do
+  describe "#most_appropriate_url" do
     context "without delayed_default_url" do
-      subject { Paperclip::UrlGenerator.new(attachment, {url: "/blah/url.jpg"})}
+      subject { DelayedPaperclip::UrlGenerator.new(attachment, {url: "/blah/url.jpg"})}
 
       before :each do
         subject.stubs(:delayed_default_url?).returns false
@@ -99,7 +99,7 @@ describe DelayedPaperclip::UrlGenerator do
         end
 
         it "returns options url" do
-          subject.most_appropriate_url_with_processed.should == "/blah/url.jpg"
+          subject.most_appropriate_url.should == "/blah/url.jpg"
         end
       end
 
@@ -115,13 +115,13 @@ describe DelayedPaperclip::UrlGenerator do
 
           it "gets default url" do
             subject.expects(:default_url)
-            subject.most_appropriate_url_with_processed
+            subject.most_appropriate_url
           end
         end
 
         context "with delayed_options" do
           before :each do
-            attachment.stubs(:delayed_options).returns "something"
+            attachment.stubs(:delayed_options).returns(some: 'thing')
           end
 
           context "without processing_image_url" do
@@ -131,7 +131,7 @@ describe DelayedPaperclip::UrlGenerator do
 
             it "gets default url" do
               subject.expects(:default_url)
-              subject.most_appropriate_url_with_processed
+              subject.most_appropriate_url
             end
           end
 
@@ -146,14 +146,14 @@ describe DelayedPaperclip::UrlGenerator do
               end
 
               it "gets processing url" do
-                subject.most_appropriate_url_with_processed.should == "/processing/image.jpg"
+                subject.most_appropriate_url.should == "/processing/image.jpg"
               end
             end
 
             context "and is not processing" do
               it "gets default url" do
                 subject.expects(:default_url)
-                subject.most_appropriate_url_with_processed
+                subject.most_appropriate_url
               end
             end
           end
@@ -162,8 +162,8 @@ describe DelayedPaperclip::UrlGenerator do
     end
   end
 
-  describe "#timestamp_possible_with_processed?" do
-    subject { Paperclip::UrlGenerator.new(attachment, {})}
+  describe "#timestamp_possible?" do
+    subject { DelayedPaperclip::UrlGenerator.new(attachment, {})}
 
     context "with delayed_default_url" do
       before :each do
@@ -171,7 +171,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "is false" do
-        subject.timestamp_possible_with_processed?.should be_false
+        subject.timestamp_possible?.should be_falsey
       end
     end
 
@@ -181,14 +181,14 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "goes up the chain" do
-        subject.expects(:timestamp_possible_without_processed?)
-        subject.timestamp_possible_with_processed?
+        subject.class.superclass.any_instance.expects(:timestamp_possible?)
+        subject.timestamp_possible?
       end
     end
   end
 
   describe "#delayed_default_url?" do
-    subject { Paperclip::UrlGenerator.new(attachment, {})}
+    subject { DelayedPaperclip::UrlGenerator.new(attachment, {})}
 
     before :each do
       attachment.stubs(:job_is_processing).returns false
@@ -200,7 +200,7 @@ describe DelayedPaperclip::UrlGenerator do
     end
 
     it "has all false, delayed_default_url returns true" do
-      subject.delayed_default_url?.should be_true
+      subject.delayed_default_url?.should be_truthy
     end
 
     context "job is processing" do
@@ -209,7 +209,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "returns true" do
-        subject.delayed_default_url?.should be_false
+        subject.delayed_default_url?.should be_falsey
       end
     end
 
@@ -219,7 +219,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "returns true" do
-        subject.delayed_default_url?.should be_false
+        subject.delayed_default_url?.should be_falsey
       end
     end
 
@@ -229,7 +229,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "returns true" do
-        subject.delayed_default_url?.should be_false
+        subject.delayed_default_url?.should be_falsey
       end
     end
 
@@ -240,7 +240,7 @@ describe DelayedPaperclip::UrlGenerator do
       end
 
       it "returns true" do
-        subject.delayed_default_url?.should be_false
+        subject.delayed_default_url?.should be_falsey
       end
     end