From bca184eaf3c4e028e43fcbb21b38d330e43e5f63 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 15 Mar 2011 17:59:56 -0700
Subject: [PATCH] photos are now successfully delayed

---
 app/controllers/status_messages_controller.rb    |   2 +-
 app/models/jobs/process_photo.rb                 |   9 ++++++++-
 app/uploaders/image_uploader.rb                  |   1 +
 public/images/ajax-loader2.gif                   | Bin 0 -> 3720 bytes
 .../status_messages_controller_spec.rb           |   4 ++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 public/images/ajax-loader2.gif

diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index f99a4001b..ef0557def 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -56,7 +56,7 @@ class StatusMessagesController < ApplicationController
           end
         end
         photos.update_all(:pending => false, :public => public_flag)
-        photos.each{|x| x.queue_post_process}
+        photos.each{|x| x.queue_processing_job; puts "i did it"}
       end
 
       if request.env['HTTP_REFERER'].include?("people")
diff --git a/app/models/jobs/process_photo.rb b/app/models/jobs/process_photo.rb
index c761b2102..04cd3c1e8 100644
--- a/app/models/jobs/process_photo.rb
+++ b/app/models/jobs/process_photo.rb
@@ -7,7 +7,14 @@ module Job
   class ProcessPhoto < Base 
     @queue = :photos
     def self.perform_delegate(photo_id)
-      Photo.find(photo_id).image.post_process
+      begin
+        Photo.find(photo_id).image.post_process
+      rescue Exception => e
+        puts e.inspect
+
+      ensure
+        puts "photo has been processed"
+      end
     end
   end
 end
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 61cc524c0..d3783a9d5 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -18,6 +18,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   end
 
   def post_process
+    self.send(:remove_versions!)
     unless self.file.file.include? '.gif'
       ImageUploader.instance_eval do
         version :thumb_small do
diff --git a/public/images/ajax-loader2.gif b/public/images/ajax-loader2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8fdcfaf56d783cc7e6c7f144de96a79031d3f167
GIT binary patch
literal 3720
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
Sg0~_|TyOeCum4@YjK2X~9tukU

literal 0
HcmV?d00001

diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 77ca3539c..4aad54724 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -158,6 +158,10 @@ describe StatusMessagesController do
         @photo1.reload.pending.should be_false
         @photo2.reload.pending.should be_false
       end
+
+      it 'queues all photos to be processed' do
+        pending
+      end
     end
   end