delayed_paperclip 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/delayed_paperclip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_paperclip}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Storimer"]

data/lib/delayed/jobs/delayed_paperclip_job.rb

@@ -1,15 +1,19 @@
 class DelayedPaperclipJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
   def perform
-    instance = instance_klass.constantize.find(instance_id)
-
-    instance.send("#{attachment_name}_processed!")
-    begin
+    process_job do
       instance.send(attachment_name).reprocess!
-    rescue Exception => e
-      instance.send("#{attachment_name}_processing!", :save => true)
-      
-      # DJ will now pickup this error and do its error handling
-      raise(e)
+      instance.send("#{attachment_name}_processed!")
     end
   end
+  
+  private
+  def instance
+    @instance ||= instance_klass.constantize.find(instance_id)
+  end
+  
+  def process_job
+    instance.send(attachment_name).job_is_processing = true
+    yield
+    instance.send(attachment_name).job_is_processing = false    
+  end
 end

data/lib/delayed/jobs/resque_paperclip_job.rb

@@ -4,14 +4,16 @@ class ResquePaperclipJob
   def self.perform(instance_klass, instance_id, attachment_name)
     instance = instance_klass.constantize.find(instance_id)
 
-    instance.send("#{attachment_name}_processed!")
-    begin
+    process_job(instance, attachment_name) do
       instance.send(attachment_name).reprocess!
-    rescue Object => e
-      instance.send("#{attachment_name}_processing!", :save => true)
-      
-      # Hand the error off to Resque
-      raise(e)
+      instance.send("#{attachment_name}_processed!")
     end
   end
+  
+  private
+  def self.process_job(instance, attachment_name)
+    instance.send(attachment_name).job_is_processing = true
+    yield
+    instance.send(attachment_name).job_is_processing = false        
+  end
 end

data/lib/delayed/paperclip.rb

@@ -36,17 +36,12 @@ module Delayed
           self.save(false)
         end
 
-        define_method "#{name}_processing!" do |*args|
-          force_save = args.first
+        define_method "#{name}_processing!" do
           return unless column_exists?(:"#{name}_processing")
-          
-          unless force_save
-            return if self.send(:"#{name}_processing?")
-            return unless self.send(:"#{name}_changed?")
-          end
+          return if self.send(:"#{name}_processing?")
+          return unless self.send(:"#{name}_changed?")
 
           self.send("#{name}_processing=", true)
-          self.save(false) if force_save
         end
 
         self.send("before_#{name}_post_process", :"halt_processing_for_#{name}")
@@ -87,7 +82,11 @@ end
 
 module Paperclip
   class Attachment
+    attr_accessor :job_is_processing
+    
     def url_with_processed style = default_style, include_updated_timestamp = true
+      return url_without_processed style, include_updated_timestamp if job_is_processing
+    
       if !@instance.column_exists?(:"#{@name}_processing")
         url_without_processed style, include_updated_timestamp
       else

data/test/delayed_paperclip_test.rb

@@ -138,19 +138,4 @@ class DelayedPaperclipTest < Test::Unit::TestCase
 
     assert_match(/images\/.*missing.*/, @dummy.image.url)
   end
-  
-  def test_attachment_processing_with_no_args
-    Dummy.any_instance.expects(:save).never
-
-    @dummy.image_processing!
-  end
-
-  def test_attachment_processing_with_args
-    Dummy.any_instance.stubs(:image_processing?).returns(true)
-    @dummy = reset_dummy(true)    
-    @dummy.image_content_type_will_change!
-    @dummy.expects(:save).with(false)
-
-    @dummy.image_processing!(:save => true)
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Jesse Storimer