diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index f99a4001b4c44ee005c480974d06a29da9a7aefc..ef0557def267b5639c631601964a44592d2a3a0b 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 c761b210246c9d9f4c91279597738beeef5cb20b..04cd3c1e80532f5e1d60ae76a85be60ed0bea10a 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 61cc524c014d3e05d806535cd005b67bead1a9df..d3783a9d56f837b9022d1f8537a94a116a4470ce 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 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 77ca3539ccae5ae32ef50041ad926adf9d1227fc..4aad54724960945b4663d23c29567476e276da57 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