Commit a536c544

mo k <mo@mokhan.ca>
2012-10-09 03:15:54
bring back the backgrounding code.
1 parent 10cd016
Changed files (2)
app
app/models/photo.rb
@@ -6,7 +6,7 @@ class Photo < ActiveRecord::Base
   #attr_accessor :crop_x, :crop_y, :crop_h, :crop_w
   #after_update :reprocess_image, :if => :cropping?
 
-  #after_save :enqueue
+  after_save :enqueue
 
   #def reprocess_image
     #begin
@@ -21,7 +21,6 @@ class Photo < ActiveRecord::Base
   #end
 
   def watermark
-    puts "#{creation} #{creation.watermark}"
     creation.watermark
   end
   
app/uploaders/photo_uploader.rb
@@ -1,8 +1,8 @@
 # encoding: utf-8
-#require File.join(Rails.root, "lib", "carrier_wave", "delayed_job")
+require File.join(Rails.root, "lib", "carrier_wave", "delayed_job")
 
 class PhotoUploader < CarrierWave::Uploader::Base
-  #include CarrierWave::Delayed::Job
+  include CarrierWave::Delayed::Job
   include CarrierWave::RMagick
   include CarrierWave::MimeTypes
 
@@ -35,7 +35,7 @@ class PhotoUploader < CarrierWave::Uploader::Base
 
   def watermark
     return if model.watermark.blank?
-    puts "processing watermark"
+    puts "processing watermark #{model.watermark}"
     manipulate! do |image|
       gc = Magick::Draw.new
       gc.gravity = Magick::SouthEastGravity