app/uploaders/spina/logo_uploader.rb in spina-0.6.28 vs app/uploaders/spina/logo_uploader.rb in spina-0.6.29

@@ -1,52 +1,23 @@
 # encoding: utf-8
 
 module Spina
   class LogoUploader < CarrierWave::Uploader::Base
 
-    # Include RMagick or MiniMagick support:
-    # include CarrierWave::RMagick
     include CarrierWave::MiniMagick
 
-    # Choose what kind of storage to use for this uploader:
-    storage :file
-    # storage :fog
-
-    # 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}"
+      if Engine.config.storage == :s3
+        "#{mounted_as}/#{model.id}"
+      else
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
     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]
-    #
-    # def scale(width, height)
-    #   # do something
-    # end
-
-    # Create different versions of your uploaded files:
-    # version :thumb do
-    #   process :scale => [50, 50]
-    # end
-
     process resize_to_fit: [300, 300]
 
-    # Add a white list of extensions which are allowed to be uploaded.
-    # For images you might use something like this:
     def extension_white_list
       %w(jpg jpeg gif png)
     end
-
-    # Override the filename of the uploaded files:
-    # Avoid using model.id or version_name here, see uploader/store.rb for details.
-    # def filename
-    #   "something.jpg" if original_filename
-    # end
 
   end
 end
\ No newline at end of file