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 000000000..8fdcfaf56 Binary files /dev/null and b/public/images/ajax-loader2.gif differ 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