carrierwave 0.4.5 → 0.4.6

data/lib/carrierwave/storage/s3.rb

@@ -1,13 +1,17 @@
 # encoding: utf-8
-require 'aws/s3'
+begin
+  require 'aws'
+rescue LoadError
+  raise "You don't have the 'aws' gem installed. 'aws-s3' and 'right_aws' are no longer supported."
+end
 
 module CarrierWave
   module Storage
 
     ##
-    # Uploads things to Amazon S3 webservices. It requies the aws/s3 gem. In order for
-    # CarrierWave to connect to Amazon S3, you'll need to specify an access key id, secret key
-    # and bucket:
+    # Uploads things to Amazon S3 webservices using the "aws" library (aws gem). 
+    # In order for CarrierWave to connect to Amazon S3, you'll need to specify an access key id, secret key
+    # and bucket
     #
     #     CarrierWave.configure do |config|
     #       config.s3_access_key_id = "xxxxxx"
@@ -15,14 +19,21 @@ module CarrierWave
     #       config.s3_bucket = "my_bucket_name"
     #     end
     #
-    # You can also set the access policy for the uploaded files:
+    # The AWS::S3Interface is used directly as opposed to the normal AWS::S3::Bucket et.al. classes.
+    # This gives much improved performance and avoids unnecessary requests.
+    #
+    # You can set the access policy for the uploaded files:
     #
     #     CarrierWave.configure do |config|
-    #       config.s3_access = :public
+    #       config.s3_access_policy = 'public-read'
     #     end
     #
-    # Possible values are the 'canned access control policies' provided in the aws/s3 gem,
-    # they are:
+    # The default is 'public-read'. For more options see:
+    #
+    # http://docs.amazonwebservices.com/AmazonS3/latest/RESTAccessPolicy.html#RESTCannedAccessPolicies
+    #
+    # For backwards compatability with the original aws-s3 library, if the old +config.s3_access+ is set it
+    # will be converted to the appropriate access policy:
     #
     # [:private]              No one else has any access rights.
     # [:public_read]          The anonymous principal is granted READ access.
@@ -32,22 +43,6 @@ module CarrierWave
     # [:authenticated_read]   Any principal authenticated as a registered Amazon S3 user
     #                         is granted READ access.
     #
-    # The default is :public_read, it should work in most cases.
-    #
-    # You can assign HTTP headers to be used when S3 serves your files:
-    #
-    #     CarrierWave.configure do |config|
-    #       config.s3_headers = {"Content-Disposition" => "attachment; filename=foo.jpg;"}
-    #     end
-    #
-    # You can also set the headers dynamically by overriding the s3_headers method:
-    #
-    #     class MyUploader < CarrierWave::Uploader::Base
-    #       def s3_headers
-    #         { "Expires" => 1.year.from_how.httpdate }
-    #       end
-    #     end
-    #
     # You can change the generated url to a cnamed domain by setting the cnamed config:
     #
     #     CarrierWave.configure do |config|
@@ -61,15 +56,16 @@ module CarrierWave
     #
     # instead of
     #
-    #     http://s3.amazonaws.com/bucketname.domain.tld/path/to/file
+    #     http://bucketname.domain.tld.s3.amazonaws.com/path/to/file
     #
     class S3 < Abstract
 
       class File
 
-        def initialize(uploader, path)
+        def initialize(uploader, base, path)
           @uploader = uploader
           @path = path
+          @base = base
         end
 
         ##
@@ -91,14 +87,16 @@ module CarrierWave
         # [String] contents of the file
         #
         def read
-          AWS::S3::S3Object.value @path, @uploader.s3_bucket
+          result = connection.get(bucket, @path)
+          @headers = result[:headers]
+          result[:object]
         end
 
         ##
         # Remove the file from Amazon S3
         #
         def delete
-          AWS::S3::S3Object.delete @path, @uploader.s3_bucket
+          connection.delete(bucket, @path)
         end
 
         ##
@@ -109,43 +107,58 @@ module CarrierWave
         # [String] file's url
         #
         def url
-          if @uploader.s3_cnamed 
-            ["http://", @uploader.s3_bucket, "/", @path].compact.join
+          if @uploader.s3_cnamed
+            ["http://#{@uploader.s3_bucket}", @path].compact.join('/')
           else
-            ["http://s3.amazonaws.com/", @uploader.s3_bucket, "/", @path].compact.join
+            ["http://#{@uploader.s3_bucket}.s3.amazonaws.com", @path].compact.join('/')
           end
         end
 
-        def about
-          s3_object.about
+        def store(file)
+          content_type ||= file.content_type # this might cause problems if content type changes between read and upload (unlikely)
+          connection.put(bucket, @path, file.read,
+            {
+              'x-amz-acl' => access_policy,
+              'content-type' => content_type
+            }.merge(@uploader.s3_headers)
+          )
         end
 
-        def metadata
-          s3_object.metadata
+        # The Amazon S3 Access policy ready to send in storage request headers.
+        def access_policy
+          return @access_policy unless @access_policy.blank?
+          if @uploader.s3_access_policy.blank? 
+            if !@uploader.s3_access.blank?
+              @access_policy = @uploader.s3_access.to_s.gsub(/_/, '-')
+            else
+              @access_policy = 'public-read'
+            end
+          else
+            @access_policy = @uploader.s3_access_policy
+          end
         end
 
         def content_type
-          s3_object.content_type
+          headers["content-type"]
         end
 
-        def content_type=(new_content_type)
-          s3_object.content_type = new_content_type
+        def content_type=(type)
+          headers["content-type"] = type
         end
 
-        def content_disposition
-          s3_object.content_disposition
+        # Headers returned from file retrieval
+        def headers
+          @headers ||= {}
         end
-
-        def content_disposition=(new_disposition)
-          s3_object.content_disposition = new_disposition
-        end
-
-        def store
-          s3_object.store
+ 
+      private
+    
+        def bucket
+          @uploader.s3_bucket
         end
 
-        def s3_object
-          @s3_object ||= AWS::S3::S3Object.find(@path, @uploader.s3_bucket)
+        def connection
+          @base.connection
         end
 
       end
@@ -155,42 +168,36 @@ module CarrierWave
       #
       # === Parameters
       #
-      # [file (CarrierWave::Storage::S3::File)] the file to store
+      # [file (CarrierWave::SanitizedFile)] the file to store
       #
       # === Returns
       #
-      # [CarrierWave::Storage::S3] the stored file
+      # [CarrierWave::Storage::RightS3::File] the stored file
       #
       def store!(file)
-        connect!(uploader)
-        s3_options = {:access => uploader.s3_access, :content_type => file.content_type}
-        s3_options.merge!(uploader.s3_headers)
-        AWS::S3::S3Object.store(uploader.store_path, file.read, uploader.s3_bucket, s3_options)
-        CarrierWave::Storage::S3::File.new(uploader, uploader.store_path)
+        f = CarrierWave::Storage::S3::File.new(uploader, self, uploader.store_path)
+        f.store(file)
+        f
       end
 
       # Do something to retrieve the file
       #
-      # @param [CarrierWave::Uploader] uploader an uploader object
       # @param [String] identifier uniquely identifies the file
       #
       # [identifier (String)] uniquely identifies the file
       #
       # === Returns
       #
-      # [CarrierWave::Storage::S3::File] the stored file
+      # [CarrierWave::Storage::RightS3::File] the stored file
       #
       def retrieve!(identifier)
-        connect!(uploader)
-        CarrierWave::Storage::S3::File.new(uploader, uploader.store_path(identifier))
+        CarrierWave::Storage::S3::File.new(uploader, self, uploader.store_path(identifier))
       end
 
-    private
-
-      def connect!(uploader)
-        AWS::S3::Base.establish_connection!(
-          :access_key_id     => uploader.s3_access_key_id,
-          :secret_access_key => uploader.s3_secret_access_key
+      def connection
+        @connection ||= Aws::S3Interface.new(
+          uploader.s3_access_key_id, uploader.s3_secret_access_key,
+          :multi_thread => uploader.s3_multi_thread
         )
       end
 

data/lib/carrierwave/test/matchers.rb

@@ -61,9 +61,9 @@ module CarrierWave
         def matches?(actual)
           @actual = actual
           # Satisfy expectation here. Return false or raise an error if it's not met.
-          img = ::Magick::Image.read(@actual.current_path).first
-          @actual_width = img.columns
-          @actual_height = img.rows
+          image = ImageLoader.load_image(@actual.current_path)
+          @actual_width = image.width
+          @actual_height = image.height
           @actual_width <= @width && @actual_height <= @height
         end
 
@@ -74,10 +74,10 @@ module CarrierWave
         def negative_failure_message
           "expected #{@actual.current_path.inspect} to be larger than #{@width} by #{@height}, but it wasn't."
         end
+
       end
 
       def be_no_larger_than(width, height)
-        load_rmagick
         BeNoLargerThan.new(width, height)
       end
 
@@ -89,9 +89,9 @@ module CarrierWave
         def matches?(actual)
           @actual = actual
           # Satisfy expectation here. Return false or raise an error if it's not met.
-          img = ::Magick::Image.read(@actual.current_path).first
-          @actual_width = img.columns
-          @actual_height = img.rows
+          image = ImageLoader.load_image(@actual.current_path)
+          @actual_width = image.width
+          @actual_height = image.height
           @actual_width == @width && @actual_height == @height
         end
 
@@ -102,27 +102,63 @@ module CarrierWave
         def negative_failure_message
           "expected #{@actual.current_path.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
         end
+
       end
 
       def have_dimensions(width, height)
-        load_rmagick
         HaveDimensions.new(width, height)
       end
 
-    private
-    
-      def load_rmagick
-        unless defined? Magick 
-          begin
-            require 'rmagick'
-          rescue LoadError
-            require 'RMagick'
-          rescue LoadError
-            puts "WARNING: Failed to require rmagick, image processing may fail!"
+      class ImageLoader # :nodoc:
+        def self.load_image(filename)
+          if defined? MiniMagick
+            MiniMagickWrapper.new(filename)
+          else
+            unless defined? Magick
+              begin
+                require 'rmagick'
+              rescue LoadError
+                require 'RMagick'
+              rescue LoadError
+                puts "WARNING: Failed to require rmagick, image processing may fail!"
+              end
+            end
+            MagickWrapper.new(filename)
           end
         end
       end
-      
-    end # SpecHelper
+
+      class MagickWrapper # :nodoc:
+        attr_reader :image
+        def width
+          image.columns
+        end
+
+        def height
+          image.rows
+        end
+
+        def initialize(filename)
+          @image = ::Magick::Image.read(filename).first
+        end
+      end
+
+      class MiniMagickWrapper # :nodoc:
+        attr_reader :image
+        def width
+          image[:width]
+        end
+
+        def height
+          image[:height]
+        end
+
+        def initialize(filename)
+          @image = ::MiniMagick::Image.from_file(filename)
+        end
+      end
+
+    end # Matchers
   end # Test
-end # CarrierWave
+end # CarrierWave
+

data/lib/carrierwave/uploader/configuration.rb

@@ -6,16 +6,18 @@ module CarrierWave
         add_config :root
         add_config :permissions
         add_config :storage_engines
-        add_config :s3_access # for aws/s3
-        add_config :s3_access_policy # for right_aws
+        add_config :s3_access # for old aws/s3
+        add_config :s3_access_policy # for aws
         add_config :s3_bucket
         add_config :s3_access_key_id
         add_config :s3_secret_access_key
         add_config :s3_cnamed
         add_config :s3_headers
+        add_config :s3_multi_thread
         add_config :cloud_files_username
         add_config :cloud_files_api_key
         add_config :cloud_files_container
+        add_config :cloud_files_cdn_host
         add_config :grid_fs_database
         add_config :grid_fs_host
         add_config :grid_fs_port
@@ -43,12 +45,13 @@ module CarrierWave
             :cloud_files => "CarrierWave::Storage::CloudFiles"
           }
           config.storage = :file
-          config.s3_access = :public_read
-          config.s3_access_policy = 'public-read'
+          #config.s3_access = :public_read
+          #config.s3_access_policy = 'public-read' # Now set in library
           config.s3_headers = {}
+          config.s3_multi_thread = true
           config.grid_fs_database = 'carrierwave'
           config.grid_fs_host = 'localhost'
-          config.grid_fs_host = 27017
+          config.grid_fs_port = 27017
           config.store_dir = 'uploads'
           config.cache_dir = 'uploads/tmp'
           config.ignore_integrity_errors = true

data/lib/carrierwave/uploader/processing.rb

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

data/lib/carrierwave/uploader/url.rb

@@ -24,8 +24,8 @@ module CarrierWave
       #
       # [String] A JSON serializtion containing this uploader's URL
       #
-      def to_json
-        { 'url' => url }.to_json
+      def to_json(*args)
+        { 'url' => url }.to_json(*args)
       end
 
     end # Url

data/lib/carrierwave/uploader/versions.rb

@@ -108,6 +108,16 @@ module CarrierWave
         end
       end
 
+      ##
+      # Recreate versions and reprocess them. This can be used to recreate
+      # versions if their parameters somehow have changed.
+      #
+      def recreate_versions!
+        with_callbacks(:recreate_versions, file) do
+          versions.each { |name, v| v.store!(file) }
+        end
+      end
+
     private
 
       def full_filename(for_file)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,205 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +01:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.96
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: data_objects
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.12
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: do_sqlite3
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: timecop
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
-description: |-
-  * 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]
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  type: :runtime
+  version_requirements: *id001
+description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
 executables: []
@@ -215,46 +41,8 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- features/fixtures/bork.txt
-- features/fixtures/monkey.txt
 - README.rdoc
 files: 
-- Generators
-- History.txt
-- Manifest.txt
-- README.rdoc
-- Rakefile
-- carrierwave.gemspec
-- cucumber.yml
-- features/caching.feature
-- features/download.feature
-- features/file_storage.feature
-- features/file_storage_overridden_filename.feature
-- features/file_storage_overridden_store_dir.feature
-- features/file_storage_reversing_processor.feature
-- features/fixtures/bork.txt
-- features/fixtures/monkey.txt
-- features/grid_fs_storage.feature
-- features/mount_activerecord.feature
-- features/mount_datamapper.feature
-- features/step_definitions/activerecord_steps.rb
-- features/step_definitions/caching_steps.rb
-- features/step_definitions/datamapper_steps.rb
-- features/step_definitions/download_steps.rb
-- features/step_definitions/file_steps.rb
-- features/step_definitions/general_steps.rb
-- features/step_definitions/mount_steps.rb
-- features/step_definitions/store_steps.rb
-- features/support/activerecord.rb
-- features/support/datamapper.rb
-- features/support/env.rb
-- features/versions_basics.feature
-- features/versions_nested_versions.feature
-- features/versions_overridden_filename.feature
-- features/versions_overriden_store_dir.feature
-- lib/carrierwave.rb
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/core_ext/blank.rb
 - lib/carrierwave/core_ext/file.rb
@@ -264,7 +52,6 @@ files:
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
 - lib/carrierwave/orm/mongoid.rb
-- lib/carrierwave/orm/mongomapper.rb
 - lib/carrierwave/orm/sequel.rb
 - lib/carrierwave/processing/image_science.rb
 - lib/carrierwave/processing/mini_magick.rb
@@ -277,7 +64,6 @@ files:
 - lib/carrierwave/storage/right_s3.rb
 - lib/carrierwave/storage/s3.rb
 - lib/carrierwave/test/matchers.rb
-- lib/carrierwave/uploader.rb
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
 - lib/carrierwave/uploader/configuration.rb
@@ -291,47 +77,9 @@ files:
 - lib/carrierwave/uploader/store.rb
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
-- merb_generators/uploader_generator.rb
-- rails_generators/uploader/USAGE
-- rails_generators/uploader/templates/uploader.rb
-- rails_generators/uploader/uploader_generator.rb
-- script/console
-- script/destroy
-- script/generate
-- spec/compatibility/paperclip_spec.rb
-- spec/fixtures/bork.txt
-- spec/fixtures/landscape.jpg
-- spec/fixtures/portrait.jpg
-- spec/fixtures/test.jpeg
-- spec/fixtures/test.jpg
-- spec/mount_spec.rb
-- spec/orm/activerecord_spec.rb
-- spec/orm/datamapper_spec.rb
-- spec/orm/mongoid_spec.rb
-- spec/orm/mongomapper_spec.rb
-- spec/orm/sequel_spec.rb
-- spec/processing/image_science_spec.rb
-- spec/processing/mini_magick_spec.rb
-- spec/processing/rmagick_spec.rb
-- spec/sanitized_file_spec.rb
-- spec/spec_helper.rb
-- spec/storage/cloudfiles_spec.rb
-- spec/storage/grid_fs_spec.rb
-- spec/storage/right_s3_spec.rb
-- spec/storage/s3_spec.rb
-- spec/uploader/cache_spec.rb
-- spec/uploader/configuration_spec.rb
-- spec/uploader/default_url_spec.rb
-- spec/uploader/download_spec.rb
-- spec/uploader/extension_whitelist_spec.rb
-- spec/uploader/mountable_spec.rb
-- spec/uploader/paths_spec.rb
-- spec/uploader/processing_spec.rb
-- spec/uploader/proxy_spec.rb
-- spec/uploader/remove_spec.rb
-- spec/uploader/store_spec.rb
-- spec/uploader/url_spec.rb
-- spec/uploader/versions_spec.rb
+- lib/carrierwave/uploader.rb
+- lib/carrierwave.rb
+- README.rdoc
 has_rdoc: true
 homepage: http://carrierwave.rubyforge.org
 licenses: []
@@ -343,23 +91,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]"
+summary: Ruby file upload library
 test_files: []