carrierwave 0.5.1 → 0.5.4

data/lib/carrierwave/uploader/configuration.rb

@@ -15,10 +15,14 @@ module CarrierWave
         add_config :s3_cnamed
         add_config :s3_headers
         add_config :s3_region
+        add_config :s3_use_ssl
+        add_config :s3_authentication_timeout
         add_config :cloud_files_username
         add_config :cloud_files_api_key
         add_config :cloud_files_container
         add_config :cloud_files_cdn_host
+        add_config :cloud_files_auth_url
+        add_config :cloud_files_snet
         add_config :grid_fs_connection
         add_config :grid_fs_database
         add_config :grid_fs_host
@@ -32,6 +36,14 @@ module CarrierWave
         add_config :ensure_multipart_form
         add_config :delete_tmp_file_after_storage
 
+        # fog
+        add_config :fog_attributes
+        add_config :fog_credentials
+        add_config :fog_directory
+        add_config :fog_host
+        add_config :fog_public
+        add_config :fog_authenticated_url_expiration
+
         # Mounting
         add_config :ignore_integrity_errors
         add_config :ignore_processing_errors
@@ -39,33 +51,8 @@ module CarrierWave
         add_config :validate_processing
         add_config :mount_on
 
-        configure do |config|
-          config.permissions = 0644
-          config.storage_engines = {
-            :file => "CarrierWave::Storage::File",
-            :s3 => "CarrierWave::Storage::S3",
-            :grid_fs => "CarrierWave::Storage::GridFS",
-            :right_s3 => "CarrierWave::Storage::RightS3",
-            :cloud_files => "CarrierWave::Storage::CloudFiles"
-          }
-          config.storage = :file
-          config.s3_headers = {}
-          config.s3_access_policy = :public_read
-          config.s3_region = 'us-east-1'
-          config.grid_fs_database = 'carrierwave'
-          config.grid_fs_host = 'localhost'
-          config.grid_fs_port = 27017
-          config.store_dir = 'uploads'
-          config.cache_dir = 'uploads/tmp'
-          config.delete_tmp_file_after_storage = true
-          config.ignore_integrity_errors = true
-          config.ignore_processing_errors = true
-          config.validate_integrity = true
-          config.validate_processing = true
-          config.root = CarrierWave.root
-          config.enable_processing = true
-          config.ensure_multipart_form = true
-        end
+        # set default values
+        reset_config
       end
 
       module ClassMethods
@@ -130,6 +117,45 @@ module CarrierWave
         def configure
           yield self
         end
+
+        ##
+        # sets configuration back to default
+        #
+        def reset_config
+          configure do |config|
+            config.permissions = 0644
+            config.storage_engines = {
+              :file => "CarrierWave::Storage::File",
+              :fog => "CarrierWave::Storage::Fog",
+              :s3 => "CarrierWave::Storage::S3",
+              :grid_fs => "CarrierWave::Storage::GridFS",
+              :right_s3 => "CarrierWave::Storage::RightS3",
+              :cloud_files => "CarrierWave::Storage::CloudFiles"
+            }
+            config.storage = :file
+            config.s3_headers = {}
+            config.s3_access_policy = :public_read
+            config.s3_region = 'us-east-1'
+            config.s3_authentication_timeout = 600
+            config.grid_fs_database = 'carrierwave'
+            config.grid_fs_host = 'localhost'
+            config.grid_fs_port = 27017
+            config.fog_attributes = {}
+            config.fog_credentials = {}
+            config.fog_public = true
+            config.fog_authenticated_url_expiration = 600
+            config.store_dir = 'uploads'
+            config.cache_dir = 'uploads/tmp'
+            config.delete_tmp_file_after_storage = true
+            config.ignore_integrity_errors = true
+            config.ignore_processing_errors = true
+            config.validate_integrity = true
+            config.validate_processing = true
+            config.root = CarrierWave.root
+            config.enable_processing = true
+            config.ensure_multipart_form = true
+          end
+        end
       end
 
     end

data/lib/carrierwave/uploader/download.rb

@@ -13,11 +13,11 @@ module CarrierWave
 
       class RemoteFile
         def initialize(uri)
-          @uri = URI.parse(URI.escape(uri))
+          @uri = uri
         end
 
         def original_filename
-          File.basename(@uri.path)
+          File.basename(file.base_uri.path)
         end
 
         def respond_to?(*args)
@@ -52,13 +52,24 @@ module CarrierWave
       #
       def download!(uri)
         unless uri.blank?
-          file = RemoteFile.new(uri)
+          processed_uri = process_uri(uri)
+          file = RemoteFile.new(processed_uri)
           raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
-          cache!(file) 
+          cache!(file)
         end
       end
 
+      ##
+      # Processes the given URL by parsing and escaping it. Public to allow overriding.
+      #
+      # === Parameters
+      #
+      # [url (String)] The URL where the remote file is stored
+      #
+      def process_uri(uri)
+        URI.parse(URI.escape(uri))
+      end
+
     end # Download
   end # Uploader
 end # CarrierWave
-

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -11,11 +11,15 @@ module CarrierWave
 
       ##
       # Override this method in your uploader to provide a white list of extensions which
-      # are allowed to be uploaded.
+      # are allowed to be uploaded. Compares the file's extension case insensitive.
+      # Furthermore, not only strings but Regexp are allowed as well.
+      #
+      # When using a Regexp in the white list, `\A` and `\z` are automatically added to
+      # the Regexp expression, also case insensitive.
       #
       # === Returns
       #
-      # [NilClass, Array[String]] a white list of extensions which are allowed to be uploaded
+      # [NilClass, Array[String,Regexp]] a white list of extensions which are allowed to be uploaded
       #
       # === Examples
       #
@@ -23,12 +27,19 @@ module CarrierWave
       #       %w(jpg jpeg gif png)
       #     end
       #
+      # Basically the same, but using a Regexp:
+      #
+      #     def extension_white_list
+      #       [/jpe?g/, 'gif', 'png']
+      #     end
+      #
       def extension_white_list; end
 
     private
 
       def check_whitelist!(new_file)
-        if extension_white_list and not extension_white_list.include?(new_file.extension.to_s)
+        extension = new_file.extension.to_s
+        if extension_white_list and not extension_white_list.detect { |item| extension =~ /\A#{item}\z/i }
           raise CarrierWave::IntegrityError, "You are not allowed to upload #{new_file.extension.inspect} files, allowed types: #{extension_white_list.inspect}"
         end
       end

data/lib/carrierwave/uploader/processing.rb

@@ -9,7 +9,6 @@ module CarrierWave
 
       included do
         after :cache, :process!
-        after :recreate_versions, :process!
       end
 
       module ClassMethods

data/lib/carrierwave/uploader/url.rb

@@ -22,10 +22,11 @@ module CarrierWave
       ##
       # === Returns
       #
-      # [String] A JSON serializtion containing this uploader's URL
+      # [String] A JSON serialization containing this uploader's URL(s)
       #
       def as_json(options = nil)
-        { :url => url }
+        h = { :url => url }
+        h.merge Hash[versions.map { |name, version| [name, { :url => version.url }] }]
       end
 
     end # Url

data/lib/carrierwave/uploader/versions.rb

@@ -114,9 +114,15 @@ module CarrierWave
       # versions if their parameters somehow have changed.
       #
       def recreate_versions!
-        with_callbacks(:recreate_versions, file) do
-          versions.each { |name, v| v.store!(file) }
-        end
+        # Some files could possibly not be stored on the local disk. This
+        # doesn't play nicely with processing. Make sure that we're only
+        # processing a cached file
+        #
+        # The call to store! will trigger the necessary callbacks to both
+        # process this version and all sub-versions
+        cache_stored_file! if !cached?
+
+        store!
       end
 
     private
@@ -130,9 +136,15 @@ module CarrierWave
       end
 
       def cache_versions!(new_file)
+        # We might have processed the new_file argument after the callbacks were
+        # initialized, so get the actual file based off of the current state of
+        # our file
+        processed_parent = SanitizedFile.new :tempfile => self.file,
+          :filename => new_file.original_filename
+
         versions.each do |name, v|
           v.send(:cache_id=, cache_id)
-          v.cache!(new_file)
+          v.cache!(processed_parent)
         end
       end
 

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
 end

data/lib/carrierwave.rb

@@ -2,8 +2,9 @@
 
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
+require 'active_support/memoizable'
 
 module CarrierWave
 
@@ -35,6 +36,7 @@ module CarrierWave
   module Storage
     autoload :Abstract, 'carrierwave/storage/abstract'
     autoload :File, 'carrierwave/storage/file'
+    autoload :Fog, 'carrierwave/storage/fog'
     autoload :S3, 'carrierwave/storage/s3'
     autoload :GridFS, 'carrierwave/storage/grid_fs'
     autoload :RightS3, 'carrierwave/storage/right_s3'
@@ -84,6 +86,12 @@ elsif defined?(Rails)
       initializer "carrierwave.setup_paths" do
         CarrierWave.root = Rails.root.join(Rails.public_path).to_s
       end
+
+      initializer "carrierwave.active_record" do
+        ActiveSupport.on_load :active_record do
+          require 'carrierwave/orm/activerecord'
+        end
+      end
     end
   end
 
@@ -93,8 +101,6 @@ elsif defined?(Sinatra)
 
 end
 
-
-require 'carrierwave/orm/activerecord' if defined?(ActiveRecord)
 require 'carrierwave/orm/datamapper' if defined?(DataMapper)
 require 'carrierwave/orm/sequel' if defined?(Sequel)
 require 'carrierwave/orm/mongoid' if defined?(Mongoid)

data/lib/generators/templates/uploader.rb

@@ -8,7 +8,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Choose what kind of storage to use for this uploader:
   storage :file
-  # storage :s3
+  # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
@@ -40,6 +40,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # 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