Commit 10cd0160

@@ -25,7 +25,7 @@ class CreationsController < ApplicationController
   def create
     @creation = current_user.creations.create(params[:creation])
     @creation.category_ids = params[:creation][:category_ids] ||= []
-    @creation.photos.build({:image => params[:photo], :is_primary => true})
+    @creation.photos.build({:creation => @creation, :image => params[:photo], :is_primary => true})
 
     if @creation.save
       redirect_to(creations_url, :notice => 'Thank you for sharing your creation.') 

@@ -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,7 @@ class Photo < ActiveRecord::Base
   #end
 
   def watermark
-    puts "#{creation.id} #{creation.watermark}"
+    puts "#{creation} #{creation.watermark}"
     creation.watermark
   end
   

@@ -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,6 +35,7 @@ class PhotoUploader < CarrierWave::Uploader::Base
 
   def watermark
     return if model.watermark.blank?
+    puts "processing watermark"
     manipulate! do |image|
       gc = Magick::Draw.new
       gc.gravity = Magick::SouthEastGravity

@@ -1,6 +1,7 @@
 class MigrateImagesToPhotos < ActiveRecord::Migration
   def up
     add_column :photos, :is_primary, :boolean
+    add_index  :photos, :is_primary
 
     Photo.all.each do |photo|
       photo.image.recreate_versions!
@@ -22,6 +23,7 @@ class MigrateImagesToPhotos < ActiveRecord::Migration
     Photo.where(:is_primary => true).each do |photo|
       photo.destroy
     end
+    remove_index  :photos, :is_primary
     remove_column :photos, :is_primary
   end
 end

@@ -130,6 +130,8 @@ ActiveRecord::Schema.define(:version => 20121007153155) do
     t.boolean  "is_primary"
   end
 
+  add_index "photos", ["is_primary"], :name => "index_photos_on_is_primary"
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"