carrierwave 0.6.2 → 0.7.0

data/README.md

@@ -4,6 +4,7 @@ This gem provides a simple and extremely flexible way to upload files from Ruby
 It works well with Rack based web applications, such as Ruby on Rails.
 
 [![Build Status](https://secure.travis-ci.org/jnicklas/carrierwave.png)](http://travis-ci.org/jnicklas/carrierwave)
+[![Code Quality](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jnicklas/carrierwave)
 
 ## Information
 
@@ -28,6 +29,8 @@ In Rails, add it to your Gemfile:
 gem 'carrierwave'
 ```
 
+Finally, restart the server to apply the changes.
+
 Note that CarrierWave is not compatible with Rails 2 as of version 0.5. If you want to use
 Rails 2, please use the 0.4-stable branch on GitHub.
 
@@ -216,7 +219,7 @@ and cropped to exactly 200 by 200 pixels. The uploader could be used like this:
 uploader = AvatarUploader.new
 uploader.store!(my_file)                              # size: 1024x768
 
-uploader.url # => '/url/to/my_file.png'               # size: 800x600
+uploader.url # => '/url/to/my_file.png'               # size: 800x800
 uploader.thumb.url # => '/url/to/thumb_my_file.png'   # size: 200x200
 ```
 
@@ -297,8 +300,8 @@ of the original version, potentially resulting in faster processing.
 Often you'll notice that uploaded files disappear when a validation fails.
 CarrierWave has a feature that makes it easy to remember the uploaded file even
 in that case. Suppose your `user` model has an uploader mounted on `avatar`
-file, just add a hidden field called `avatar_cache`. In Rails, this would look
-like this:
+file, just add a hidden field called `avatar_cache` (don't forget to add it to
+the attr_accessible list as necessary). In Rails, this would look like this:
 
 ```erb
 <%= form_for @user, :html => {:multipart => true} do |f| %>
@@ -406,6 +409,7 @@ both globally and on a per-uploader basis:
 ```ruby
 CarrierWave.configure do |config|
   config.permissions = 0666
+  config.directory_permissions = 0777
   config.storage = :file
 end
 ```
@@ -507,9 +511,9 @@ CarrierWave.configure do |config|
     :region                 => 'eu-west-1'  # optional, defaults to 'us-east-1'
   }
   config.fog_directory  = 'name_of_directory'                     # required
-  config.fog_host       = 'https://assets.example.com'            # optional, defaults to nil
   config.fog_public     = false                                   # optional, defaults to true
   config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
+  config.asset_host     = 'https://assets.example.com'            # optional, defaults to nil
 end
 ```
 
@@ -550,7 +554,7 @@ This is *highly* recommended, as without it every request requires a lookup
 of this information.
 
 ```ruby
-config.fog_host = "http://c000000.cdn.rackspacecloud.com"
+config.asset_host = "http://c000000.cdn.rackspacecloud.com"
 ```
 
 In your uploader, set the storage to :fog
@@ -597,13 +601,13 @@ end
 That's it! You can still use the `CarrierWave::Uploader#url` method to return
 the url to the file on Google.
 
-## Dynamic Fog Host
+## Dynamic Asset Host
 
-The `fog_host` config property can be assigned a proc (or anything that responds to `call`) for generating the host dynamically. The proc-compliant object gets an instance of the current `CarrierWave::Storage::Fog::File` as its only argument.
+The `asset_host` config property can be assigned a proc (or anything that responds to `call`) for generating the host dynamically. The proc-compliant object gets an instance of the current `CarrierWave::Storage::Fog::File` or `CarrierWave::SanitizedFile` as its only argument.
 
 ```ruby
 CarrierWave.configure do |config|
-  config.fog_host = proc do |file|
+  config.asset_host = proc do |file|
     identifier = # some logic
     "http://#{identifier}.cdn.rackspacecloud.com"
   end
@@ -704,6 +708,7 @@ errors:
   messages:
     carrierwave_processing_error: 'Cannot resize image.'
     carrierwave_integrity_error: 'Not an image.'
+    carrierwave_download_error: 'Couldn't download image.'
 ```
 
 ## Large files
@@ -734,7 +739,9 @@ This has only been tested with the local filesystem store.
 CarrierWave thrives on a large number of [contributors](https://github.com/jnicklas/carrierwave/contributors),
 and pull requests are very welcome. Before submitting a pull request, please make sure that your changes are well tested.
 
-You'll need to install bundler and the gem dependencies:
+First, make sure you have `imagemagick` and `ghostscript` installed.
+
+Then, you'll need to install bundler and the gem dependencies:
 
 	gem install bundler
 	bundle install
@@ -761,6 +768,11 @@ You should now be able to run the remote tests:
 
 Please test with the latest Ruby 1.8.x and 1.9.x versions using RVM if possible.
 
+### Running active record tests
+
+Make sure you have a local MySQL database named `carrierwave_test` with the username
+`root` and empty password. 
+
 ## License
 
 Copyright (c) 2008-2012 Jonas Nicklas

data/lib/carrierwave.rb

@@ -15,8 +15,8 @@ module CarrierWave
       CarrierWave::Uploader::Base.configure(&block)
     end
 
-    def clean_cached_files!
-      CarrierWave::Uploader::Base.clean_cached_files!
+    def clean_cached_files!(seconds=60*60*24)
+      CarrierWave::Uploader::Base.clean_cached_files!(seconds)
     end
   end
 
@@ -50,6 +50,7 @@ module CarrierWave
     autoload :Versions, 'carrierwave/uploader/versions'
     autoload :Remove, 'carrierwave/uploader/remove'
     autoload :ExtensionWhitelist, 'carrierwave/uploader/extension_whitelist'
+    autoload :ExtensionBlacklist, 'carrierwave/uploader/extension_blacklist'
     autoload :DefaultUrl, 'carrierwave/uploader/default_url'
     autoload :Proxy, 'carrierwave/uploader/proxy'
     autoload :Url, 'carrierwave/uploader/url'
@@ -95,7 +96,7 @@ elsif defined?(Rails)
   end
 
 elsif defined?(Sinatra)
-  if defined?(Padrino)
+  if defined?(Padrino) && defined?(PADRINO_ROOT)
     CarrierWave.root = File.join(PADRINO_ROOT, "public")
   else
 

data/lib/carrierwave/locale/en.yml

@@ -3,7 +3,9 @@ en:
     messages:
       carrierwave_processing_error: failed to be processed
       carrierwave_integrity_error: is not of an allowed file type
+      carrierwave_download_error: could not be downloaded
       extension_white_list_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}"
+      extension_black_list_error: "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
       rmagick_processing_error: "Failed to manipulate with rmagick, maybe it is not an image? Original Error: %{e}"
       mime_types_processing_error: "Failed to process file with MIME::Types, maybe not valid content-type? Original Error: %{e}"
-      mini_magick_processing_error: "Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: %{e}"
+      mini_magick_processing_error: "Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: %{e}"

data/lib/carrierwave/mount.rb

@@ -94,6 +94,7 @@ module CarrierWave
     #
     # [image_integrity_error]   Returns an error object if the last file to be assigned caused an integrity error
     # [image_processing_error]  Returns an error object if the last file to be assigned caused a processing error
+    # [image_download_error]    Returns an error object if the last file to be remotely assigned caused a download error
     #
     # [write_image_identifier]  Uses the write_uploader method to set the identifier.
     # [image_identifier]        Reads out the identifier of the file
@@ -225,6 +226,10 @@ module CarrierWave
           _mounter(:#{column}).processing_error
         end
 
+        def #{column}_download_error
+          _mounter(:#{column}).download_error
+        end
+
         def write_#{column}_identifier
           _mounter(:#{column}).write_identifier
         end
@@ -281,7 +286,7 @@ module CarrierWave
     # this is an internal class, used by CarrierWave::Mount so that
     # we don't pollute the model with a lot of methods.
     class Mounter #:nodoc:
-      attr_reader :column, :record, :remote_url, :integrity_error, :processing_error
+      attr_reader :column, :record, :remote_url, :integrity_error, :processing_error, :download_error
       attr_accessor :remove
 
       def initialize(record, column, options={})
@@ -291,11 +296,11 @@ module CarrierWave
       end
 
       def write_identifier
-        if remove?
-          record.write_uploader(serialization_column, '')
-        elsif not uploader.identifier.blank?
-          record.write_uploader(serialization_column, uploader.identifier)
-        end
+        return if record.frozen? || uploader.identifier.blank?
+
+        value = remove? ? '' : uploader.identifier
+
+        record.write_uploader(serialization_column, value)
       end
 
       def identifier
@@ -333,8 +338,22 @@ module CarrierWave
       end
 
       def remote_url=(url)
+        @download_error = nil
+        @integrity_error = nil
+
         @remote_url = url
+        
         uploader.download!(url)
+
+      rescue CarrierWave::DownloadError => e
+        @download_error = e
+        raise e unless option(:ignore_download_errors)
+      rescue CarrierWave::ProcessingError => e
+        @processing_error = e
+        raise e unless option(:ignore_processing_errors)
+      rescue CarrierWave::IntegrityError => e
+        @integrity_error = e
+        raise e unless option(:ignore_integrity_errors)
       end
 
       def store!

data/lib/carrierwave/orm/activerecord.rb

@@ -23,10 +23,11 @@ module CarrierWave
 
       validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+      validates_download_of column if uploader_option(column.to_sym, :validate_download)
 
       after_save :"store_#{column}!"
       before_save :"write_#{column}_identifier"
-      after_destroy :"remove_#{column}!"
+      after_commit :"remove_#{column}!", :on => :destroy
       before_update :"store_previous_model_for_#{column}"
       after_save :"remove_previously_stored_#{column}"
 
@@ -43,6 +44,12 @@ module CarrierWave
           super
         end
 
+        def remove_#{column}!
+          super
+          _mounter(:#{column}).remove = true
+          _mounter(:#{column}).write_identifier
+        end
+
         def serializable_hash(options=nil)
           hash = {}
 
@@ -51,7 +58,7 @@ module CarrierWave
 
           self.class.uploaders.each do |column, uploader|
             if (!only && !except) || (only && only.include?(column.to_s)) || (except && !except.include?(column.to_s))
-              hash[column.to_s] = _mounter(:#{column}).uploader.serializable_hash
+              hash[column.to_s] = _mounter(column).uploader.serializable_hash
             end
           end
           super(options).merge(hash)

data/lib/carrierwave/processing/mime_types.rb

@@ -32,6 +32,12 @@ module CarrierWave
       end
     end
 
+    GENERIC_CONTENT_TYPES = %w[application/octet-stream binary/octet-stream]
+
+    def generic_content_type?
+      GENERIC_CONTENT_TYPES.include? file.content_type
+    end
+
     ##
     # Changes the file content_type using the mime-types gem
     #
@@ -42,7 +48,7 @@ module CarrierWave
     #                      false by default
     #
     def set_content_type(override=false)
-      if override || file.content_type.blank? || file.content_type == 'application/octet-stream'
+      if override || file.content_type.blank? || generic_content_type?
         new_content_type = ::MIME::Types.type_for(file.original_filename).first.to_s
         if file.respond_to?(:content_type=)
           file.content_type = new_content_type

data/lib/carrierwave/processing/mini_magick.rb

@@ -169,10 +169,17 @@ module CarrierWave
         cols, rows = img[:dimensions]
         img.combine_options do |cmd|
           if width != cols || height != rows
-            scale = [width/cols.to_f, height/rows.to_f].max
-            cols = (scale * (cols + 0.5)).round
-            rows = (scale * (rows + 0.5)).round
-            cmd.resize "#{cols}x#{rows}"
+            scale_x = width/cols.to_f
+            scale_y = height/rows.to_f
+            if scale_x >= scale_y
+              cols = (scale_x * (cols + 0.5)).round
+              rows = (scale_x * (rows + 0.5)).round
+              cmd.resize "#{cols}"
+            else
+              cols = (scale_y * (cols + 0.5)).round
+              rows = (scale_y * (rows + 0.5)).round
+              cmd.resize "x#{rows}"
+            end
           end
           cmd.gravity gravity
           cmd.background "rgba(255,255,255,0.0)"

data/lib/carrierwave/processing/rmagick.rb

@@ -90,6 +90,10 @@ module CarrierWave
       def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
         process :resize_and_pad => [width, height, background, gravity]
       end
+
+      def resize_to_geometry_string(geometry_string)
+        process :resize_to_geometry_string => [geometry_string]
+      end
     end
 
     ##
@@ -223,6 +227,28 @@ module CarrierWave
       end
     end
 
+    ##
+    # Resize the image per the provided geometry string.
+    #
+    # === Parameters
+    #
+    # [geometry_string (String)] the proportions in which to scale image
+    #
+    # === Yields
+    #
+    # [Magick::Image] additional manipulations to perform
+    #
+    def resize_to_geometry_string(geometry_string)
+      manipulate! do |img|
+        new_img = img.change_geometry(geometry_string) do |new_width, new_height|
+          img.resize(new_width, new_height)
+        end
+        destroy_image(img)
+        new_img = yield(new_img) if block_given?
+        new_img
+      end
+    end
+
     ##
     # Manipulate the image with RMagick. This method will load up an image
     # and then pass each of its frames to the supplied block. It will then
@@ -238,6 +264,45 @@ module CarrierWave
     # === Yields
     #
     # [Magick::Image] manipulations to perform
+    # [Integer] Frame index if the image contains multiple frames
+    # [Hash] options, see below
+    #
+    # === Options
+    #
+    # The options argument to this method is also yielded as the third
+    # block argument.
+    #
+    # Currently, the following options are defined:
+    #
+    # ==== :write
+    # A hash of assignments to be evaluated in the block given to the RMagick write call.
+    #
+    # An example:
+    #
+    #      manipulate! do |img, index, options|
+    #        options[:write] = {
+    #          :quality => 50,
+    #          :depth => 8
+    #        }
+    #        img
+    #      end
+    #
+    # This will translate to the following RMagick::Image#write call:
+    #
+    #     image.write do |img|
+    #       self.quality = 50
+    #       self.depth = 8
+    #     end
+    #
+    # ==== :read
+    # A hash of assignments to be given to the RMagick read call.
+    #
+    # The options available are identical to those for write, but are passed in directly, like this:
+    #
+    #     manipulate! :read => { :density => 300 }
+    #
+    # ==== :format
+    # Specify the output format. If unset, the filename extension is used to determine the format.
     #
     # === Raises
     #
@@ -245,13 +310,15 @@ module CarrierWave
     #
     def manipulate!(options={}, &block)
       cache_stored_file! if !cached?
-      image = ::Magick::Image.read(current_path)
+
+      read_block = create_info_block(options[:read])
+      image = ::Magick::Image.read(current_path, &read_block)
 
       frames = if image.size > 1
         list = ::Magick::ImageList.new
         image.each_with_index do |frame, index|
           processed_frame = if block_given?
-            yield *[frame, index].take(block.arity)
+            yield *[frame, index, options].take(block.arity)
           else
             frame
           end
@@ -260,14 +327,15 @@ module CarrierWave
         block_given? ? list : list.append(true)
       else
         frame = image.first
-        frame = yield( *[frame, 0].take(block.arity) ) if block_given?
+        frame = yield( *[frame, 0, options].take(block.arity) ) if block_given?
         frame
       end
 
+      write_block = create_info_block(options[:write])
       if options[:format]
-        frames.write("#{options[:format]}:#{current_path}")
+        frames.write("#{options[:format]}:#{current_path}", &write_block)
       else
-        frames.write(current_path)
+        frames.write(current_path, &write_block)
       end
       destroy_image(frames)
     rescue ::Magick::ImageMagickError => e
@@ -276,6 +344,13 @@ module CarrierWave
 
   private
 
+    def create_info_block(options)
+      return nil unless options
+      assignments = options.map { |k, v| "self.#{k} = #{v}" }
+      code = "lambda { |img| " + assignments.join(";") + "}"
+      eval code
+    end
+
     def destroy_image(image)
       image.destroy! if image.respond_to?(:destroy!)
     end

data/lib/carrierwave/sanitized_file.rb

@@ -168,12 +168,13 @@ module CarrierWave
     #
     # [new_path (String)] The path where the file should be moved.
     # [permissions (Integer)] permissions to set on the file in its new location.
+    # [directory_permissions (Integer)] permissions to set on created directories.
     #
-    def move_to(new_path, permissions=nil)
+    def move_to(new_path, permissions=nil, directory_permissions=nil)
       return if self.empty?
       new_path = File.expand_path(new_path)
 
-      mkdir!(new_path)
+      mkdir!(new_path, directory_permissions)
       if exists?
         FileUtils.mv(path, new_path) unless new_path == path
       else
@@ -191,16 +192,17 @@ module CarrierWave
     #
     # [new_path (String)] The path where the file should be copied to.
     # [permissions (Integer)] permissions to set on the copy
+    # [directory_permissions (Integer)] permissions to set on created directories.
     #
     # === Returns
     #
     # @return [CarrierWave::SanitizedFile] the location where the file will be stored.
     #
-    def copy_to(new_path, permissions=nil)
+    def copy_to(new_path, permissions=nil, directory_permissions=nil)
       return if self.empty?
       new_path = File.expand_path(new_path)
 
-      mkdir!(new_path)
+      mkdir!(new_path, directory_permissions)
       if exists?
         FileUtils.cp(path, new_path) unless new_path == path
       else
@@ -226,7 +228,7 @@ module CarrierWave
     #
     def to_file
       return @file if @file.is_a?(File)
-      File.open(path) if exists?
+      File.open(path, "rb") if exists?
     end
 
     ##
@@ -278,8 +280,10 @@ module CarrierWave
     end
 
     # create the directory if it doesn't exist
-    def mkdir!(path)
-      FileUtils.mkdir_p(File.dirname(path)) unless File.exists?(File.dirname(path))
+    def mkdir!(path, directory_permissions)
+      options = {}
+      options[:mode] = directory_permissions if directory_permissions
+      FileUtils.mkdir_p(File.dirname(path), options) unless File.exists?(File.dirname(path))
     end
 
     def chmod!(path, permissions)
@@ -299,7 +303,7 @@ module CarrierWave
     def split_extension(filename)
       # regular expressions to try for identifying extensions
       extension_matchers = [
-        /\A(.+)\.(tar\.gz)\z/, # matches "something.tar.gz"
+        /\A(.+)\.(tar\.([glx]?z|bz2))\z/, # matches "something.tar.gz"
         /\A(.+)\.([^\.]+)\z/ # matches "something.jpg"
       ]
 

data/lib/carrierwave/storage/file.rb

@@ -29,9 +29,9 @@ module CarrierWave
       def store!(file)
         path = ::File.expand_path(uploader.store_path, uploader.root)
         if uploader.move_to_store
-          file.move_to(path, uploader.permissions)
+          file.move_to(path, uploader.permissions, uploader.directory_permissions)
         else
-          file.copy_to(path, uploader.permissions)
+          file.copy_to(path, uploader.permissions, uploader.directory_permissions)
         end
       end
 

data/lib/carrierwave/storage/fog.rb

@@ -20,7 +20,7 @@ module CarrierWave
     # [:fog_directory]    specifies name of directory to store data in, assumed to already exist
     #
     # [:fog_attributes]                   (optional) additional attributes to set on files
-    # [:fog_host]                         (optional) non-default host to serve files from
+    # [:fog_endpoint]                     (optional) non-default host to connect with
     # [:fog_public]                       (optional) public readability, defaults to true
     # [:fog_authenticated_url_expiration] (optional) time (in seconds) that authenticated urls
     #   will be valid, when fog_public is false and provider is AWS or Google, defaults to 600
@@ -102,8 +102,16 @@ module CarrierWave
 
       def connection
         @connection ||= begin
-          credentials = uploader.fog_credentials
-          self.class.connection_cache[credentials] ||= ::Fog::Storage.new(credentials)
+          options = credentials = uploader.fog_credentials
+          endpoint_url = if uploader.fog_endpoint.respond_to? :call
+            URI.parse( uploader.fog_endpoint.call(self) )
+          elsif uploader.fog_endpoint
+            URI.parse( uploader.fog_endpoint )
+          end
+          if host_string = endpoint_url && (endpoint_url.host || endpoint_url.to_s)
+            options.merge!( { :host => host_string } )
+          end
+          self.class.connection_cache[credentials] ||= ::Fog::Storage.new(options)
         end
       end
 
@@ -267,7 +275,7 @@ module CarrierWave
         # [NilClass] no public url available
         #
         def public_url
-          if host = @uploader.fog_host
+          if host = @uploader.asset_host
             if host.respond_to? :call
               "#{host.call(self)}/#{path}"
             else
@@ -278,7 +286,7 @@ module CarrierWave
             case @uploader.fog_credentials[:provider]
             when 'AWS'
               # if directory is a valid subdomain, use that style for access
-              if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\d{1,3}){3}$))(?:[a-z0-9]|(?![\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\d{1,3}){3}$))(?:[a-z0-9\.]|(?![\-])|\-(?![\.])){1,61}[a-z0-9]$/
                 "https://#{@uploader.fog_directory}.s3.amazonaws.com/#{path}"
               else
                 # directory is not a valid subdomain, so use path style for access
@@ -310,6 +318,21 @@ module CarrierWave
           end
         end
 
+        ##
+        # Return file name, if available
+        #
+        # === Returns
+        #
+        # [String] file name
+        #   or
+        # [NilClass] no file name available
+        #
+        def filename(options = {})
+          if file_url = url(options)
+            file_url.gsub(/.*\/(.*?$)/, '\1')
+          end
+        end
+
       private
 
         ##

data/lib/carrierwave/test/matchers.rb

@@ -64,6 +64,34 @@ module CarrierWave
         HavePermissions.new(expected)
       end
 
+      class HaveDirectoryPermissions # :nodoc:
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(actual)
+          @actual = actual
+          # Satisfy expectation here. Return false or raise an error if it's not met.
+          (File.stat(File.dirname @actual.path).mode & 0777) == @expected
+        end
+
+        def failure_message
+          "expected #{File.dirname @actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0777).to_s(8)}"
+        end
+
+        def negative_failure_message
+          "expected #{File.dirname @actual.current_path.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
+        end
+
+        def description
+          "have permissions #{@expected.to_s(8)}"
+        end
+      end
+
+      def have_directory_permissions(expected)
+        HaveDirectoryPermissions.new(expected)
+      end
+
       class BeNoLargerThan # :nodoc:
         def initialize(width, height)
           @width, @height = width, height
@@ -126,6 +154,66 @@ module CarrierWave
         HaveDimensions.new(width, height)
       end
 
+      class HaveHeight # :nodoc:
+        def initialize(height)
+          @height = height
+        end
+
+        def matches?(actual)
+          @actual = actual
+          # Satisfy expectation here. Return false or raise an error if it's not met.
+          image = ImageLoader.load_image(@actual.current_path)
+          @actual_height = image.height
+          @actual_height == @height
+        end
+
+        def failure_message
+          "expected #{@actual.current_path.inspect} to have an exact size of #{@height}, but it was #{@actual_height}."
+        end
+
+        def negative_failure_message
+          "expected #{@actual.current_path.inspect} not to have an exact size of #{@height}, but it did."
+        end
+
+        def description
+          "have an exact height of #{@height}"
+        end
+      end
+
+      def have_height(height)
+        HaveHeight.new(height)
+      end
+
+      class HaveWidth # :nodoc:
+        def initialize(width)
+          @width = width
+        end
+
+        def matches?(actual)
+          @actual = actual
+          # Satisfy expectation here. Return false or raise an error if it's not met.
+          image = ImageLoader.load_image(@actual.current_path)
+          @actual_width = image.width
+          @actual_width == @width
+        end
+
+        def failure_message
+          "expected #{@actual.current_path.inspect} to have an exact size of #{@width}, but it was #{@actual_width}."
+        end
+
+        def negative_failure_message
+          "expected #{@actual.current_path.inspect} not to have an exact size of #{@width}, but it did."
+        end
+
+        def description
+          "have an exact width of #{@width}"
+        end
+      end
+
+      def have_width(width)
+        HaveWidth.new(width)
+      end
+
       class BeNoWiderThan # :nodoc:
         def initialize(width)
           @width = width

data/lib/carrierwave/uploader.rb

@@ -34,6 +34,7 @@ module CarrierWave
       include CarrierWave::Uploader::Download
       include CarrierWave::Uploader::Remove
       include CarrierWave::Uploader::ExtensionWhitelist
+      include CarrierWave::Uploader::ExtensionBlacklist
       include CarrierWave::Uploader::Processing
       include CarrierWave::Uploader::Versions
       include CarrierWave::Uploader::DefaultUrl

data/lib/carrierwave/uploader/cache.rb

@@ -70,8 +70,15 @@ module CarrierWave
       # require the file to be stored on the local filesystem.
       #
       def cache_stored_file!
-        sanitized = SanitizedFile.new :tempfile => StringIO.new(file.read),
-          :filename => File.basename(path), :content_type => file.content_type
+        _content = file.read
+        if _content.is_a?(File) # could be if storage is Fog
+          sanitized = CarrierWave::Storage::Fog.new(self).retrieve!(File.basename(_content.path))
+          sanitized.read if sanitized.exists?
+
+        else
+          sanitized = SanitizedFile.new :tempfile => StringIO.new(file.read),
+            :filename => File.basename(path), :content_type => file.content_type
+        end
 
         cache! sanitized
       end
@@ -116,9 +123,9 @@ module CarrierWave
             self.original_filename = new_file.filename
 
             if move_to_cache
-              @file = new_file.move_to(cache_path, permissions)
+              @file = new_file.move_to(cache_path, permissions, directory_permissions)
             else
-              @file = new_file.copy_to(cache_path, permissions)
+              @file = new_file.copy_to(cache_path, permissions, directory_permissions)
             end
           end
         end

data/lib/carrierwave/uploader/configuration.rb

@@ -9,7 +9,9 @@ module CarrierWave
 
         add_config :root
         add_config :base_path
+        add_config :asset_host
         add_config :permissions
+        add_config :directory_permissions
         add_config :storage_engines
         add_config :store_dir
         add_config :cache_dir
@@ -24,15 +26,17 @@ module CarrierWave
         add_config :fog_attributes
         add_config :fog_credentials
         add_config :fog_directory
-        add_config :fog_host
+        add_config :fog_endpoint
         add_config :fog_public
         add_config :fog_authenticated_url_expiration
 
         # Mounting
         add_config :ignore_integrity_errors
         add_config :ignore_processing_errors
+        add_config :ignore_download_errors
         add_config :validate_integrity
         add_config :validate_processing
+        add_config :validate_download
         add_config :mount_on
 
         # set default values
@@ -103,6 +107,7 @@ module CarrierWave
         def reset_config
           configure do |config|
             config.permissions = 0644
+            config.directory_permissions = 0755
             config.storage_engines = {
               :file => "CarrierWave::Storage::File",
               :fog  => "CarrierWave::Storage::Fog"
@@ -120,8 +125,10 @@ module CarrierWave
             config.remove_previously_stored_files_after_update = true
             config.ignore_integrity_errors = true
             config.ignore_processing_errors = true
+            config.ignore_download_errors = true
             config.validate_integrity = true
             config.validate_processing = true
+            config.validate_download = true
             config.root = lambda { CarrierWave.root }
             config.base_path = CarrierWave.base_path
             config.enable_processing = true

data/lib/carrierwave/uploader/download.rb

@@ -36,6 +36,9 @@ module CarrierWave
             @file = @file.is_a?(String) ? StringIO.new(@file) : @file
           end
           @file
+
+        rescue
+          raise CarrierWave::DownloadError, "could not download file"
         end
 
         def method_missing(*args, &block)
@@ -67,7 +70,7 @@ module CarrierWave
       # [url (String)] The URL where the remote file is stored
       #
       def process_uri(uri)
-        URI.parse(URI.escape(URI.unescape(uri)).gsub("[", "%5B").gsub("]", "%5D").gsub("+", "%2B"))
+        URI.parse(URI.escape(URI.unescape(uri)))
       end
 
     end # Download

data/lib/carrierwave/uploader/extension_blacklist.rb

@@ -0,0 +1,47 @@
+module CarrierWave
+  module Uploader
+    module ExtensionBlacklist
+      extend ActiveSupport::Concern
+
+      included do
+        before :cache, :check_blacklist!
+      end
+
+      ##
+      # Override this method in your uploader to provide a black list of extensions which
+      # are prohibited 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 black list, `\A` and `\z` are automatically added to
+      # the Regexp expression, also case insensitive.
+      #
+      # === Returns
+      
+      # [NilClass, Array[String,Regexp]] a black list of extensions which are prohibited to be uploaded
+      #
+      # === Examples
+      #
+      #     def extension_black_list
+      #       %w(swf tiff)
+      #     end
+      #
+      # Basically the same, but using a Regexp:
+      #
+      #     def extension_black_list
+      #       [/swf/, 'tiff']
+      #     end
+      #
+ 
+      def extension_black_list; end
+
+    private
+
+      def check_blacklist!(new_file)
+        extension = new_file.extension.to_s
+        if extension_black_list and extension_black_list.detect { |item| extension =~ /\A#{item}\z/i }
+          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.extension_black_list_error", :extension => new_file.extension.inspect, :prohibited_types => extension_black_list.join(", "))
+        end
+      end
+    end
+  end
+end

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -40,7 +40,7 @@ module CarrierWave
       def check_whitelist!(new_file)
         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, I18n.translate(:"errors.messages.extension_white_list_error", :extension => new_file.extension.inspect, :allowed_types => extension_white_list.inspect)
+          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.extension_white_list_error", :extension => new_file.extension.inspect, :allowed_types => extension_white_list.join(", "))
         end
       end
 

data/lib/carrierwave/uploader/url.rb

@@ -18,8 +18,18 @@ module CarrierWave
       def url(options = {})
         if file.respond_to?(:url) and not file.url.blank?
           file.method(:url).arity == 0 ? file.url : file.url(options)
-        elsif current_path
-          (base_path || "") + File.expand_path(current_path).gsub(File.expand_path(root), '')
+        elsif file.respond_to?(:path)
+          path = file.path.gsub(File.expand_path(root), '')
+
+          if host = asset_host
+            if host.respond_to? :call
+              "#{host.call(file)}#{path}"
+            else
+              "#{host}#{path}"
+            end
+          else
+            (base_path || "") + path
+          end
         end
       end
 

data/lib/carrierwave/validations/active_model.rb

@@ -30,6 +30,16 @@ module CarrierWave
         end
       end
 
+      class DownloadValidator < ::ActiveModel::EachValidator
+
+        def validate_each(record, attribute, value)
+          if e = record.send("#{attribute}_download_error")
+            message = (e.message == e.class.to_s) ? :carrierwave_download_error : e.message
+            record.errors.add(attribute, message)
+          end
+        end
+      end
+
       module HelperMethods
 
         ##
@@ -50,6 +60,15 @@ module CarrierWave
         def validates_processing_of(*attr_names)
           validates_with ProcessingValidator, _merge_attributes(attr_names)
         end
+        #
+        ##
+        # Makes the record invalid if the remote file couldn't be downloaded
+        #
+        # Accepts the usual parameters for validations in Rails (:if, :unless, etc...)
+        #
+        def validates_download_of(*attr_names)
+          validates_with DownloadValidator, _merge_attributes(attr_names)
+        end
       end
 
       included do

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70103427625320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70103427625320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70103427624520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70103427624520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70103427623860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427623860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70103427623000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +69,31 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70103427623000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70103427622140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70103427622140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70103427621460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +101,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427621460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103427620560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70103427620560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70103427620060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427620060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70103427619580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427619580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70103427619000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70103427619000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70103427618580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427618580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70103427618120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103427618120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Upload files in your Ruby applications, map them to a range of ORMs,
   store them on different backends.
 email:
@@ -169,6 +229,7 @@ files:
 - lib/carrierwave/uploader/configuration.rb
 - lib/carrierwave/uploader/default_url.rb
 - lib/carrierwave/uploader/download.rb
+- lib/carrierwave/uploader/extension_blacklist.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/processing.rb
@@ -206,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library