carrierwave 0.5.1 → 0.5.2

data/README.rdoc

@@ -7,14 +7,16 @@ http://carrierwave.rubyforge.org
 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.
 
-== Description
+== Information
 
-* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc].
-* Source code {hosted at GitHub}[http://github.com/jnicklas/carrierwave]
-* Please {report any issues}[http://github.com/jnicklas/carrierwave/issues] on GitHub
-* Please direct any questions at the {mailing list}[http://groups.google.com/group/carrierwave]
-* Check out the {example app}[http://github.com/jnicklas/carrierwave-example-app]
-* Instructions for setting up a development environment are at the bottom of this file
+* 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]
+
+== Getting Help
+
+* Please direct any questions to the {mailing list}[http://groups.google.com/group/carrierwave]
+* Please report any issues on the {issue tracker}[http://github.com/jnicklas/carrierwave/issues]
 
 == Getting Started
 
@@ -26,10 +28,10 @@ In Rails, add it to your Gemfile:
 
     gem 'carrierwave'
 
+== Rails 2.3.x Compatibility
+
 CarrierWave is only compatible with Rails 3 and later as of version 0.5. If you want to use
-Rails 2, please use the latest gem in the 0.4.X series. You may also consider trying
-{this plugin}[http://github.com/gbuesing/carrierwave_rails23_compat] which allows CarrierWave
-to be used with a Rails 2.3 app.
+Rails 2, please use the latest gem in the 0.4.X series.
 
 == Quick Start
 
@@ -123,6 +125,38 @@ make the record invalid instead. Otherwise, an error is raised.
       end
     end
 
+=== Filenames and unicode chars
+
+Another security issue you should care for is the file names (see
+{Ruby On Rails Security Guide}[http://guides.rubyonrails.org/security.html#file-uploads]).
+By default, CarrierWave provides only English letters, arabic numerals and '-+_.' symbols as
+white-listed characters in the file name.
+
+If you want to support local scripts (Cyrillic letters, letters with diacritics and so on), you
+have to override +sanitize_regexp+ method. It should return regular expression which would match
+all *non*-allowed symbols.
+
+With Ruby 1.9 and higher you can simply write (as it has {Oniguruma}[http://oniguruma.rubyforge.org/oniguruma/]
+built-in):
+
+    class MyUploader < CarrierWave::Uploader::Base
+      def sanitize_regexp
+        /[^[:word:]\.\-\+]/
+      end
+    end
+
+With Ruby 1.8.* you have to manually specify all character ranges. For example, for files which may
+contain Russian letters:
+
+    class MyUploader < CarrierWave::Uploader::Base
+      def sanitize_regexp
+        /[^a-zA-Zа-яА-ЯёЁ0-9\.\-\+_]/u
+      end
+    end
+
+Also make sure that allowing non-latin characters won't cause a compatibily issue with a third-party
+plugins or client-side software.
+
 == Adding versions
 
 Often you'll want to add different versions of the same file. The classic
@@ -339,12 +373,27 @@ You'll need to configure a bucket, access id and secret key like this in an init
       config.s3_bucket = 'name_of_bucket'
     end
 
+You'll need to create the bucket on Amazon S3 if it doesn't already exist.
+
 In your uploader, set the storage to :s3
 
     class AvatarUploader < CarrierWave::Uploader::Base
       storage :s3
     end
 
+You can specify a region. US Standard "us-east-1" is the default.
+
+    CarrierWave.configure do |config|
+      config.s3_region = 'eu-west-1'
+    end
+
+Available options are defined in Fog Storage[http://github.com/geemus/fog/blob/master/lib/fog/aws/storage.rb]
+
+    'eu-west-1' => 's3-eu-west-1.amazonaws.com'
+    'us-east-1' => 's3.amazonaws.com'
+    'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com'
+    'us-west-1' => 's3-us-west-1.amazonaws.com'
+
 That's it! You can still use the <code>CarrierWave::Uploader#url</code> method to return
 the url to the file on Amazon S3.
 
@@ -530,5 +579,9 @@ You should now be able to run the tests:
 
     bundle exec rake
 
-Issues are reported on GitHub, pull requests are very welcome!
+You can also run the remote specs for Amazon S3 and Rackspace Cloud Files like so:
+
+    S3_SPEC=true CARRIERWAVE_TEST_BUCKET= S3_ACCESS_KEY_ID= S3_SECRET_ACCESS_KEY= bundle exec rake
+    CLOUDFILES_SPEC=true CLOUD_FILES_USER_NAME= CLOUD_FILES_API_KEY= CARRIERWAVE_TEST_CONTAINER= bundle exec rake
 
+Issues are reported on GitHub, pull requests are very welcome!

data/lib/carrierwave.rb

@@ -2,7 +2,7 @@
 
 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'
 
 module CarrierWave

data/lib/carrierwave/compatibility/paperclip.rb

@@ -11,7 +11,7 @@ module CarrierWave
     #
     #     class MyUploader < CarrierWave::Uploader::Base
     #       include CarrierWave::Compatibility::Paperclip
-    #       
+    #
     #       def paperclip_path
     #         ":rails_root/public/uploads/:id/:attachment/:style_:basename.:extension"
     #       end
@@ -20,23 +20,23 @@ module CarrierWave
     # ---
     #
     # This file contains code taken from Paperclip
-    # 
+    #
     # LICENSE
-    # 
+    #
     # The MIT License
-    # 
+    #
     # Copyright (c) 2008 Jon Yurek and thoughtbot, inc.
-    # 
+    #
     # Permission is hereby granted, free of charge, to any person obtaining a copy
     # of this software and associated documentation files (the "Software"), to deal
     # in the Software without restriction, including without limitation the rights
     # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
     # copies of the Software, and to permit persons to whom the Software is
     # furnished to do so, subject to the following conditions:
-    # 
+    #
     # The above copyright notice and this permission notice shall be included in
     # all copies or substantial portions of the Software.
-    # 
+    #
     # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

data/lib/carrierwave/mount.rb

@@ -80,7 +80,7 @@ module CarrierWave
     #
     # [image_url]               Returns the url to the uploaded file
     #
-    # [image_cache]             Returns a string that identifies the cache location of the file 
+    # [image_cache]             Returns a string that identifies the cache location of the file
     # [image_cache=]            Retrieves the file from the cache based on the given cache name
     #
     # [remote_image_url]        Returns previously cached remote url
@@ -106,7 +106,7 @@ module CarrierWave
     # [&block (Proc)]                     customize anonymous uploaders
     #
     # === Options
-    # 
+    #
     # [:mount_on => Symbol] if the name of the column to be serialized to differs you can override it using this option
     # [:ignore_integrity_errors => Boolean] if set to true, integrity errors will result in caching failing silently
     # [:ignore_processing_errors => Boolean] if set to true, processing errors will result in caching failing silently
@@ -273,7 +273,7 @@ module CarrierWave
           record.write_uploader(serialization_column, uploader.identifier)
         end
       end
-      
+
       def identifier
         record.read_uploader(serialization_column)
       end
@@ -311,7 +311,7 @@ module CarrierWave
       def remote_url=(url)
         unless uploader.cached?
           @remote_url = url
-          uploader.download!(url) 
+          uploader.download!(url)
         end
       end
 
@@ -342,7 +342,7 @@ module CarrierWave
       end
 
     private
-      
+
       def option(name)
         record.class.uploader_option(column, name)
       end

data/lib/carrierwave/orm/datamapper.rb

@@ -24,7 +24,7 @@ module CarrierWave
       # for objects that are not dirty. By explicitly calling
       # attribute_set we are marking the record as dirty.
       class_eval <<-RUBY
-        def remove_image=(value)
+        def remove_#{column}=(value)
           _mounter(:#{column}).remove = value
           attribute_set(:#{column}, '') if _mounter(:#{column}).remove?
         end

data/lib/carrierwave/orm/sequel.rb

@@ -1,25 +1,25 @@
 # encoding: utf-8
 
 require 'sequel'
- 
+
 module CarrierWave
   module Sequel
     include CarrierWave::Mount
- 
+
     def mount_uploader(column, uploader)
       raise "You need to use Sequel 3.0 or higher. Please upgrade." unless ::Sequel::Model.respond_to?(:plugin)
       super
- 
+
       alias_method :read_uploader, :[]
       alias_method :write_uploader, :[]=
- 
+
       include CarrierWave::Sequel::Hooks
       include CarrierWave::Sequel::Validations
     end
 
   end # Sequel
 end # CarrierWave
- 
+
 # Instance hook methods for the Sequel 3.x
 module CarrierWave::Sequel::Hooks
   def after_save

data/lib/carrierwave/processing/image_science.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "image_science"
+require 'image_science'
 
 module CarrierWave
   module ImageScience
@@ -59,15 +59,32 @@ module CarrierWave
         width, height = extract_dimensions_for_crop(img.width, img.height, new_width, new_height)
         x_offset, y_offset = extract_placement_for_crop(width, height, new_width, new_height)
 
+        # check if if new dimensions are too small for the new image
+        if width < new_width
+          width = new_width
+          height = (new_width.to_f*(img.height.to_f/img.width.to_f)).round
+        elsif height < new_height
+          height = new_height
+          width = (new_height.to_f*(img.width.to_f/img.height.to_f)).round
+        end
+
         img.resize( width, height ) do |i2|
 
+          # check to make sure offset is not negative
+          if x_offset < 0
+            x_offset = 0
+          end
+          if y_offset < 0
+            y_offset = 0
+          end
+
           i2.with_crop( x_offset, y_offset, new_width + x_offset, new_height + y_offset) do |file|
             file.save( self.current_path )
           end
         end
       end
     end
-    
+
     ##
     # Resize the image to fit within the specified dimensions while retaining
     # the original aspect ratio. Will only resize the image if it is larger than the

data/lib/carrierwave/processing/rmagick.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-unless defined? Magick 
+unless defined? Magick
   begin
     require 'rmagick'
   rescue LoadError
@@ -269,7 +269,7 @@ module CarrierWave
     end
 
   private
-  
+
     def destroy_image(image)
       image.destroy! if image.respond_to?(:destroy!)
     end

data/lib/carrierwave/sanitized_file.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'pathname'
+require 'active_support/core_ext/string/multibyte'
 
 module CarrierWave
 
@@ -221,6 +222,17 @@ module CarrierWave
       @file.content_type.chomp if @file.respond_to?(:content_type) and @file.content_type
     end
 
+    ##
+    # Used to sanitize the file name. Public to allow overriding for non-latin characters.
+    #
+    # === Returns
+    #
+    # [Regexp] the regexp for sanitizing the file name
+    #
+    def sanitize_regexp
+      /[^a-zA-Z0-9\.\-\+_]/
+    end
+
   private
 
     def file=(file)
@@ -248,10 +260,10 @@ module CarrierWave
     def sanitize(name)
       name = name.gsub("\\", "/") # work-around for IE
       name = File.basename(name)
-      name = name.gsub(/[^a-zA-Z0-9\.\-\+_]/,"_")
+      name = name.gsub(sanitize_regexp,"_")
       name = "_#{name}" if name =~ /\A\.+\z/
       name = "unnamed" if name.size == 0
-      return name.downcase
+      return name.mb_chars.downcase.to_s
     end
 
     def split_extension(filename)

data/lib/carrierwave/storage/cloud_files.rb

@@ -5,7 +5,7 @@ module CarrierWave
   module Storage
 
     ##
-    # Uploads things to Rackspace Cloud Files webservices using the Rackspace libraries (cloudfiles gem). 
+    # Uploads things to Rackspace Cloud Files webservices using the Rackspace libraries (cloudfiles gem).
     # In order for CarrierWave to connect to Cloud Files, you'll need to specify an username, api key
     # and container
     #
@@ -33,7 +33,7 @@ module CarrierWave
         end
 
         ##
-        # Returns the current path/filename of the file on Cloud Files. 
+        # Returns the current path/filename of the file on Cloud Files.
         #
         # === Returns
         #
@@ -112,7 +112,7 @@ module CarrierWave
           def connection
             @base.connection
           end
-          
+
           def cf_connection
             @cf_connection ||= ::CloudFiles::Connection.new(@uploader.cloud_files_username, @uploader.cloud_files_api_key)
           end
@@ -121,12 +121,16 @@ module CarrierWave
             if @cf_container
               @cf_container
             else
-              @cf_container = cf_connection.create_container(container)
-              @cf_container.make_public
+              begin
+                @cf_container = cf_connection.container(container)
+              rescue NoSuchContainerException
+                @cf_container = cf_connection.create_container(container)
+                @cf_container.make_public
+              end
               @cf_container
             end
           end
-          
+
 
       end
 

data/lib/carrierwave/storage/grid_fs.rb

@@ -11,7 +11,7 @@ module CarrierWave
     # connection or you reuse an existing connection.
     #
     # Creating a connection looks something like this:
-    # 
+    #
     #     CarrierWave.configure do |config|
     #       config.storage = :grid_fs
     #       config.grid_fs_host = "your-host.com"
@@ -23,7 +23,7 @@ module CarrierWave
     #     end
     #
     #   In the above example your documents url will look like:
-    #   
+    #
     #      http://your-app.com/images/:document-identifier-here
     #
     # When you already have a Mongo connection object (for example through Mongoid)
@@ -45,7 +45,7 @@ module CarrierWave
         end
 
         def path
-          nil
+          @path
         end
 
         def url
@@ -61,7 +61,7 @@ module CarrierWave
         end
 
         def write(file)
-          grid.open(@uploader.store_path, 'w', :content_type => file.content_type) do |f| 
+          grid.open(@uploader.store_path, 'w', :content_type => file.content_type) do |f|
             f.write(file.read)
           end
         end
@@ -73,7 +73,7 @@ module CarrierWave
         def content_type
           grid.open(@path, 'r').content_type
         end
-        
+
         def file_length
           grid.open(@path, 'r').file_length
         end
@@ -92,7 +92,7 @@ module CarrierWave
             db
           end
         end
-        
+
         def grid
           @grid ||= Mongo::GridFileSystem.new(database)
         end

data/lib/carrierwave/storage/s3.rb

@@ -123,10 +123,11 @@ module CarrierWave
         end
 
         def public_url
+          scheme = use_ssl? ? 'https' : 'http'
           if cnamed?
-            ["http://#{bucket}", path].compact.join('/')
+            ["#{scheme}://#{bucket}", path].compact.join('/')
           else
-            ["http://#{bucket}.s3.amazonaws.com", path].compact.join('/')
+            ["#{scheme}://#{bucket}.s3.amazonaws.com", path].compact.join('/')
           end
         end
 
@@ -167,6 +168,10 @@ module CarrierWave
 
       private
 
+        def use_ssl?
+          @uploader.s3_use_ssl
+        end
+
         def cnamed?
           @uploader.s3_cnamed
         end
@@ -217,7 +222,8 @@ module CarrierWave
       end
 
       def connection
-        @connection ||= Fog::AWS::Storage.new(
+        @connection ||= Fog::Storage.new(
+          :provider => 'AWS',
           :aws_access_key_id => uploader.s3_access_key_id,
           :aws_secret_access_key => uploader.s3_secret_access_key,
           :region => uploader.s3_region

data/lib/carrierwave/uploader/cache.rb

@@ -7,7 +7,7 @@ module CarrierWave
       "You tried to assign a String or a Pathname to an uploader, for security reasons, this is not allowed.\n\n If this is a file upload, please check that your upload form is multipart encoded."
     end
   end
-  
+
   ##
   # Generates a unique cache id for use in the caching system
   #
@@ -37,7 +37,7 @@ module CarrierWave
         #   CarrierWave.clean_cached_files!
         #
         # === Note
-        # 
+        #
         # This only works as long as you haven't done anything funky with your cache_dir.
         # It's recommended that you keep cache files in one place only.
         #

data/lib/carrierwave/uploader/callbacks.rb

@@ -6,33 +6,27 @@ module CarrierWave
       extend ActiveSupport::Concern
 
       included do
-        class_inheritable_accessor :_before_callbacks, :_after_callbacks
+        class_attribute :_before_callbacks, :_after_callbacks,
+          :instance_writer => false
+        self._before_callbacks = Hash.new []
+        self._after_callbacks = Hash.new []
       end
 
       def with_callbacks(kind, *args)
-        self.class._before_callbacks_for(kind).each { |callback| self.send(callback, *args) }
+        self.class._before_callbacks[kind].each { |c| send c, *args }
         yield
-        self.class._after_callbacks_for(kind).each { |callback| self.send(callback, *args) }
+        self.class._after_callbacks[kind].each { |c| send c, *args }
       end
 
       module ClassMethods
-        
-        def _before_callbacks_for(kind) #:nodoc:
-          (self._before_callbacks || { kind => [] })[kind] || []
-        end
-
-        def _after_callbacks_for(kind) #:nodoc:
-          (self._after_callbacks || { kind => [] })[kind] || []
-        end
-
-        def before(kind, callback)          
-          self._before_callbacks ||= {}
-          self._before_callbacks[kind] = _before_callbacks_for(kind) + [callback]
+        def before(kind, callback)
+          self._before_callbacks = self._before_callbacks.
+            merge kind => _before_callbacks[kind] + [callback]
         end
 
         def after(kind, callback)
-          self._after_callbacks ||= {}
-          self._after_callbacks[kind] = _after_callbacks_for(kind) + [callback]
+          self._after_callbacks = self._after_callbacks.
+            merge kind => _after_callbacks[kind] + [callback]
         end
       end # ClassMethods
 

data/lib/carrierwave/uploader/configuration.rb

@@ -15,6 +15,7 @@ module CarrierWave
         add_config :s3_cnamed
         add_config :s3_headers
         add_config :s3_region
+        add_config :s3_use_ssl
         add_config :cloud_files_username
         add_config :cloud_files_api_key
         add_config :cloud_files_container
@@ -52,6 +53,7 @@ module CarrierWave
           config.s3_headers = {}
           config.s3_access_policy = :public_read
           config.s3_region = 'us-east-1'
+          config.s3_use_ssl = false
           config.grid_fs_database = 'carrierwave'
           config.grid_fs_host = 'localhost'
           config.grid_fs_port = 27017

data/lib/carrierwave/uploader/download.rb

@@ -54,7 +54,7 @@ module CarrierWave
         unless uri.blank?
           file = RemoteFile.new(uri)
           raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
-          cache!(file) 
+          cache!(file)
         end
       end
 

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/versions.rb

@@ -114,9 +114,17 @@ 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. To fix this, we create a new
+        # file with the same original filename and we call file.read to get the
+        # data for the file and then store that.
+        #
+        # The call to store! will trigger the necessary callbacks to both
+        # process this version and all sub-versions
+        local_file = SanitizedFile.new :tempfile => StringIO.new(file.read),
+          :filename => File.basename(path)
+
+        store! local_file
       end
 
     private
@@ -130,9 +138,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.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +00:00
+date: 2011-02-18 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +29,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,46 +43,43 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  requirement: *id002
+  name: rails
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        version: "1.3"
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  requirement: *id003
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: fog
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 7
-        version: 0.3.7
+        - 4
+        version: "0.4"
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  requirement: *id004
+  name: fog
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  requirement: *id005
+  name: cucumber
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  requirement: *id006
+  name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  requirement: *id007
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  requirement: *id008
+  name: dm-validations
 - !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,12 +144,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  requirement: *id009
+  name: dm-migrations
 - !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,12 +158,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  requirement: *id010
+  name: dm-sqlite-adapter
 - !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,12 +172,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  requirement: *id011
+  name: sequel
 - !ruby/object:Gem::Dependency 
-  name: rmagick
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,12 +186,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id012
+  requirement: *id012
+  name: rmagick
 - !ruby/object:Gem::Dependency 
-  name: RubyInline
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -205,12 +200,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id013
+  requirement: *id013
+  name: RubyInline
 - !ruby/object:Gem::Dependency 
-  name: image_science
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -219,12 +214,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id014
+  requirement: *id014
+  name: image_science
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -234,12 +229,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
+  prerelease: false
   type: :development
-  version_requirements: *id015
+  requirement: *id015
+  name: mini_magick
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -250,12 +245,12 @@ dependencies:
         - 1
         - 1
         version: 1.1.1
+  prerelease: false
   type: :development
-  version_requirements: *id016
+  requirement: *id016
+  name: bson_ext
 - !ruby/object:Gem::Dependency 
-  name: mongoid
-  prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -268,12 +263,12 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
+  prerelease: false
   type: :development
-  version_requirements: *id017
+  requirement: *id017
+  name: mongoid
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -282,12 +277,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id018
+  requirement: *id018
+  name: timecop
 - !ruby/object:Gem::Dependency 
-  name: json
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id019
+  name: json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -296,8 +305,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id019
+  requirement: *id020
+  name: cloudfiles
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -377,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library