carrierwave 0.8.0 → 0.9.0

data/README.md

@@ -3,19 +3,19 @@
 This gem provides a simple and extremely flexible way to upload files from Ruby applications.
 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)
+[![Build Status](https://secure.travis-ci.org/carrierwaveuploader/carrierwave.png)](http://travis-ci.org/carrierwaveuploader/carrierwave)
+[![Code Climate](https://codeclimate.com/github/carrierwaveuploader/carrierwave.png)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
 
 ## Information
 
 * RDoc documentation [available on RubyDoc.info](http://rubydoc.info/gems/carrierwave/frames)
-* Source code [available on GitHub](http://github.com/jnicklas/carrierwave)
-* More information, known limitations, and how-tos [available on the wiki](https://github.com/jnicklas/carrierwave/wiki)
+* Source code [available on GitHub](http://github.com/carrierwaveuploader/carrierwave)
+* More information, known limitations, and how-tos [available on the wiki](https://github.com/carrierwaveuploader/carrierwave/wiki)
 
 ## Getting Help
 
 * Please ask the [Google Group](http://groups.google.com/group/carrierwave) for help if you have any questions.
-* Please report bugs on the [issue tracker](http://github.com/jnicklas/carrierwave/issues) but read the "getting help" section in the wiki first.
+* Please report bugs on the [issue tracker](http://github.com/carrierwaveuploader/carrierwave/issues) but read the "getting help" section in the wiki first.
 
 ## Installation
 
@@ -80,11 +80,12 @@ need to require the relevant extension manually, e.g.:
 require 'carrierwave/orm/activerecord'
 ```
 
-Add a string column to the model you want to mount the uploader on:
+Add a string column to the model you want to mount the uploader by creating
+a migration:
 
-```ruby
-add_column :users, :avatar, :string
-```
+
+	rails g migration add_avatar_to_users avatar:string
+	rake db:migrate
 
 Open your model file and mount the uploader:
 
@@ -111,11 +112,11 @@ u.avatar.identifier # => 'file.png'
 
 Other ORM support has been extracted into separate gems:
 
-* [carrierwave-datamapper](https://github.com/jnicklas/carrierwave-datamapper)
-* [carrierwave-mongoid](https://github.com/jnicklas/carrierwave-mongoid)
-* [carrierwave-sequel](https://github.com/jnicklas/carrierwave-sequel)
+* [carrierwave-datamapper](https://github.com/carrierwaveuploader/carrierwave-datamapper)
+* [carrierwave-mongoid](https://github.com/carrierwaveuploader/carrierwave-mongoid)
+* [carrierwave-sequel](https://github.com/carrierwaveuploader/carrierwave-sequel)
 
-There are more extensions listed in [the wiki](https://github.com/jnicklas/carrierwave/wiki)
+There are more extensions listed in [the wiki](https://github.com/carrierwaveuploader/carrierwave/wiki)
 
 ## Changing the storage directory
 
@@ -133,6 +134,16 @@ end
 This works for the file storage as well as Amazon S3 and Rackspace Cloud Files.
 Define `store_dir` as `nil` if you'd like to store files at the root level.
 
+If you store files outside the project root folder, you may want to define `cache_dir` in the same way:
+
+```ruby
+class MyUploader < CarrierWave::Uploader::Base
+  def cache_dir
+    '/tmp/projectname-cache'
+  end
+end
+```
+
 ## Securing uploads
 
 Certain file might be dangerous if uploaded to the wrong location, such as php
@@ -163,14 +174,14 @@ With Ruby 1.9 and higher you can simply write (as it has [Oniguruma](http://onig
 built-in):
 
 ```ruby
-  CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 ```
 
 With Ruby 1.8 you have to manually specify all character ranges. For example, for files which may
 contain Russian letters:
 
 ```ruby
-  CarrierWave::SanitizedFile.sanitize_regexp = /[^a-zA-Zа-яА-ЯёЁ0-9\.\-\+_]/u
+CarrierWave::SanitizedFile.sanitize_regexp = /[^a-zA-Zа-яА-ЯёЁ0-9\.\-\+_]/u
 ```
 
 Also make sure that allowing non-latin characters won't cause a compatibility issue with a third-party
@@ -219,7 +230,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: 800x800
+uploader.url # => '/url/to/my_file.png'               # size: 800x600
 uploader.thumb.url # => '/url/to/thumb_my_file.png'   # size: 200x200
 ```
 
@@ -367,6 +378,11 @@ form and you're good to go:
 <% end %>
 ```
 
+If you're using ActiveRecord, CarrierWave will indicate invalid URLs and download
+failures automatically with attribute validation errors. If you aren't, or you
+disable CarrierWave's `validate_download` option, you'll need to handle those
+errors yourself.
+
 ## Providing a default URL
 
 In many cases, especially when working with images, it might be a good idea to
@@ -381,13 +397,29 @@ class MyUploader < CarrierWave::Uploader::Base
 end
 ```
 
+Or if you are using the Rails asset pipeline:
+
+```ruby
+class MyUploader < CarrierWave::Uploader::Base
+  def default_url
+    ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  end
+end
+```
+
 ## Recreating versions
 
 You might come to a situation where you want to retroactively change a version
-or add a new one. You can use the recreate_versions! method to recreate the
+or add a new one. You can use the `recreate_versions!` method to recreate the
 versions from the base file. This uses a naive approach which will re-upload and
 process the specified version or all versions, if none is passed as an argument.
 
+When you are generating random unique filenames you have to call `save!` on
+the model after using `recreate_versions!`. This is necessary because
+`recreate_versions!` doesn't save the new filename to the database. Calling
+`save!` yourself will prevent that the database and file system are running
+out of sync.
+
 ```ruby
 instance = MyUploader.new
 instance.recreate_versions!(:thumb, :large)
@@ -424,9 +456,8 @@ end
 
 If you're using Rails, create an initializer for this:
 
-```ruby
-config/initializers/carrierwave.rb
-```
+	config/initializers/carrierwave.rb
+
 
 ## Testing with CarrierWave
 
@@ -509,7 +540,7 @@ CarrierWave.configure do |config|
     :aws_access_key_id      => 'xxx',                        # required
     :aws_secret_access_key  => 'yyy',                        # required
     :region                 => 'eu-west-1',                  # optional, defaults to 'us-east-1'
-    :hosts                  => 's3.example.com',             # optional, defaults to nil
+    :host                   => 's3.example.com',             # optional, defaults to nil
     :endpoint               => 'https://s3.example.com:8080' # optional, defaults to nil
   }
   config.fog_directory  = 'name_of_directory'                     # required
@@ -533,18 +564,36 @@ That's it! You can still use the `CarrierWave::Uploader#url` method to return th
 [Fog](http://github.com/fog/fog) is used to support Rackspace Cloud Files. Ensure you have it in your Gemfile:
 
 ```ruby
-gem "fog", "~> 1.3.1"
+gem "fog", "~> 1.10.1"
 ```
 
 You'll need to configure a directory (also known as a container), username and API key in the initializer.
 For the sake of performance it is assumed that the directory already exists, so please create it if need be.
 
+Using a US-based account:
+
+```ruby
+CarrierWave.configure do |config|
+  config.fog_credentials = {
+    :provider           => 'Rackspace',
+    :rackspace_username => 'xxxxxx',
+    :rackspace_api_key  => 'yyyyyy',
+    :rackspace_region   => :ord                # optional, defaults to :dfw
+  }
+  config.fog_directory = 'name_of_directory'
+end
+```
+
+Using a UK-based account:
+
 ```ruby
 CarrierWave.configure do |config|
   config.fog_credentials = {
     :provider           => 'Rackspace',
     :rackspace_username => 'xxxxxx',
-    :rackspace_api_key  => 'yyyyyy'
+    :rackspace_api_key  => 'yyyyyy',
+    :rackspace_auth_url  => Fog::Rackspace::UK_AUTH_ENDPOINT,
+    :rackspace_region   => :lon
   }
   config.fog_directory = 'name_of_directory'
 end
@@ -741,7 +790,7 @@ This has only been tested with the local filesystem store.
 
 ## Contributing to CarrierWave
 
-See [CONTRIBUTING.md](https://github.com/jnicklas/carrierwave/blob/master/CONTRIBUTING.md)
+See [CONTRIBUTING.md](https://github.com/carrierwaveuploader/carrierwave/blob/master/CONTRIBUTING.md)
 
 ## License
 

data/lib/carrierwave.rb

@@ -62,6 +62,7 @@ elsif defined?(Sinatra)
   end
 end
 
+require "carrierwave/utilities"
 require "carrierwave/error"
 require "carrierwave/sanitized_file"
 require "carrierwave/mount"

data/lib/carrierwave/locale/cs.yml

@@ -0,0 +1,11 @@
+cs:
+  errors:
+    messages:
+      carrierwave_processing_error: se nepodařilo zpracovat
+      carrierwave_integrity_error: není povolený typ souboru
+      carrierwave_download_error: nemůže být stažen
+      extension_white_list_error: "Není možné nahrávat %{extension} soubory, povolené typy: %{allowed_types}"
+      extension_black_list_error: "Není možné nahrávat %{extension} soubory, zakázané typy: %{prohibited_types}"
+      rmagick_processing_error: "Nepodařilo se upravit pomocí rmagick, možná se nejedná o obrázek? Hlášená Chyba: %{e}"
+      mime_types_processing_error: "Nepodařilo se upravit s MIME::Types, možná se nejedná o content-type? Hlášená Chyba: %{e}"
+      mini_magick_processing_error: "Nepodařilo se upravit pomocí MiniMagick, možná se nejedná o obrázek? Hlášená Chyba: %{e}"

data/lib/carrierwave/locale/de.yml

@@ -0,0 +1,11 @@
+de:
+  errors:
+    messages:
+      carrierwave_processing_error: konnte nicht verarbeitet werden
+      carrierwave_integrity_error: ist kein erlaubter Dateityp
+      carrierwave_download_error: konnte nicht heruntergeladen werden
+      extension_white_list_error: "Sie sind nicht berechtigt %{extension} Dateien hochzuladen, erlaubte Typen: %{allowed_types}"
+      extension_black_list_error: "Sie sind nicht berechtigt %{extension} Dateien hochzuladen, verbotene Typen: %{prohibited_types}"
+      rmagick_processing_error: "Verarbeitung mit rmagick fehlgeschlagen, vielleicht ist es kein Bild? Original Fehler: %{e}"
+      mime_types_processing_error: "Verarbeitung mit MIME::Types fehlgeschlagen, vielleicht kein gültiger content-type? Original Fehler: %{e}"
+      mini_magick_processing_error: "Verarbeitung mit MiniMagick fehlgeschlagen, vielleicht ist es kein Bild? Original Fehler: %{e}"

data/lib/carrierwave/locale/nl.yml

@@ -0,0 +1,11 @@
+nl:
+  errors:
+    messages:
+      carrierwave_processing_error: kon niet worden verwerkt
+      carrierwave_integrity_error: is niet van een toegestaan bestandstype
+      carrierwave_download_error: kon niet gedownload worden
+      extension_white_list_error: "Het is niet toegestaan om %{extension} bestanden te uploaden; toegestane bestandstypes: %{allowed_types}"
+      extension_black_list_error: "Het is niet toegestaan om %{extension} bestanden te uploaden; verboden bestandstypes: %{prohibited_types}"
+      rmagick_processing_error: "Bewerking met rmagick is mislukt, misschien is het geen afbeelding? Originele foutmelding: %{e}"
+      mime_types_processing_error: "Verwerking van bestand met MIME::Types is mislukt, misschien is het geen geldig content-type? Originele foutmelding: %{e}"
+      mini_magick_processing_error: "Bewerking met MiniMagick is mislukt, misschien is het geen afbeelding? Originele foutmelding: %{e}"

data/lib/carrierwave/locale/sk.yml

@@ -0,0 +1,11 @@
+sk:
+  errors:
+    messages:
+      carrierwave_processing_error: sa nepodarilo spracovať
+      carrierwave_integrity_error: nie je povolený typ súboru
+      carrierwave_download_error: nie je možné stiahnuť
+      extension_white_list_error: "Nie je možné nahrávať %{extension} súbory, povolené typy: %{allowed_types}"
+      extension_black_list_error: "Nie je možné nahrávať %{extension} súbory, zakázané typy: %{prohibited_types}"
+      rmagick_processing_error: "Nepodarilo sa upraviť pomocou rmagick, možno nejde o obrázok? Hlásená chyba: %{e}"
+      mime_types_processing_error: "Súbor sa nepodarilo spracovať pomocou MIME::Types, možno nejde o valídny content-type? Hlásená chyba: %{e}"
+      mini_magick_processing_error: "Nepodarilo sa upraviť pomocou MiniMagick, možno nejde o obrázok? Hlásená chyba: %{e}"

data/lib/carrierwave/mount.rb

@@ -62,7 +62,7 @@ module CarrierWave
     #
     #     @user.image.url # => '/some_url.png'
     #
-    # It is also possible (but not recommended) to ommit the uploader, which
+    # It is also possible (but not recommended) to omit the uploader, which
     # will create an anonymous uploader class.
     #
     # Passing a block makes it possible to customize the uploader. This can be

data/lib/carrierwave/orm/activerecord.rb

@@ -57,7 +57,7 @@ module CarrierWave
           only   = options && options[:only]   && Array.wrap(options[:only]).map(&:to_s)
 
           self.class.uploaders.each do |column, uploader|
-            if (!only && !except) || (only && only.include?(column.to_s)) || (except && !except.include?(column.to_s))
+            if (!only && !except) || (only && only.include?(column.to_s)) || (!only && except && !except.include?(column.to_s))
               hash[column.to_s] = _mounter(column).uploader.serializable_hash
             end
           end

data/lib/carrierwave/processing/mini_magick.rb

@@ -104,6 +104,7 @@ module CarrierWave
     #     image.convert(:png)
     #
     def convert(format)
+      @format = format
       manipulate! do |img|
         img.format(format.to_s.downcase)
         img = yield(img) if block_given?
@@ -257,11 +258,12 @@ module CarrierWave
     def manipulate!
       cache_stored_file! if !cached?
       image = ::MiniMagick::Image.open(current_path)
+      image.format(@format.to_s.downcase) if @format
       image = yield(image)
       image.write(current_path)
       ::MiniMagick::Image.open(current_path)
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e)
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :default => I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :locale => :en))
     end
 
   end # MiniMagick

data/lib/carrierwave/processing/rmagick.rb

@@ -116,6 +116,7 @@ module CarrierWave
     #
     def convert(format)
       manipulate!(:format => format)
+      @format = format
     end
 
     ##
@@ -214,7 +215,7 @@ module CarrierWave
     def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
       manipulate! do |img|
         img.resize_to_fit!(width, height)
-        new_img = ::Magick::Image.new(width, height)
+        new_img = ::Magick::Image.new(width, height) { self.background_color = 'rgba(255,255,255,0)' }
         if background == :transparent
           filled = new_img.matte_floodfill(1, 1)
         else
@@ -333,14 +334,14 @@ module CarrierWave
       end
 
       write_block = create_info_block(options[:write])
-      if options[:format]
-        frames.write("#{options[:format]}:#{current_path}", &write_block)
+      if options[:format] || @format
+        frames.write("#{options[:format] || @format}:#{current_path}", &write_block)
       else
         frames.write(current_path, &write_block)
       end
       destroy_image(frames)
     rescue ::Magick::ImageMagickError => e
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e)
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :default => I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :locale => :en))
     end
 
   private

data/lib/carrierwave/sanitized_file.rb

@@ -30,7 +30,7 @@ module CarrierWave
     end
 
     ##
-    # Returns the filename as is, without sanizting it.
+    # Returns the filename as is, without sanitizing it.
     #
     # === Returns
     #
@@ -153,11 +153,15 @@ module CarrierWave
     # [String] contents of the file
     #
     def read
-      if is_path?
+      if @content
+        @content
+      elsif is_path?
         File.open(@file, "rb") {|file| file.read}
       else
         @file.rewind if @file.respond_to?(:rewind)
-        @file.read
+        @content = @file.read
+        @file.close if @file.respond_to?(:close) && @file.respond_to?(:closed?) && !@file.closed?
+        @content
       end
     end
 

data/lib/carrierwave/storage/fog.rb

@@ -19,6 +19,7 @@ module CarrierWave
     # [: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
+    # [:fog_use_ssl_for_aws]              (optional) #public_url will use https for the AWS generated URL]
     #
     #
     # AWS credentials contain the following keys:
@@ -103,6 +104,7 @@ module CarrierWave
       end
 
       class File
+        include CarrierWave::Utilities::Uri
 
         ##
         # Current local path to file
@@ -275,11 +277,12 @@ module CarrierWave
         # [NilClass] no public url available
         #
         def public_url
+          encoded_path = encode_path(path)
           if host = @uploader.asset_host
             if host.respond_to? :call
-              "#{host.call(self)}/#{path}"
+              "#{host.call(self)}/#{encoded_path}"
             else
-              "#{host}/#{path}"
+              "#{host}/#{encoded_path}"
             end
           else
             # AWS/Google optimized for speed over correctness
@@ -287,18 +290,19 @@ module CarrierWave
             when 'AWS'
               # check if some endpoint is set in fog_credentials
               if @uploader.fog_credentials.has_key?(:endpoint)
-                "#{@uploader.fog_credentials[:endpoint]}/#{@uploader.fog_directory}/#{path}"
+                "#{@uploader.fog_credentials[:endpoint]}/#{@uploader.fog_directory}/#{encoded_path}"
               else
+                protocol = @uploader.fog_use_ssl_for_aws ? "https" : "http"
                 # 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]$/
-                  "https://#{@uploader.fog_directory}.s3.amazonaws.com/#{path}"
+                  "#{protocol}://#{@uploader.fog_directory}.s3.amazonaws.com/#{encoded_path}"
                 else
                   # directory is not a valid subdomain, so use path style for access
-                  "https://s3.amazonaws.com/#{@uploader.fog_directory}/#{path}"
+                  "#{protocol}://s3.amazonaws.com/#{@uploader.fog_directory}/#{encoded_path}"
                 end
               end
             when 'Google'
-              "https://commondatastorage.googleapis.com/#{@uploader.fog_directory}/#{path}"
+              "https://commondatastorage.googleapis.com/#{@uploader.fog_directory}/#{encoded_path}"
             else
               # avoid a get by just using local reference
               directory.files.new(:key => path).public_url
@@ -334,7 +338,7 @@ module CarrierWave
         #
         def filename(options = {})
           if file_url = url(options)
-            file_url.gsub(/.*\/(.*?$)/, '\1')
+            URI.decode(file_url).gsub(/.*\/(.*?$)/, '\1')
           end
         end
 

data/lib/carrierwave/uploader/cache.rb

@@ -13,10 +13,10 @@ module CarrierWave
   #
   # === Returns
   #
-  # [String] a cache id in the format YYYYMMDD-HHMM-PID-RND
+  # [String] a cache id in the format TIMEINT-PID-RND
   #
   def self.generate_cache_id
-    Time.now.strftime('%Y%m%d-%H%M') + '-' + Process.pid.to_s + '-' + ("%04d" % rand(9999))
+    Time.now.utc.to_i.to_s + '-' + Process.pid.to_s + '-' + ("%04d" % rand(9999))
   end
 
   module Uploader
@@ -43,8 +43,8 @@ module CarrierWave
         #
         def clean_cached_files!(seconds=60*60*24)
           Dir.glob(File.expand_path(File.join(cache_dir, '*'), CarrierWave.root)).each do |dir|
-            time = dir.scan(/(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})/).first.map { |t| t.to_i }
-            time = Time.utc(*time)
+            time = dir.scan(/(\d+)-\d+-\d+/).first.map { |t| t.to_i }
+            time = Time.at(*time)
             if time < (Time.now.utc - seconds)
               FileUtils.rm_rf(dir)
             end
@@ -165,7 +165,7 @@ module CarrierWave
       alias_method :full_original_filename, :original_filename
 
       def cache_id=(cache_id)
-        raise CarrierWave::InvalidParameter, "invalid cache id" unless cache_id =~ /\A[\d]{8}\-[\d]{4}\-[\d]+\-[\d]{4}\z/
+        raise CarrierWave::InvalidParameter, "invalid cache id" unless cache_id =~ /\A[\d]+\-[\d]+\-[\d]{4}\z/
         @cache_id = cache_id
       end
 

data/lib/carrierwave/uploader/configuration.rb

@@ -28,6 +28,7 @@ module CarrierWave
         add_config :fog_directory
         add_config :fog_public
         add_config :fog_authenticated_url_expiration
+        add_config :fog_use_ssl_for_aws
 
         # Mounting
         add_config :ignore_integrity_errors
@@ -96,7 +97,11 @@ module CarrierWave
             def #{name}
               value = @#{name} if instance_variable_defined?(:@#{name})
               value = self.class.#{name} unless instance_variable_defined?(:@#{name})
-              value.instance_of?(Proc) ? value.call : value
+              if value.instance_of?(Proc)
+                value.arity >= 1 ? value.call(self) : value.call
+              else 
+                value
+              end
             end
           RUBY
         end
@@ -121,6 +126,7 @@ module CarrierWave
             config.fog_credentials = {}
             config.fog_public = true
             config.fog_authenticated_url_expiration = 600
+            config.fog_use_ssl_for_aws = true
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true

data/lib/carrierwave/uploader/download.rb

@@ -17,6 +17,10 @@ module CarrierWave
         end
 
         def original_filename
+          if file.meta.include? 'content-disposition'
+            match = file.meta['content-disposition'].match(/filename=(\"?)(.+)\1/)
+            return match[2] unless match.nil?
+          end
           File.basename(file.base_uri.path)
         end
 
@@ -70,7 +74,13 @@ module CarrierWave
       # [url (String)] The URL where the remote file is stored
       #
       def process_uri(uri)
-        URI.parse(URI.escape(URI.unescape(uri)))
+        URI.parse(uri)
+      rescue URI::InvalidURIError
+        uri_parts = uri.split('?')
+        # regexp from Ruby's URI::Parser#regexp[:UNSAFE], with [] specifically removed
+        encoded_uri = URI.encode(uri_parts.shift, /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,]/)
+        encoded_uri << '?' << URI.encode(uri_parts.join('?')) if uri_parts.any?
+        URI.parse(encoded_uri) rescue raise CarrierWave::DownloadError, "couldn't parse URL"
       end
 
     end # Download

data/lib/carrierwave/uploader/serialization.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "active_support/json"
+require "json"
 require "active_support/core_ext/hash"
 
 module CarrierWave
@@ -16,8 +16,8 @@ module CarrierWave
         Hash[mounted_as || "uploader", serializable_hash]
       end
 
-      def to_json
-        ActiveSupport::JSON.encode(as_json)
+      def to_json(options=nil)
+        JSON.generate(as_json)
       end
 
       def to_xml(options={})

data/lib/carrierwave/uploader/url.rb

@@ -5,6 +5,7 @@ module CarrierWave
     module Url
       extend ActiveSupport::Concern
       include CarrierWave::Uploader::Configuration
+      include CarrierWave::Utilities::Uri
 
       ##
       # === Parameters
@@ -19,7 +20,7 @@ module CarrierWave
         if file.respond_to?(:url) and not file.url.blank?
           file.method(:url).arity == 0 ? file.url : file.url(options)
         elsif file.respond_to?(:path)
-          path = file.path.gsub(File.expand_path(root), '')
+          path = encode_path(file.path.gsub(File.expand_path(root), ''))
 
           if host = asset_host
             if host.respond_to? :call

data/lib/carrierwave/uploader/versions.rb

@@ -68,6 +68,25 @@ module CarrierWave
               end
             RUBY
 
+            # Regardless of what is set in the parent uploader, do not enforce the
+            # move_to_cache config option on versions because it moves the original
+            # file to the version's target file.
+            #
+            # If you want to enforce this setting on versions, override this method
+            # in each version:
+            #
+            # version :thumb do
+            #   def move_to_cache
+            #     true
+            #   end
+            # end
+            #
+            uploader.class_eval <<-RUBY
+              def move_to_cache
+                false
+              end
+            RUBY
+
             # Add the current version hash to class attribute :versions
             current_version = {}
             current_version[name] = {
@@ -125,6 +144,33 @@ module CarrierWave
         self.class.version_names.join('_').to_sym unless self.class.version_names.blank?
       end
 
+      ##
+      #
+      # === Parameters
+      #
+      # [name (#to_sym)] name of the version
+      #
+      # === Returns
+      #
+      # [Boolean] True when the version exists according to its :if condition
+      #
+      def version_exists?(name)
+        name = name.to_sym
+
+        return false unless self.class.versions.has_key?(name)
+
+        condition = self.class.versions[name][:options][:if]
+        if(condition)
+          if(condition.respond_to?(:call))
+            condition.call(self, :version => name, :file => file)
+          else
+            send(condition, file)
+          end
+        else
+          true
+        end
+      end
+
       ##
       # When given a version name as a parameter, will return the url for that version
       # This also works with nested versions.
@@ -153,7 +199,7 @@ module CarrierWave
         if (version = args.first) && version.respond_to?(:to_sym)
           raise ArgumentError, "Version #{version} doesn't exist!" if versions[version.to_sym].nil?
           # recursively proxy to version
-          versions[version.to_sym].url(*args[1..-1])
+          versions[version.to_sym].url(*args[1..-1]) if version_exists?(version)
         elsif args.first
           super(args.first)
         else
@@ -190,16 +236,7 @@ module CarrierWave
 
       def active_versions
         versions.select do |name, uploader|
-          condition = self.class.versions[name][:options][:if]
-          if(condition)
-            if(condition.respond_to?(:call))
-              condition.call(self, :version => name, :file => file)
-            else
-              send(condition, file)
-            end
-          else
-            true
-          end
+          version_exists?(name)
         end
       end
 
@@ -240,7 +277,8 @@ module CarrierWave
 
       def store_versions!(new_file, versions=nil)
         if versions
-          versions.each { |v| Hash[active_versions][v].store!(new_file) }
+          active = Hash[active_versions]
+          versions.each { |v| active[v].try(:store!, new_file) } unless active.empty?
         else
           active_versions.each { |name, v| v.store!(new_file) }
         end

data/lib/carrierwave/utilities.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require 'carrierwave/utilities/uri'
+
+module CarrierWave
+  module Utilities
+  end
+end

data/lib/carrierwave/utilities/uri.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Utilities
+    module Uri
+
+    private
+      def encode_path(path)
+        # based on Ruby < 2.0's URI.encode
+        safe_string = URI::REGEXP::PATTERN::UNRESERVED + '\/'
+        unsafe = Regexp.new("[^#{safe_string}]", false)
+
+        path.to_s.gsub(unsafe) do
+          us = $&
+          tmp = ''
+          us.each_byte do |uc|
+            tmp << sprintf('%%%02X', uc)
+          end
+          tmp
+        end
+      end
+    end # Uri
+  end # Utilities
+end # CarrierWave

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/generators/templates/uploader.rb

@@ -6,10 +6,6 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
 
-  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
-  # include Sprockets::Helpers::RailsHelper
-  # include Sprockets::Helpers::IsolatedHelper
-
   # Choose what kind of storage to use for this uploader:
   storage :file
   # storage :fog
@@ -23,7 +19,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,29 +44,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,39 +74,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,11 @@ extra_rdoc_files:
 files:
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/error.rb
+- lib/carrierwave/locale/cs.yml
+- lib/carrierwave/locale/de.yml
 - lib/carrierwave/locale/en.yml
+- lib/carrierwave/locale/nl.yml
+- lib/carrierwave/locale/sk.yml
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/processing/mime_types.rb
@@ -243,13 +247,15 @@ files:
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
 - lib/carrierwave/uploader.rb
+- lib/carrierwave/utilities/uri.rb
+- lib/carrierwave/utilities.rb
 - lib/carrierwave/validations/active_model.rb
 - lib/carrierwave/version.rb
 - lib/carrierwave.rb
 - lib/generators/templates/uploader.rb
 - lib/generators/uploader_generator.rb
 - README.md
-homepage: https://github.com/jnicklas/carrierwave
+homepage: https://github.com/carrierwaveuploader/carrierwave
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -275,4 +281,3 @@ signing_key:
 specification_version: 3
 summary: Ruby file upload library
 test_files: []
-has_rdoc: