carrierwave 0.5.7 → 0.5.8

data/README.md

@@ -3,6 +3,8 @@
 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)
+
 ## Information
 
 * RDoc documentation [available on RubyDoc.info](http://rubydoc.info/gems/carrierwave/frames)
@@ -84,7 +86,7 @@ add_column :users, :avatar, :string
 Open your model file and mount the uploader:
 
 ``` ruby
-class User
+class User < ActiveRecord::Base
   mount_uploader :avatar, AvatarUploader
 end
 ```
@@ -171,6 +173,23 @@ contain Russian letters:
 Also make sure that allowing non-latin characters won't cause a compatibility issue with a third-party
 plugins or client-side software.
 
+## Setting the content type
+
+If you care about the content type of your files and notice that it's not being set
+as expected, you can configure your uploaders to use `CarrierWave::MimeTypes`.
+This adds a dependency on the [mime-types](http://rubygems.org/gems/mime-types) gem,
+but is recommended when using fog, and fog already has a dependency on mime-types.
+
+``` ruby
+require 'carrierwave/processing/mime_types'
+
+class MyUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MimeTypes
+
+  process :set_content_type
+end
+```
+
 ## Adding versions
 
 Often you'll want to add different versions of the same file. The classic
@@ -217,6 +236,38 @@ class MyUploader < CarrierWave::Uploader::Base
 end
 ```
 
+### Conditional versions
+
+Occasionally you want to restrict the creation of versions on certain
+properties within the model or based on the picture itself.
+
+``` ruby
+class MyUploader < CarrierWave::Uploader::Base
+
+  version :human, :if => :is_human?
+  version :monkey, :if => :is_monkey?
+  version :banner, :if => :is_landscape?
+
+protected
+
+  def is_human? picture
+    model.can_program?(:ruby)
+  end
+  
+  def is_monkey? picture
+    model.favorite_food == 'banana'
+  end
+  
+  def is_landscape? picture
+    image = MiniMagick::Image.open(picture.path)
+    image[:width] > image[:height]
+  end
+  
+end
+```
+
+The `model` variable points to the instance object the uploader is attached to.
+
 ## Making uploads work across form redisplays
 
 Often you'll notice that uploaded files disappear when a validation fails.
@@ -470,7 +521,7 @@ This is *highly* recommended, as without it every request requires a lookup
 of this information.
 
 ``` ruby
-config.fog_host = "c000000.cdn.rackspacecloud.com"
+config.fog_host = "http://c000000.cdn.rackspacecloud.com"
 ```
 
 The UK Rackspace Cloud doesn’t have the same auth server as the US Cloud.
@@ -558,18 +609,6 @@ end
 Check out the manipulate! method, which makes it easy for you to write your own
 manipulation methods.
 
-## Using ImageScience
-
-ImageScience works the same way as RMagick.
-
-``` ruby
-class AvatarUploader < CarrierWave::Uploader::Base
-  include CarrierWave::ImageScience
-
-  process :resize_to_fill => [200, 200]
-end
-```
-
 ## Using MiniMagick
 
 MiniMagick is similar to RMagick but performs all the operations using the 'mogrify'
@@ -630,6 +669,29 @@ errors:
     carrierwave_integrity_error: 'Not an image.'
 ```
 
+## Large files
+
+By default, CarrierWave copies an uploaded file twice, first copying the file into the cache, then
+copying the file into the store.  For large files, this can be prohibitively time consuming.
+
+You may change this behavior by overriding either or both of the `move_to_cache` and 
+`move_to_store` methods:
+
+``` ruby
+class MyUploader < CarrierWave::Uploader::Base
+  def move_to_cache
+    true
+  end
+  def move_to_store
+    true
+  end
+end
+```
+
+When the `move_to_cache` and/or `move_to_store` methods return true, files will be moved (instead of copied) to the cache and store respectively.
+
+This has only been tested with the local filesystem store.
+
 ## Contributing to CarrierWave
 
 CarrierWave thrives on a large number of [contributors](https://github.com/jnicklas/carrierwave/contributors),

data/lib/carrierwave.rb

@@ -15,7 +15,7 @@ require 'active_support/memoizable'
 module CarrierWave
 
   class << self
-    attr_accessor :root
+    attr_accessor :root, :base_path
 
     def configure(&block)
       CarrierWave::Uploader::Base.configure(&block)
@@ -92,6 +92,7 @@ elsif defined?(Rails)
     class Railtie < Rails::Railtie
       initializer "carrierwave.setup_paths" do
         CarrierWave.root = Rails.root.join(Rails.public_path).to_s
+        CarrierWave.base_path = ENV['RAILS_RELATIVE_URL_ROOT']
       end
 
       initializer "carrierwave.active_record" do
@@ -104,6 +105,12 @@ elsif defined?(Rails)
 
 elsif defined?(Sinatra)
 
-  CarrierWave.root = Sinatra::Application.public
+  CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
+    # Sinatra >= 1.3
+    Sinatra::Application.public_folder
+  else
+    # Sinatra < 1.3
+    Sinatra::Application.public
+  end
 
 end

data/lib/carrierwave/locale/en.yml

@@ -2,4 +2,8 @@ en:
   errors:
     messages:
       carrierwave_processing_error: failed to be processed
-      carrierwave_integrity_error: is not an allowed file type
+      carrierwave_integrity_error: is not of an allowed file type
+      extension_white_list_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_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}"

data/lib/carrierwave/processing/mime_types.rb

@@ -51,7 +51,7 @@ module CarrierWave
         end
       end
     rescue ::MIME::InvalidContentType => e
-      raise CarrierWave::ProcessingError.new("Failed to process file with MIME::Types, maybe not valid content-type? Original Error: #{e}")
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mime_types_processing_error", :e => e)
     end
 
   end # MimeTypes

data/lib/carrierwave/processing/mini_magick.rb

@@ -32,16 +32,15 @@ module CarrierWave
   #     class MyUploader < CarrierWave::Uploader::Base
   #       include CarrierWave::MiniMagick
   #
-  #       process :do_stuff => 10.0
+  #       process :radial_blur => 10
   #
-  #       def do_stuff(blur_factor)
+  #       def radial_blur(amount)
   #         manipulate! do |img|
-  #           img = img.sepiatone
-  #           img = img.auto_orient
-  #           img = img.radial_blur blur_factor
+  #           img.radial_blur(amount)
+  #           img = yield(img) if block_given?
+  #           img
   #         end
   #       end
-  #     end
   #
   # === Note
   #
@@ -246,7 +245,7 @@ module CarrierWave
       image.write(current_path)
       ::MiniMagick::Image.open(current_path)
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      raise CarrierWave::ProcessingError.new("Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: #{e}")
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e)
     end
 
   end # MiniMagick

data/lib/carrierwave/processing/rmagick.rb

@@ -266,7 +266,7 @@ module CarrierWave
       end
       destroy_image(frames)
     rescue ::Magick::ImageMagickError => e
-      raise CarrierWave::ProcessingError.new("Failed to manipulate with rmagick, maybe it is not an image? Original Error: #{e}")
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e)
     end
 
   private

data/lib/carrierwave/sanitized_file.rb

@@ -181,6 +181,7 @@ module CarrierWave
       end
       chmod!(new_path, permissions)
       self.file = new_path
+      self
     end
 
     ##
@@ -216,6 +217,18 @@ module CarrierWave
       FileUtils.rm(self.path) if exists?
     end
 
+    ##
+    # Returns a File object, or nil if it does not exist.
+    #
+    # === Returns
+    #
+    # [File] a File object representing the SanitizedFile
+    #
+    def to_file
+      return @file if @file.is_a?(File)
+      File.open(path) if exists?
+    end
+
     ##
     # Returns the content type of the file.
     #

data/lib/carrierwave/storage/file.rb

@@ -13,6 +13,11 @@ module CarrierWave
       ##
       # Move the file to the uploader's store path.
       #
+      # By default, store!() uses copy_to(), which operates by copying the file 
+      # from the cache to the store, then deleting the file from the cache.  
+      # If move_to_store() is overriden to return true, then store!() uses move_to(),
+      # which simply moves the file from cache to store.  Useful for large files.
+      # 
       # === Parameters
       #
       # [file (CarrierWave::SanitizedFile)] the file to store
@@ -23,7 +28,11 @@ module CarrierWave
       #
       def store!(file)
         path = ::File.expand_path(uploader.store_path, uploader.root)
-        file.copy_to(path, uploader.permissions)
+        if uploader.move_to_store
+          file.move_to(path, uploader.permissions)
+        else
+          file.copy_to(path, uploader.permissions)
+        end
       end
 
       ##

data/lib/carrierwave/storage/fog.rb

@@ -225,9 +225,10 @@ module CarrierWave
         #
         # [Boolean] true on success or raises error
         def store(new_file)
+          fog_file = new_file.to_file
           @content_type ||= new_file.content_type
           @file = directory.files.create({
-            :body         => new_file.read,
+            :body         => fog_file ? fog_file : new_file.read,
             :content_type => @content_type,
             :key          => path,
             :public       => @uploader.fog_public

data/lib/carrierwave/storage/s3.rb

@@ -132,7 +132,7 @@ module CarrierWave
         end
 
         def authenticated_url
-          connection.get_object_url(bucket, path, Time.now + authentication_timeout)
+          connection.get_object_https_url(bucket, path, Time.now + authentication_timeout)
         end
 
         def store(file)

data/lib/carrierwave/test/matchers.rb

@@ -13,16 +13,23 @@ module CarrierWave
         def initialize(expected)
           @expected = expected
         end
+
         def matches?(actual)
           @actual = actual
           FileUtils.identical?(@actual, @expected)
         end
+
         def failure_message
           "expected #{@actual.inspect} to be identical to #{@expected.inspect}"
         end
+
         def negative_failure_message
           "expected #{@actual.inspect} to not be identical to #{@expected.inspect}"
         end
+
+        def description
+          "be identical to #{@expected.inspect}"
+        end
       end
 
       def be_identical_to(expected)
@@ -47,6 +54,10 @@ module CarrierWave
         def negative_failure_message
           "expected #{@actual.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_permissions(expected)
@@ -75,6 +86,9 @@ module CarrierWave
           "expected #{@actual.current_path.inspect} to be larger than #{@width} by #{@height}, but it wasn't."
         end
 
+        def description
+          "be no larger than #{@width} by #{@height}"
+        end
       end
 
       def be_no_larger_than(width, height)
@@ -103,12 +117,75 @@ module CarrierWave
           "expected #{@actual.current_path.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
         end
 
+        def description
+          "have an exact size of #{@width} by #{@height}"
+        end
       end
 
       def have_dimensions(width, height)
         HaveDimensions.new(width, height)
       end
 
+      class BeNoWiderThan # :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 be no wider than #{@width}, but it was #{@actual_width}."
+        end
+
+        def negative_failure_message
+          "expected #{@actual.current_path.inspect} not to be wider than #{@width}, but it is."
+        end
+
+        def description
+          "have a width less than or equal to #{@width}"
+        end
+      end
+
+      def be_no_wider_than(width)
+        BeNoWiderThan.new(width)
+      end
+
+      class BeNoTallerThan # :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 be no taller than #{@height}, but it was #{@actual_height}."
+        end
+
+        def negative_failure_message
+          "expected #{@actual.current_path.inspect} not to be taller than #{@height}, but it is."
+        end
+
+        def description
+          "have a height less than or equal to #{@height}"
+        end
+      end
+
+      def be_no_height_than(height)
+        BeNoTallerThan.new(height)
+      end
+
       class ImageLoader # :nodoc:
         def self.load_image(filename)
           if defined? ::MiniMagick

data/lib/carrierwave/uploader/cache.rb

@@ -90,6 +90,11 @@ module CarrierWave
       ##
       # Caches the given file. Calls process! to trigger any process callbacks.
       #
+      # By default, cache!() uses copy_to(), which operates by copying the file 
+      # to the cache, then deleting the original file.  If move_to_cache() is 
+      # overriden to return true, then cache!() uses move_to(), which simply 
+      # moves the file to the cache.  Useful for large files.
+      #
       # === Parameters
       #
       # [new_file (File, IOString, Tempfile)] any kind of file object
@@ -110,7 +115,11 @@ module CarrierWave
             @filename = new_file.filename
             self.original_filename = new_file.filename
 
-            @file = new_file.copy_to(cache_path, permissions)
+            if move_to_cache
+              @file = new_file.move_to(cache_path, permissions)
+            else
+              @file = new_file.copy_to(cache_path, permissions)
+            end
           end
         end
       end

data/lib/carrierwave/uploader/configuration.rb

@@ -8,6 +8,7 @@ module CarrierWave
         class_attribute :_storage, :instance_writer => false
 
         add_config :root
+        add_config :base_path
         add_config :permissions
         add_config :storage_engines
         add_config :s3_access_policy
@@ -37,6 +38,8 @@ module CarrierWave
         add_config :enable_processing
         add_config :ensure_multipart_form
         add_config :delete_tmp_file_after_storage
+        add_config :move_to_cache
+        add_config :move_to_store
         add_config :remove_previously_stored_files_after_update
 
         # fog
@@ -144,12 +147,15 @@ module CarrierWave
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true
+            config.move_to_cache = false
+            config.move_to_store = false
             config.remove_previously_stored_files_after_update = true
             config.ignore_integrity_errors = true
             config.ignore_processing_errors = true
             config.validate_integrity = true
             config.validate_processing = true
             config.root = CarrierWave.root
+            config.base_path = CarrierWave.base_path
             config.enable_processing = true
             config.ensure_multipart_form = true
           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, "You are not allowed to upload #{new_file.extension.inspect} files, 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.inspect)
         end
       end
 

data/lib/carrierwave/uploader/store.rb

@@ -57,7 +57,7 @@ module CarrierWave
         if @file and @cache_id
           with_callbacks(:store, new_file) do
             new_file = storage.store!(@file)
-            @file.delete if delete_tmp_file_after_storage
+            @file.delete if (delete_tmp_file_after_storage && ! move_to_store)
             delete_cache_id
             @file = new_file
             @cache_id = nil
@@ -79,6 +79,8 @@ module CarrierWave
             # Ignore: path is not a dir
           rescue Errno::ENOTEMPTY, Errno::EEXIST
             # Ignore: dir is not empty
+          rescue SystemCallError
+            # no such directory on JRuby
           end
         end
       end

data/lib/carrierwave/uploader/url.rb

@@ -3,6 +3,8 @@
 module CarrierWave
   module Uploader
     module Url
+      extend ActiveSupport::Concern
+      include CarrierWave::Uploader::Configuration
 
       ##
       # === Returns
@@ -13,7 +15,7 @@ module CarrierWave
         if file.respond_to?(:url) and not file.url.blank?
           file.url
         elsif current_path
-          File.expand_path(current_path).gsub(File.expand_path(root), '')
+          (base_path || "") + File.expand_path(current_path).gsub(File.expand_path(root), '')
         end
       end
 

data/lib/carrierwave/validations/active_model.rb

@@ -14,8 +14,9 @@ module CarrierWave
       class ProcessingValidator < ::ActiveModel::EachValidator
 
         def validate_each(record, attribute, value)
-          if record.send("#{attribute}_processing_error")
-            record.errors.add(attribute, :carrierwave_processing_error)
+          if e = record.send("#{attribute}_processing_error")
+            message = (e.message == e.class.to_s) ? :carrierwave_processing_error : e.message
+            record.errors.add(attribute, message)
           end
         end
       end
@@ -23,8 +24,9 @@ module CarrierWave
       class IntegrityValidator < ::ActiveModel::EachValidator
 
         def validate_each(record, attribute, value)
-          if record.send("#{attribute}_integrity_error")
-            record.errors.add(attribute, :carrierwave_integrity_error)
+          if e = record.send("#{attribute}_integrity_error")
+            message = (e.message == e.class.to_s) ? :carrierwave_integrity_error : e.message
+            record.errors.add(attribute, message)
           end
         end
       end
@@ -36,14 +38,6 @@ module CarrierWave
         #
         # Accepts the usual parameters for validations in Rails (:if, :unless, etc...)
         #
-        # === Note
-        #
-        # Set this key in your translations file for I18n:
-        #
-        #     carrierwave:
-        #       errors:
-        #         integrity: 'Here be an error message'
-        #
         def validates_integrity_of(*attr_names)
           validates_with IntegrityValidator, _merge_attributes(attr_names)
         end
@@ -54,14 +48,6 @@ module CarrierWave
         #
         # Accepts the usual parameters for validations in Rails (:if, :unless, etc...)
         #
-        # === Note
-        #
-        # Set this key in your translations file for I18n:
-        #
-        #     carrierwave:
-        #       errors:
-        #         processing: 'Here be an error message'
-        #
         def validates_processing_of(*attr_names)
           validates_with ProcessingValidator, _merge_attributes(attr_names)
         end
@@ -75,5 +61,4 @@ module CarrierWave
   end
 end
 
-I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')
-
+I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

data/lib/generators/templates/uploader.rb

@@ -2,10 +2,9 @@
 
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
-  # Include RMagick or ImageScience support:
+  # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
-  # include CarrierWave::ImageScience
 
   # Choose what kind of storage to use for this uploader:
   storage :file

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -05:00
+date: 2011-11-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +32,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
   requirement: *id001
-  name: activesupport
 - !ruby/object:Gem::Dependency 
+  name: rails
+  type: :development
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :development
   requirement: *id002
-  name: rails
 - !ruby/object:Gem::Dependency 
+  name: sqlite3
+  type: :development
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +61,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id003
-  name: sqlite3
 - !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,11 +75,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id004
-  name: cucumber
 - !ruby/object:Gem::Dependency 
+  name: json
+  type: :development
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -86,11 +89,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id005
-  name: json
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +104,11 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  prerelease: false
-  type: :development
   requirement: *id006
-  name: rspec
 - !ruby/object:Gem::Dependency 
+  name: sham_rack
+  type: :development
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +118,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id007
-  name: sham_rack
 - !ruby/object:Gem::Dependency 
+  name: timecop
+  type: :development
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +132,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id008
-  name: timecop
 - !ruby/object:Gem::Dependency 
+  name: cloudfiles
+  type: :development
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +146,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id009
-  name: cloudfiles
 - !ruby/object:Gem::Dependency 
+  name: fog
+  type: :development
+  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -157,11 +160,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id010
-  name: fog
 - !ruby/object:Gem::Dependency 
+  name: mini_magick
+  type: :development
+  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -171,11 +174,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id011
-  name: mini_magick
 - !ruby/object:Gem::Dependency 
+  name: rmagick
+  type: :development
+  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -185,10 +188,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id012
-  name: rmagick
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library