delayed_paperclip 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/delayed_paperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_paperclip}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Storimer"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-03-08}
   s.description = %q{Process your Paperclip attachments in the background with delayed_job.}
   s.email = %q{jesse@jstorimer.com}
   s.extra_rdoc_files = [

data/lib/delayed/jobs/delayed_paperclip_job.rb

@@ -2,7 +2,14 @@ class DelayedPaperclipJob < Struct.new(:instance_klass, :instance_id, :attachmen
   def perform
     instance = instance_klass.constantize.find(instance_id)
 
-    instance.send(attachment_name).reprocess!
     instance.send("#{attachment_name}_processed!")
+    begin
+      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)
+    end
   end
 end

data/lib/delayed/jobs/resque_paperclip_job.rb

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

data/lib/delayed/paperclip.rb

@@ -9,7 +9,7 @@ module Delayed
         include InstanceMethods
 
         define_method "#{name}_changed?" do
-          attachment_changed?(name)
+          attachment_has_changed?(name)
         end
 
         define_method "halt_processing_for_#{name}" do
@@ -36,12 +36,17 @@ module Delayed
           self.save(false)
         end
 
-        define_method "#{name}_processing!" do
+        define_method "#{name}_processing!" do |*args|
+          force_save = args.first
           return unless column_exists?(:"#{name}_processing")
-          return if self.send(:"#{name}_processing?")
-          return unless self.send(:"#{name}_changed?")
+          
+          unless force_save
+            return if self.send(:"#{name}_processing?")
+            return unless self.send(:"#{name}_changed?")
+          end
 
           self.send("#{name}_processing=", true)
+          self.save(false) if force_save
         end
 
         self.send("before_#{name}_post_process", :"halt_processing_for_#{name}")
@@ -53,8 +58,8 @@ module Delayed
 
     module InstanceMethods
       PAPERCLIP_ATTRIBUTES = ['_file_size', '_file_name', '_content_type', '_updated_at']
-
-      def attachment_changed?(name)
+      
+      def attachment_has_changed?(name)
         PAPERCLIP_ATTRIBUTES.each do |attribute|
           full_attribute = "#{name}#{attribute}_changed?".to_sym
 
@@ -89,7 +94,11 @@ module Paperclip
         if !@instance.send(:"#{@name}_processing?")
           url_without_processed style, include_updated_timestamp
         else
-          interpolate(@default_url, style)
+          if @instance.send(:"#{@name}_changed?")
+            url_without_processed style, include_updated_timestamp
+          else
+            interpolate(@default_url, style)
+          end
         end
       end
     end

data/test/delayed_paperclip_test.rb

@@ -59,6 +59,18 @@ class DelayedPaperclipTest < Test::Unit::TestCase
     @dummy.save!
     Delayed::Job.last.payload_object.perform
   end
+  
+  def test_processing_column_kept_intact
+    @dummy = reset_dummy(true)
+    
+    @dummy.stubs(:image_changed?).returns(true)
+    Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
+
+    @dummy.save!
+    assert @dummy.image_processing?
+    Delayed::Job.work_off
+    assert @dummy.reload.image_processing?
+  end
 
   def test_after_callback_is_functional
     @dummy_class.send(:define_method, :done_processing) { puts 'done' }
@@ -109,10 +121,36 @@ class DelayedPaperclipTest < Test::Unit::TestCase
     @dummy.save!
 
     assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
-
-    # Delayed::Job.first.invoke_job
-    # 
-    # @dummy.reload
-    # assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
   end    
+  
+  def test_original_url_if_image_changed
+    @dummy = reset_dummy(true)    
+    @dummy.image_processing!
+    @dummy.image_content_type_will_change!
+
+    assert_match(/system\/images\/.*original.*/, @dummy.image.url)
+  end
+  
+  def test_missing_url_if_image_hasnt_changed
+    @dummy = reset_dummy(true)    
+    @dummy.image_processing!
+    @dummy.stubs(:image_changed?).returns(false)
+
+    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

data/test/resque_paperclip_test.rb

@@ -7,6 +7,7 @@ class ResquePaperclipTest < Test::Unit::TestCase
     # Make sure that we just test Resque in here
     Object.send(:remove_const, :Delayed) if defined? Delayed
 
+    Resque.remove_queue(:paperclip)
     reset_dummy
   end
 
@@ -34,4 +35,19 @@ class ResquePaperclipTest < Test::Unit::TestCase
     @dummy.save!
     ResquePaperclipJob.perform(@dummy.class.name, @dummy.id, :image)
   end
+  
+  def test_processing_column_kept_intact
+    @dummy = reset_dummy(true)
+    
+    @dummy.stubs(:image_changed?).returns(true)
+    Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
+
+    @dummy.save!
+    assert @dummy.image_processing?
+    
+    worker = Resque::Worker.new(:paperclip)
+    worker.process
+    
+    assert @dummy.reload.image_processing?
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency