delayed_paperclip 2.4.4.0 → 2.4.5.0

data/lib/delayed_paperclip/attachment.rb

@@ -7,7 +7,7 @@ module DelayedPaperclip
       base.alias_method_chain :post_processing, :delay
       base.alias_method_chain :post_processing=, :delay
       base.alias_method_chain :save, :prepare_enqueueing
-      base.alias_method_chain :url, :processed
+      base.alias_method_chain :most_appropriate_url, :processed
       base.alias_method_chain :post_process_styles, :processing
     end
 
@@ -21,9 +21,13 @@ module DelayedPaperclip
         @post_processing_with_delay = value
       end
 
+      def delayed_options
+        @instance.class.attachment_definitions[@name][:delayed]
+      end
+
       def delay_processing?
         if @post_processing_with_delay.nil?
-          !!@instance.class.attachment_definitions[@name][:delayed]
+          !!delayed_options
         else
            !@post_processing_with_delay
         end
@@ -53,25 +57,18 @@ module DelayedPaperclip
         end
       end
 
-      def url_with_processed style = default_style, include_updated_timestamp = @options.use_timestamp
-        return url_without_processed style, include_updated_timestamp if !@instance.class.attachment_definitions[@name][:delayed].try(:[], :url_with_processing) || job_is_processing
-
-        if !@instance.respond_to?(:"#{name}_processing?")
-          url_without_processed style, include_updated_timestamp
+      def most_appropriate_url_with_processed
+        if original_filename.nil? || delayed_default_url?
+          default_url
         else
-          if !processing?
-            url_without_processed style, include_updated_timestamp
-          else
-            if dirty?
-              url_without_processed style, include_updated_timestamp
-            else
-              default_url = @options.default_url.is_a?(Proc) ? @options.default_url.call(self) : @options.default_url
-              interpolate(default_url, style)
-            end
-          end
+          @options.url
         end
       end
 
+      def delayed_default_url?
+        !(job_is_processing || dirty? || !delayed_options.try(:[], :url_with_processing) || !(@instance.respond_to?(:"#{name}_processing?") && processing?))
+      end
+
     end
   end
 end

data/test/base_delayed_paperclip_test.rb

@@ -73,7 +73,7 @@ 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
+    assert_equal "/images/original/missing.png", dummy.image.url(:original, :timestamp => false)
     process_jobs
     dummy.reload
     assert_match /\/system\/images\/1\/original\/12k.png/, dummy.image.url
@@ -112,7 +112,7 @@ module BaseDelayedPaperclipTest
     dummy.save!
     dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
     dummy.save!
-    assert_equal '/images/original/missing.png', dummy.image.url
+    assert_equal '/images/original/missing.png', dummy.image.url(:original, :timestamp => false)
     process_jobs
     assert_match(/system\/images\/.*original.*/, dummy.reload.image.url)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.4.4.0
+  version: 2.4.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,18 +14,18 @@ date: 2011-11-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2152842880 !ruby/object:Gem::Requirement
+  requirement: &2165116360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152842880
+  version_requirements: *2165116360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152842460 !ruby/object:Gem::Requirement
+  requirement: &2165115920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152842460
+  version_requirements: *2165115920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152841940 !ruby/object:Gem::Requirement
+  requirement: &2165115400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152841940
+  version_requirements: *2165115400
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &2152841460 !ruby/object:Gem::Requirement
+  requirement: &2165114820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152841460
+  version_requirements: *2165114820
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2152840980 !ruby/object:Gem::Requirement
+  requirement: &2165114300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152840980
+  version_requirements: *2165114300
 description: Process your Paperclip attachments in the background with delayed_job,
   Resque or your own processor.
 email: jesse@jstorimer.com