carrierwave 0.5.0.beta2 → 0.5.0

data/README.rdoc

@@ -4,8 +4,8 @@ http://carrierwave.rubyforge.org
 
 == Summary
 
-This plugin for Merb and Rails provides a simple and extremely flexible way to
-upload files.
+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
 
@@ -22,23 +22,15 @@ Install the latest stable release:
 
     [sudo] gem install carrierwave
 
-In Merb, add it as a dependency to your config/dependencies.rb:
+In Rails, add it to your Gemfile:
 
-    dependency 'carrierwave'
-
-In Rails, add it to your environment.rb:
-
-    config.gem "carrierwave"
+    gem 'carrierwave'
 
 == Quick Start
 
 Start off by generating an uploader:
 
-    merb-gen uploader Avatar
-
-or in Rails:
-
-    script/generate uploader Avatar
+    rails generate uploader Avatar
 
 this should give you a file in:
 
@@ -61,7 +53,8 @@ You can use your uploader class to store and retrieve files like this:
 
 CarrierWave gives you a +store+ for permanent storage, and a +cache+ for
 temporary storage. You can use different stores, at the moment a filesystem
-store, an Amazon S3 store, a Rackspace Cloud Files store, and a store for MongoDB's GridFS are bundled.
+store, an Amazon S3 store, a Rackspace Cloud Files store, and a store for
+MongoDB's GridFS are bundled.
 
 Most of the time you are going to want to use CarrierWave together with an ORM.
 It is quite simple to mount uploaders on columns in your model, so you can
@@ -76,7 +69,7 @@ need to require the relevant extension manually, e.g.:
 
 Add a string column to the model you want to mount the uploader on:
 
-    add_column :user, :avatar, :string
+    add_column :users, :avatar, :string
 
 Open your model file and mount the uploader:
 
@@ -112,9 +105,12 @@ Define +store_dir+ as +nil+ if you'd like to store files at the root level.
 
 == Securing uploads
 
-Certain file might be dangerous if uploaded to the wrong location, such as php files or other script files. CarrierWave allows you to specify a white-list of allowed extensions.
+Certain file might be dangerous if uploaded to the wrong location, such as php
+files or other script files. CarrierWave allows you to specify a white-list of
+allowed extensions.
 
-If you're mounting the uploader, uploading a file with the wrong extension will make the record invalid instead. Otherwise, an error is raised.
+If you're mounting the uploader, uploading a file with the wrong extension will
+make the record invalid instead. Otherwise, an error is raised.
 
     class MyUploader < CarrierWave::Uploader::Base
       def extension_white_list
@@ -170,7 +166,7 @@ in that case. Suppose your +user+ model has an uploader mounted on +avatar+
 file, just add a hidden field called +avatar_cache+. In Rails, this would look
 like this:
 
-    <% form_for @user, :html => {:multipart => true} do |f| %>
+    <%= form_for @user, :html => {:multipart => true} do |f| %>
       <p>
         <label>My Avatar</label>
         <%= f.file_field :avatar %>
@@ -181,7 +177,7 @@ like this:
 It might be a good idea to show the user that a file has been uploaded, in the
 case of images, a small thumbnail would be a good indicator:
 
-    <% form_for @user, :html => {:multipart => true} do |f| %>
+    <%= form_for @user, :html => {:multipart => true} do |f| %>
       <p>
         <label>My Avatar</label>
         <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -195,7 +191,7 @@ case of images, a small thumbnail would be a good indicator:
 If you want to remove a previously uploaded file on a mounted uploader, you can
 easily add a checkbox to the form which will remove the file when checked.
 
-    <% form_for @user, :html => {:multipart => true} do |f| %>
+    <%= form_for @user, :html => {:multipart => true} do |f| %>
       <p>
         <label>My Avatar</label>
         <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -215,10 +211,10 @@ If you want to remove the file manually, you can call <code>remove_avatar!</code
 == Uploading files from a remote location
 
 Your users may find it convenient to upload a file from a location on the Internet
-via a URL. CarrierWave makes this simple, just add the appropriate column to your
+via a URL. CarrierWave makes this simple, just add the appropriate attribute to your
 form and you're good to go:
 
-    <% form_for @user, :html => {:multipart => true} do |f| %>
+    <%= form_for @user, :html => {:multipart => true} do |f| %>
       <p>
         <label>My Avatar URL:</label>
         <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -270,6 +266,10 @@ Or alternatively:
       permissions 0777
     end
 
+If you're using Rails, create an initializer for this:
+
+    config/initializers/carrierwave.rb
+
 == Testing CarrierWave
 
 It's a good idea to test you uploaders in isolation. In order to speed up your
@@ -291,6 +291,8 @@ CarrierWave comes with some RSpec matchers which you may find useful:
     require 'carrierwave/test/matchers'
 
     describe MyUploader do
+      include CarrierWave::Test::Matchers
+
       before do
         MyUploader.enable_processing = true
         @uploader = MyUploader.new(@user, :avatar)
@@ -320,12 +322,12 @@ CarrierWave comes with some RSpec matchers which you may find useful:
 
 == Using Amazon S3
 
-Older versions of CarrierWave used the +aws-s3+ and +right_aws+ libraries. The Aws[http://github.com/appoxy/aws]
-is now used meaning european buckets are supported out the box. Ensure you have it installed:
+Older versions of CarrierWave used the +aws+, +aws-s3+, and/or +right_aws+ libraries.
+Now fog[http://github.com/geemus/fog] is now used instead. Ensure you have it installed:
 
-    gem install aws
+    gem install fog
 
-You'll need to configure a bucket, access id and secret key like this:
+You'll need to configure a bucket, access id and secret key like this in an initializer:
 
     CarrierWave.configure do |config|
       config.s3_access_key_id = 'xxxxxx'
@@ -333,9 +335,7 @@ You'll need to configure a bucket, access id and secret key like this:
       config.s3_bucket = 'name_of_bucket'
     end
 
-Do this in an initializer in Rails, and in a +before_app_loads+ block in Merb.
-
-And then in your uploader, set the storage to :s3
+In your uploader, set the storage to :s3
 
     class AvatarUploader < CarrierWave::Uploader::Base
       storage :s3
@@ -344,7 +344,6 @@ And then in your uploader, set the storage to :s3
 That's it! You can still use the <code>CarrierWave::Uploader#url</code> method to return
 the url to the file on Amazon S3.
 
-
 == Using Rackspace Cloud Files
 
 Cloud Files support requires a {Rackspace Cloud}[http://rackspacecloud.com] username and API key.
@@ -362,9 +361,7 @@ of this information.
 
     config.cloud_files_cdn_host = "c000000.cdn.rackspacecloud.com"
 
-Do this in an initializer in Rails, and in a +before_app_loads+ block in Merb.
-
-And then in your uploader, set the storage to :cloud_files
+In your uploader, set the storage to :cloud_files
 
     class AvatarUploader < CarrierWave::Uploader::Base
       storage :cloud_files
@@ -470,7 +467,7 @@ If you are using Paperclip, you can use the provided compatibility module:
       include CarrierWave::Compatibility::Paperclip
     end
 
-See the documentation for <code>Paperclip::Compatibility::Paperclip</code> for more
+See the documentation for <code>CarrierWave::Compatibility::Paperclip</code> for more
 detaills.
 
 Be sure to use mount_on to specify the correct column:
@@ -491,27 +488,6 @@ your translations file:
         integrity: 'Not an image.'
         processing: 'Cannot resize image.'
 
-== Contributors
-
-These people have contributed their time and effort to CarrierWave:
-
-* Jonas Nicklas
-* Pavel Kunc
-* Andrew Timberlake
-* Durran Jordan
-* Scott Motte
-* Sho Fukamachi
-* Sam Lown
-* Dave Ott
-* Quin Hoxie
-* H. Wade Minter
-* Trevor Turk
-* Nicklas Ramhöj
-* Matt Hooks
-* Andreas Haller
-* Lars Pind
-* Ramon Soares
-
 == License
 
 Copyright (c) 2008 Jonas Nicklas
@@ -540,7 +516,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 In order to setup a development environment and run the specs, you'll
 need to install bundler:
 
-    gem install bundler --pre
+    gem install bundler
 
 And then install the dependencies:
 

data/lib/carrierwave.rb

@@ -7,8 +7,6 @@ require 'active_support/concern'
 
 module CarrierWave
 
-  VERSION = "0.4.5"
-
   class << self
     attr_accessor :root
 
@@ -32,6 +30,7 @@ module CarrierWave
   autoload :RMagick, 'carrierwave/processing/rmagick'
   autoload :ImageScience, 'carrierwave/processing/image_science'
   autoload :MiniMagick, 'carrierwave/processing/mini_magick'
+  autoload :VERSION, 'carrierwave/version'
 
   module Storage
     autoload :Abstract, 'carrierwave/storage/abstract'

data/lib/carrierwave/locale/en.yml

@@ -0,0 +1,5 @@
+en:
+  errors:
+    messages:
+      carrierwave_processing_error: failed to be processed
+      carrierwave_integrity_error: is not an allowed file type

data/lib/carrierwave/orm/activerecord.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'active_record'
+require File.expand_path(File.dirname(__FILE__) + "../../validations/active_model")
 
 module CarrierWave
   module ActiveRecord
@@ -18,62 +19,18 @@ module CarrierWave
       public :read_uploader
       public :write_uploader
 
+      include CarrierWave::Validations::ActiveModel
+
       validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
 
       after_save "store_#{column}!"
       before_save "write_#{column}_identifier"
       after_destroy "remove_#{column}!"
-    end
-
-    ##
-    # Makes the record invalid if the file couldn't be uploaded due to an integrity error
-    #
-    # 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(*attrs)
-      options = attrs.last.is_a?(Hash) ? attrs.last : {}
-      validates_each(*attrs) do |record, attr, value|
-        if record.send("#{attr}_integrity_error")
-          message = options[:message] || I18n.t('carrierwave.errors.integrity', :default => 'is not an allowed type of file.')
-          record.errors.add attr, message
-        end
-      end
-    end
 
-    ##
-    # Makes the record invalid if the file couldn't be processed (assuming the process failed
-    # with a CarrierWave::ProcessingError)
-    #
-    # 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(*attrs)
-      options = attrs.last.is_a?(Hash) ? attrs.last : {}
-      validates_each(*attrs) do |record, attr, value|
-        if record.send("#{attr}_processing_error")
-          message = options[:message] || I18n.t('carrierwave.errors.processing', :default => 'failed to be processed.')
-          record.errors.add attr, message
-        end
-      end
     end
 
   end # ActiveRecord
 end # CarrierWave
 
-ActiveRecord::Base.send(:extend, CarrierWave::ActiveRecord)
+ActiveRecord::Base.extend CarrierWave::ActiveRecord

data/lib/carrierwave/orm/mongoid.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'mongoid'
+require File.expand_path(File.dirname(__FILE__) + "../../validations/active_model")
 
 module CarrierWave
   module Mongoid
@@ -10,9 +11,17 @@ module CarrierWave
     def mount_uploader(column, uploader, options={}, &block)
       options[:mount_on] ||= "#{column}_filename"
       field options[:mount_on]
+      
       super
+      
       alias_method :read_uploader, :read_attribute
       alias_method :write_uploader, :write_attribute
+      
+      include CarrierWave::Validations::ActiveModel
+
+      validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+      validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+      
       after_save "store_#{column}!".to_sym
       before_save "write_#{column}_identifier".to_sym
       after_destroy "remove_#{column}!".to_sym
@@ -20,4 +29,4 @@ module CarrierWave
   end # Mongoid
 end # CarrierWave
 
-Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)
+Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)

data/lib/carrierwave/storage/right_s3.rb

@@ -1,3 +1 @@
-
-raise "The right_aws library is no longer supported. Please install the updated 'aws' library with support for Ruby 1.9 and euro buckets"
-
+raise "The right_aws library is no longer supported. Please install the 'fog' gem instead."

data/lib/carrierwave/storage/s3.rb

@@ -1,17 +1,16 @@
 # encoding: utf-8
 begin
-  require 'aws'
+  require 'fog'
 rescue LoadError
-  raise "You don't have the 'aws' gem installed. 'aws-s3' and 'right_aws' are no longer supported."
+  raise "You don't have the 'fog' gem installed. The 'aws', 'aws-s3' and 'right_aws' gems are no longer supported."
 end
 
 module CarrierWave
   module Storage
 
     ##
-    # 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
+    # Uploads things to Amazon S3 using the "fog" gem.
+    # You'll need to specify the access_key_id, secret_access_key and bucket.
     #
     #     CarrierWave.configure do |config|
     #       config.s3_access_key_id = "xxxxxx"
@@ -19,9 +18,6 @@ module CarrierWave
     #       config.s3_bucket = "my_bucket_name"
     #     end
     #
-    # 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|
@@ -51,7 +47,7 @@ module CarrierWave
     #     end
     #
     # Now the resulting url will be
-    #     
+    #
     #     http://bucketname.domain.tld/path/to/file
     #
     # instead of
@@ -87,16 +83,16 @@ module CarrierWave
         # [String] contents of the file
         #
         def read
-          result = connection.get(bucket, @path)
-          @headers = result[:headers]
-          result[:object]
+          result = connection.get_object(bucket, @path)
+          @headers = result.headers
+          result.body
         end
 
         ##
         # Remove the file from Amazon S3
         #
         def delete
-          connection.delete(bucket, @path)
+          connection.delete_object(bucket, @path)
         end
 
         ##
@@ -116,10 +112,10 @@ module CarrierWave
 
         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,
+          connection.put_object(bucket, @path, file.read,
             {
               'x-amz-acl' => access_policy,
-              'content-type' => content_type
+              'Content-Type' => content_type
             }.merge(@uploader.s3_headers)
           )
         end
@@ -127,7 +123,7 @@ module CarrierWave
         # 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_policy.blank?
             if !@uploader.s3_access.blank?
               @access_policy = @uploader.s3_access.to_s.gsub(/_/, '-')
             else
@@ -139,20 +135,24 @@ module CarrierWave
         end
 
         def content_type
-          headers["content-type"]
+          headers["Content-Type"]
         end
 
         def content_type=(type)
-          headers["content-type"] = type
+          headers["Content-Type"] = type
+        end
+
+        def size
+         	headers['content-length'].to_i
         end
 
         # Headers returned from file retrieval
         def headers
-          @headers ||= {}
+          @headers ||= connection.head(bucket, @path)
         end
- 
+
       private
-    
+
         def bucket
           @uploader.s3_bucket
         end
@@ -172,7 +172,7 @@ module CarrierWave
       #
       # === Returns
       #
-      # [CarrierWave::Storage::RightS3::File] the stored file
+      # [CarrierWave::Storage::S3::File] the stored file
       #
       def store!(file)
         f = CarrierWave::Storage::S3::File.new(uploader, self, uploader.store_path)
@@ -188,16 +188,16 @@ module CarrierWave
       #
       # === Returns
       #
-      # [CarrierWave::Storage::RightS3::File] the stored file
+      # [CarrierWave::Storage::S3::File] the stored file
       #
       def retrieve!(identifier)
         CarrierWave::Storage::S3::File.new(uploader, self, uploader.store_path(identifier))
       end
 
       def connection
-        @connection ||= Aws::S3Interface.new(
-          uploader.s3_access_key_id, uploader.s3_secret_access_key,
-          :multi_thread => uploader.s3_multi_thread
+        @connection ||= Fog::AWS::S3.new(
+          :aws_access_key_id => uploader.s3_access_key_id,
+          :aws_secret_access_key => uploader.s3_secret_access_key
         )
       end
 

data/lib/carrierwave/uploader/cache.rb

@@ -87,7 +87,7 @@ module CarrierWave
       #
       def cache!(new_file)
         new_file = CarrierWave::SanitizedFile.new(new_file)
-        raise CarrierWave::FormNotMultipart if new_file.is_path?
+        raise CarrierWave::FormNotMultipart if new_file.is_path? && ensure_multipart_form
 
         unless new_file.empty?
           with_callbacks(:cache, new_file) do

data/lib/carrierwave/uploader/configuration.rb

@@ -8,14 +8,13 @@ module CarrierWave
         add_config :root
         add_config :permissions
         add_config :storage_engines
-        add_config :s3_access # for old aws/s3
-        add_config :s3_access_policy # for aws
+        add_config :s3_access # for old s3 support
+        add_config :s3_access_policy # for new s3 support
         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
@@ -29,7 +28,8 @@ module CarrierWave
         add_config :store_dir
         add_config :cache_dir
         add_config :enable_processing
-
+        add_config :ensure_multipart_form
+        
         # Mounting
         add_config :ignore_integrity_errors
         add_config :ignore_processing_errors
@@ -47,10 +47,7 @@ module CarrierWave
             :cloud_files => "CarrierWave::Storage::CloudFiles"
           }
           config.storage = :file
-          #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_port = 27017
@@ -62,6 +59,7 @@ module CarrierWave
           config.validate_processing = true
           config.root = CarrierWave.root
           config.enable_processing = true
+          config.ensure_multipart_form = true
         end
       end
 

data/lib/carrierwave/uploader/download.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'net/http'
+require 'open-uri'
 
 module CarrierWave
   module Uploader
@@ -13,7 +13,7 @@ module CarrierWave
 
       class RemoteFile
         def initialize(uri)
-          @uri = URI.parse(uri)
+          @uri = URI.parse(URI.escape(uri))
         end
 
         def original_filename
@@ -31,7 +31,11 @@ module CarrierWave
       private
 
         def file
-          @file ||= StringIO.new(Net::HTTP.get_response(@uri).body)
+          if @file.blank?
+            @file = Kernel.open(@uri.to_s)
+            @file = @file.is_a?(String) ? StringIO.new(@file) : @file
+          end
+          @file
         end
 
         def method_missing(*args, &block)

data/lib/carrierwave/validations/active_model.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+
+require 'active_model/validator'
+require 'active_support/concern'
+
+
+module CarrierWave
+
+  # == Active Model Presence Validator
+  module Validations
+    module ActiveModel
+      extend ActiveSupport::Concern
+
+      class ProcessingValidator < ::ActiveModel::EachValidator
+
+        def validate_each(record, attribute, value)
+          if record.send("#{attribute}_processing_error")
+            record.errors.add(attribute, :carrierwave_processing_error)
+          end
+        end
+      end
+
+      class IntegrityValidator < ::ActiveModel::EachValidator
+
+        def validate_each(record, attribute, value)
+          if record.send("#{attribute}_integrity_error")
+            record.errors.add(attribute, :carrierwave_integrity_error)
+          end
+        end
+      end
+
+      module HelperMethods
+
+        ##
+        # Makes the record invalid if the file couldn't be uploaded due to an integrity error
+        #
+        # 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
+
+        ##
+        # Makes the record invalid if the file couldn't be processed (assuming the process failed
+        # with a CarrierWave::ProcessingError)
+        #
+        # 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
+      end
+
+      included do
+        extend HelperMethods
+        include HelperMethods
+      end
+    end
+  end
+end
+
+I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')
+

data/lib/carrierwave/version.rb

@@ -0,0 +1,3 @@
+module CarrierWave
+  VERSION = "0.5.0"
+end

data/lib/generators/templates/uploader.rb

@@ -2,46 +2,46 @@
 
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
-  # Include RMagick or ImageScience support
-  #     include CarrierWave::RMagick
-  #     include CarrierWave::ImageScience
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::ImageScience
 
-  # Choose what kind of storage to use for this uploader
+  # Choose what kind of storage to use for this uploader:
   storage :file
-  #     storage :s3
+  # storage :s3
 
-  # Override the directory where uploaded files will be stored
+  # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded
-  #     def default_url
-  #       "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  #     end
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
 
-  # Process files as they are uploaded.
-  #     process :scale => [200, 300]
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
   #
-  #     def scale(width, height)
-  #       # do something
-  #     end
-
-  # Create different versions of your uploaded files
-  #     version :thumb do
-  #       process :scale => [50, 50]
-  #     end
-
-  # Add a white list of extensions which are allowed to be uploaded,
-  # for images you might use something like this:
-  #     def extension_white_list
-  #       %w(jpg jpeg gif png)
-  #     end
-
-  # Override the filename of the uploaded files
-  #     def filename
-  #       "something.jpg" if original_filename
-  #     end
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  # def extension_white_list
+  #   %w(jpg jpeg gif png)
+  # end
+
+  # Override the filename of the uploaded files:
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
 
 end

data/lib/generators/uploader_generator.rb

@@ -1,13 +1,7 @@
-require 'rails/generators'
-require 'rails/generators/named_base'
-
 class UploaderGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+
   def create_uploader_file
-    template 'uploader.rb', File.join('app/uploaders', class_path, "#{file_name}.rb")
+    template "uploader.rb", "app/uploaders/#{file_name}_uploader.rb"
   end
-  
-  def self.source_root
-    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-  end
-end
-
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 5
   - 0
-  - beta2
-  version: 0.5.0.beta2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,16 +23,260 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: fog
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 30
+        version: 0.2.30
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: dm-sqlite-adapter
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: RubyInline
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: image_science
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: mini_magick
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id019
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -45,6 +288,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/carrierwave/compatibility/paperclip.rb
+- lib/carrierwave/locale/en.yml
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
@@ -75,6 +319,8 @@ files:
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
 - lib/carrierwave/uploader.rb
+- lib/carrierwave/validations/active_model.rb
+- lib/carrierwave/version.rb
 - lib/carrierwave.rb
 - lib/generators/templates/uploader.rb
 - lib/generators/uploader_generator.rb
@@ -100,13 +346,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: carrierwave