Commit a9feb2c7

@@ -18,10 +18,6 @@ class ImageUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
   process :set_content_type
   process :convert => 'png'
 
@@ -37,7 +33,6 @@ class ImageUploader < CarrierWave::Uploader::Base
   end
 
   def manualcrop
-    #return unless model.cropping?
     manipulate! do |img|
       img = img.crop(model.crop_x.to_i, model.crop_y.to_i, model.crop_w.to_i, model.crop_h.to_i)
     end
@@ -49,21 +44,9 @@ class ImageUploader < CarrierWave::Uploader::Base
     %w(jpg jpeg gif png)
   end
 
-  # Override the filename of the uploaded files:
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
   def filename
-    # @name = Digest::MD5.hexdigest(super.chomp(File.extname(super)))
-    # "#{@name}.png"
     if original_filename 
       super.chomp(File.extname(super)) + '.png'
     end
   end
-  # def filename 
-  #   if original_filename 
-  #     @name ||= Digest::MD5.hexdigest(File.dirname(current_path))
-  #     "#{@name}.png"
-  #   end
-  # end
 end

@@ -1,15 +1,9 @@
 # encoding: utf-8
 
 class PhotoUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or MiniMagick support:
   include CarrierWave::RMagick
-  # include CarrierWave::MiniMagick
   include CarrierWave::MimeTypes
 
-  # Choose what kind of storage to use for this uploader:
-  # storage :file
-  # storage :fog
   if Rails.env.production?
     storage :fog
   elsif Rails.env.staging?
@@ -20,26 +14,13 @@ class PhotoUploader < CarrierWave::Uploader::Base
     storage :file
   end
 
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process :scale => [200, 300]
   process :set_content_type
   process :resize_to_fit => [1160, 870]
   process :convert => 'png'
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
 
   # Create different versions of your uploaded files:
   version :thumb do
@@ -57,5 +38,4 @@ class PhotoUploader < CarrierWave::Uploader::Base
   def filename
     super.chomp(File.extname(super)) + '.png'
   end
-
 end