carrierwave 0.4.3 → 0.4.4

data/History.txt

@@ -1,3 +1,25 @@
+=== Version 0.4.5 2010-02-20
+
+* [added] Support for Rackspace Cloudfiles
+* [added] GridFS now accepts a port
+* [fixed] s3_headers is now properly initialized
+* [fixed] work around DataMapper's patching of core method
+
+=== Version 0.4.4 2010-01-31
+
+* [added] Support for downloading remote files
+* [added] CarrierWave.clean_cached_files! to remove old cached files
+* [added] Option to set headers for S3
+* [added] GridStore now has authentication
+* [fixed] Rmagick convert method now does what it says 
+* [fixed] Content type is stored on GridStore and Amazon S3
+* [fixed] Metadata is no longer broken for S3
+
+=== Version 0.4.3 2009-12-19
+
+* [fixed] cnamed URLs on S3 no longer have a third slash after http
+* [fixed] fixed deprecation warnings on Rails 2.3.5
+
 === Version 0.4.2 2009-11-26
 
 * [added] RightAWS as an alternative S3 implementation

data/Manifest.txt

@@ -5,6 +5,7 @@ README.rdoc
 Rakefile
 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
@@ -17,6 +18,7 @@ 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
@@ -54,6 +56,7 @@ lib/carrierwave/uploader/cache.rb
 lib/carrierwave/uploader/callbacks.rb
 lib/carrierwave/uploader/configuration.rb
 lib/carrierwave/uploader/default_url.rb
+lib/carrierwave/uploader/download.rb
 lib/carrierwave/uploader/extension_whitelist.rb
 lib/carrierwave/uploader/mountable.rb
 lib/carrierwave/uploader/processing.rb
@@ -92,6 +95,7 @@ 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

data/README.rdoc

@@ -13,6 +13,7 @@ upload files.
 * 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]
 
 == Getting Started
 
@@ -20,8 +21,6 @@ Install the latest stable release:
 
     [sudo] gem install carrierwave
 
-CarrierWave is hosted *only* on {Gemcutter}[http://gemcutter.org] as of version 0.4.0.
-
 In Merb, add it as a dependency to your config/dependencies.rb:
 
     dependency 'carrierwave'
@@ -183,12 +182,48 @@ case of images, a small thumbnail would be a good indicator:
     <% form_for @user do |f| %>
       <p>
         <label>My Avatar</label>
-        <%= image_tag(@user.avatar.url) if @user.avatar %>
+        <%= image_tag(@user.avatar_url) if @user.avatar? %>
         <%= f.file_field :avatar %>
         <%= f.hidden_field :avatar_cache %>
       </p>
     <% end %>
 
+== Removing uploaded files
+
+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 do |f| %>
+      <p>
+        <label>My Avatar</label>
+        <%= image_tag(@user.avatar_url) if @user.avatar? %>
+        <%= f.file_field :avatar %>
+      </p>
+
+      <p>
+        <label>
+          <%= f.check_box :remove_avatar %>
+          Remove avatar
+        </label>
+      </p>
+    <% end %>
+
+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
+form and you're good to go:
+
+    <% form_for @user do |f| %>
+      <p>
+        <label>My Avatar URL:</label>
+        <%= image_tag(@user.avatar_url) if @user.avatar? %>
+        <%= f.text_field :remote_avatar_url %>
+      </p>
+    <% end %>
+
 == Providing a default URL
 
 In many cases, especially when working with images, it might be a good idea to
@@ -224,7 +259,7 @@ tests, it's recommended to switch off processing in your tests, and to use the
 file storage. In Rails you could do that by adding an initializer with:
 
     if Rails.env.test?
-      Carrierwave.configure do |config|
+      CarrierWave.configure do |config|
         config.storage = :file
         config.enable_processing = false
       end
@@ -283,7 +318,7 @@ And then in your uploader, set the storage to :s3
       storage :s3
     end
 
-That's it! You can still use the +CarrierWave::Uploader#url+ method to return
+That's it! You can still use the <code>CarrierWave::Uploader#url</code> method to return
 the url to the file on Amazon S3.
 
 Alternatively, and especially if your bucket is located in Europe, you can use the
@@ -308,7 +343,7 @@ You'll need to configure the database and host to use:
 
 The defaults are 'carrierwave' and 'localhost'.
 
-And then in your uploader, set the storage to +:grid_fs+:
+And then in your uploader, set the storage to <code>:grid_fs</code>:
 
     class AvatarUploader < CarrierWave::Uploader::Base
       storage :grid_fs
@@ -335,7 +370,7 @@ include it in your Uploader:
     end
 
 The RMagick module gives you a few methods, like
-+CarrierWave::RMagick#resize_to_fill+ which manipulate the image file in some
+<code>CarrierWave::RMagick#resize_to_fill</code> which manipulate the image file in some
 way. You can set a +process+ callback, which will call that method any time a
 file is uploaded.
 
@@ -394,7 +429,7 @@ If you are using Paperclip, you can use the provided compatibility module:
       include CarrierWave::Compatibility::Paperclip
     end
 
-See the documentation for +Paperclip::Compatibility::Paperclip+ for more
+See the documentation for <code>Paperclip::Compatibility::Paperclip</code> for more
 detaills.
 
 Be sure to use mount_on to specify the correct column:

data/Rakefile

@@ -26,8 +26,9 @@ $hoe = Hoe.spec 'carrierwave' do
   self.extra_dev_deps << ['rmagick', '>=2.10.0']
   self.extra_dev_deps << ['mini_magick', '>=1.2.5']
   self.extra_dev_deps << ['mongo_mapper', '>=0.6.8']
-  self.extra_dev_deps << ['mongoid', '>=0.9.9']
+  self.extra_dev_deps << ['mongoid', '>=0.10.4']
   self.extra_dev_deps << ['aws-s3', '>=0.6.2']
+  self.extra_dev_deps << ['timecop', '>=0.3.4']
   self.extra_rdoc_files << 'README.rdoc'
 end
 

data/features/download.feature

@@ -0,0 +1,20 @@
+Feature: downloading files 
+  In order to allow users to upload remote files
+  As a developer using CarrierWave
+  I want to download files to the filesystem via HTTP
+  
+  Background:
+    Given an uploader class that uses the 'file' storage
+    And an instance of that class
+  
+  Scenario: download a file
+    When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
+    Then there should be a file called 'testfile.txt' somewhere in a subdirectory of 'public/uploads/tmp'
+    And the file called 'testfile.txt' in a subdirectory of 'public/uploads/tmp' should contain 'S3 Remote File'
+  
+  Scenario: downloading a file then storing
+    When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
+    And I store the file
+    Then there should be a file at 'public/uploads/testfile.txt'
+    And the file at 'public/uploads/testfile.txt' should contain 'S3 Remote File'
+

data/features/step_definitions/download_steps.rb

@@ -0,0 +1,4 @@
+When /^I download the file '([^']+)'/ do |url|
+  @uploader.download!(url)
+end
+

data/features/step_definitions/file_steps.rb

@@ -34,9 +34,20 @@ Then /^the file called '(.*?)' in a subdirectory of '(.*?)' should not be identi
   File.read(Dir.glob(File.join(file_path(directory), '**', file)).first).should_not == File.read(file_path(other))
 end
 
+###
+# CONTENT
+
+Then /^the file called '([^']+)' in a subdirectory of '([^']+)' should contain '([^']+)'$/ do |file, directory, content|
+  File.read(Dir.glob(File.join(file_path(directory), '**', file)).first).should include(content)
+end
+
+Then /^the file at '([^']+)' should contain '([^']+)'$/ do |path, content|
+  File.read(file_path(path)).should include(content)
+end
+
 ###
 # REVERSING
 
 Then /^the file at '(.*?)' should be the reverse of the file at '(.*?)'$/ do |one, two|
   File.read(file_path(one)).should == File.read(file_path(two)).reverse
-end
+end

data/lib/carrierwave.rb

@@ -7,7 +7,7 @@ require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
 
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 
   class << self
     attr_accessor :root
@@ -15,12 +15,17 @@ module CarrierWave
     def configure(&block)
       CarrierWave::Uploader::Base.configure(&block)
     end
+
+    def clean_cached_files!
+      CarrierWave::Uploader::Base.clean_cached_files!
+    end
   end
 
   class UploadError < StandardError; end
   class IntegrityError < UploadError; end
   class InvalidParameter < UploadError; end
   class ProcessingError < UploadError; end
+  class DownloadError < UploadError; end
 
   autoload :SanitizedFile, 'carrierwave/sanitized_file'
   autoload :Mount, 'carrierwave/mount'
@@ -40,6 +45,7 @@ module CarrierWave
     autoload :Base, 'carrierwave/uploader'
     autoload :Cache, 'carrierwave/uploader/cache'
     autoload :Store, 'carrierwave/uploader/store'
+    autoload :Download, 'carrierwave/uploader/download'
     autoload :Callbacks, 'carrierwave/uploader/callbacks'
     autoload :Processing, 'carrierwave/uploader/processing'
     autoload :Versions, 'carrierwave/uploader/versions'

data/lib/carrierwave/mount.rb

@@ -85,6 +85,9 @@ module CarrierWave
     # [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
+    # [remote_image_url=]       Retrieve the file from the remote url
+    #
     # [remove_image]            An attribute reader that can be used with a checkbox to mark a file for removal
     # [remove_image=]           An attribute writer that can be used with a checkbox to mark a file for removal
     # [remove_image?]           Whether the file should be removed when store_image! is called.
@@ -92,7 +95,7 @@ module CarrierWave
     # [store_image!]            Stores a file that has been assigned with +image=+
     # [remove_image!]           Removes the uploaded file from the filesystem.
     #
-    # [image_integrity_error]   Returns an error object if the last file to be assigned caused an integrty error
+    # [image_integrity_error]   Returns an error object if the last file to be assigned caused an integrity error
     # [image_processing_error]  Returns an error object if the last file to be assigned caused a processing error
     #
     # [write_image_identifier]  Uses the write_uploader method to set the identifier.
@@ -185,6 +188,14 @@ module CarrierWave
           _mounter(:#{column}).cache_name = cache_name
         end
 
+        def remote_#{column}_url
+          _mounter(:#{column}).remote_url
+        end
+
+        def remote_#{column}_url=(url)
+          _mounter(:#{column}).remote_url = url
+        end
+
         def remove_#{column}
           _mounter(:#{column}).remove
         end
@@ -248,7 +259,7 @@ module CarrierWave
     # we don't pollute the model with a lot of methods.
     class Mounter #:nodoc:
 
-      attr_reader :column, :record, :integrity_error, :processing_error
+      attr_reader :column, :record, :remote_url, :integrity_error, :processing_error
       attr_accessor :remove
 
       def initialize(record, column, options={})
@@ -299,6 +310,13 @@ module CarrierWave
       rescue CarrierWave::InvalidParameter
       end
 
+      def remote_url=(url)
+        unless uploader.cached?
+          @remote_url = url
+          uploader.download!(url) 
+        end
+      end
+
       def store!
         unless uploader.blank?
           if remove?

data/lib/carrierwave/orm/mongoid.rb

@@ -20,4 +20,4 @@ module CarrierWave
   end # Mongoid
 end # CarrierWave
 
-Mongoid::Document.send(:extend, CarrierWave::Mongoid)
+Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)

data/lib/carrierwave/processing/rmagick.rb

@@ -76,7 +76,7 @@ module CarrierWave
 
     module ClassMethods
       def convert(format)
-        process :resize_to_limit => format
+        process :convert => format
       end
 
       def resize_to_limit(width, height)
@@ -91,10 +91,6 @@ module CarrierWave
         process :resize_to_fill => [width, height]
       end
 
-      def resize_and_pad(width, height)
-        process :resize_to_fit => [width, height]
-      end
-
       def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
         process :resize_and_pad => [width, height, background, gravity]
       end
@@ -118,11 +114,7 @@ module CarrierWave
     #     image.convert(:png)
     #
     def convert(format)
-      manipulate! do |img|
-        img.format = format.to_s.upcase
-        img = yield(img) if block_given?
-        img
-      end
+      manipulate!(:format => format)
     end
 
     ##
@@ -255,21 +247,27 @@ module CarrierWave
     #
     # [CarrierWave::ProcessingError] if manipulation failed.
     #
-    def manipulate!
+    def manipulate!(options={})
       image = ::Magick::Image.read(current_path)
 
-      if image.size > 1
+      frames = if image.size > 1
         list = ::Magick::ImageList.new
         image.each do |frame|
           list << yield( frame )
         end
-        list.write(current_path)
-        destroy_image(list)
+        list
       else
         frame = image.first
-        yield( frame ).write(current_path)
-        destroy_image(frame)
+        frame = yield( frame ) if block_given?
+        frame
+      end
+
+      if options[:format]
+        frames.write("#{options[:format]}:#{current_path}")
+      else
+        frames.write(current_path)
       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}")
     end

data/lib/carrierwave/storage/grid_fs.rb

@@ -38,6 +38,10 @@ module CarrierWave
           ::GridFS::GridStore.unlink(@database, @path)
         end
 
+        def content_type
+          ::GridFS::GridStore.open(@database, @path, 'r') { |f| return f.content_type }
+        end
+
       end
 
       ##
@@ -52,7 +56,7 @@ module CarrierWave
       # [CarrierWave::SanitizedFile] a sanitized file
       #
       def store!(file)
-        ::GridFS::GridStore.open(database, uploader.store_path, 'w') do |f|
+        ::GridFS::GridStore.open(database, uploader.store_path, 'w', :content_type => file.content_type) do |f|
           f.write file.read
         end
         CarrierWave::Storage::GridFS::File.new(uploader, database, uploader.store_path)
@@ -79,7 +83,11 @@ module CarrierWave
         @connection ||= begin
           host = uploader.grid_fs_host
           database = uploader.grid_fs_database
-          Mongo::Connection.new(host).db(database)
+          username = uploader.grid_fs_username
+          password = uploader.grid_fs_password
+          db = Mongo::Connection.new(host).db(database)
+          db.authenticate(username, password) if username && password
+          db
         end
       end
 

data/lib/carrierwave/storage/right_s3.rb

@@ -73,7 +73,7 @@ module CarrierWave
         #
         def read
           result = connection.get(bucket, @path)
-          headers["content-type"] = result[:headers]["content-type"]
+          @headers = result[:headers]
           result[:object]
         end
 
@@ -99,47 +99,34 @@ module CarrierWave
           end
         end
 
-        #def about
-        #  s3_object.about
-        #end
-
-        #def metadata
-        #  s3_object.metadata
-        #end
-
         def content_type
           headers["content-type"]
         end
 
-        def content_type=(new_content_type)
-          headers["content-type"] = new_content_type
-        end
-
         #def content_disposition
         #  s3_object.content_disposition
         #end
 
-        #def content_disposition=(new_disposition)
-        #  s3_object.content_disposition = new_disposition
-        #end
-
-        def store(data)
-          connection.put(bucket, @path, data, headers)
+        def store(file)
+          connection.put(bucket, @path, file.read,
+            'x-amz-acl' => @uploader.s3_access_policy,
+            'content-type' => file.content_type
+          )
         end
 
-        private
-
-          def headers
-            @headers ||= { 'x-amz-acl' => @uploader.s3_access_policy }
-          end
+      private
+      
+        def headers
+          @headers ||= {}
+        end
 
-          def bucket
-            @uploader.s3_bucket
-          end
+        def bucket
+          @uploader.s3_bucket
+        end
 
-          def connection
-            @base.connection
-          end
+        def connection
+          @base.connection
+        end
 
       end
 
@@ -156,7 +143,7 @@ module CarrierWave
       #
       def store!(file)
         f = CarrierWave::Storage::RightS3::File.new(uploader, self, uploader.store_path)
-        f.store(file.read)
+        f.store(file)
         f
       end
 

data/lib/carrierwave/storage/s3.rb

@@ -7,7 +7,7 @@ module CarrierWave
     ##
     # 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
+    # and bucket:
     #
     #     CarrierWave.configure do |config|
     #       config.s3_access_key_id = "xxxxxx"
@@ -34,6 +34,20 @@ module CarrierWave
     #
     # 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|
@@ -131,7 +145,7 @@ module CarrierWave
         end
 
         def s3_object
-          @s3_object ||= AWS::S3::S3Object.find(@path, bucket)
+          @s3_object ||= AWS::S3::S3Object.find(@path, @uploader.s3_bucket)
         end
 
       end
@@ -149,7 +163,9 @@ module CarrierWave
       #
       def store!(file)
         connect!(uploader)
-        AWS::S3::S3Object.store(uploader.store_path, file.read, uploader.s3_bucket, :access => uploader.s3_access)
+        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)
       end
 

data/lib/carrierwave/uploader.rb

@@ -31,6 +31,7 @@ module CarrierWave
       use CarrierWave::Uploader::Mountable
       use CarrierWave::Uploader::Cache
       use CarrierWave::Uploader::Store
+      use CarrierWave::Uploader::Download
       use CarrierWave::Uploader::Remove
       use CarrierWave::Uploader::ExtensionWhitelist
       use CarrierWave::Uploader::Processing

data/lib/carrierwave/uploader/cache.rb

@@ -25,6 +25,32 @@ module CarrierWave
       depends_on CarrierWave::Uploader::Callbacks
       depends_on CarrierWave::Uploader::Configuration
 
+      module ClassMethods
+
+        ##
+        # Removes cached files which are older than one day. You could call this method
+        # from a rake task to clean out old cached files.
+        #
+        # You can call this method directly on the module like this:
+        #
+        #   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 keen cache files in one place only.
+        #
+        def clean_cached_files!
+          Dir.glob(File.expand_path(File.join(cache_dir, '*'), CarrierWave.root)).each do |dir|
+            time = dir.scan(/(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})/).first.map { |t| t.to_i }
+            time = Time.utc(*time)
+            if time < (Time.now - (60*60*24))
+              FileUtils.rm_rf(dir)
+            end
+          end
+        end
+      end
+
       ##
       # Returns true if the uploader has been cached
       #
@@ -116,4 +142,4 @@ module CarrierWave
 
     end # Cache
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/configuration.rb

@@ -14,6 +14,8 @@ module CarrierWave
         add_config :s3_cnamed
         add_config :grid_fs_database
         add_config :grid_fs_host
+        add_config :grid_fs_username
+        add_config :grid_fs_password
         add_config :grid_fs_access_url
         add_config :store_dir
         add_config :cache_dir

data/lib/carrierwave/uploader/download.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+require 'net/http'
+
+module CarrierWave
+  module Uploader
+    module Download
+
+      depends_on CarrierWave::Uploader::Callbacks
+      depends_on CarrierWave::Uploader::Configuration
+      depends_on CarrierWave::Uploader::Cache
+
+      class RemoteFile
+        def initialize(uri)
+          @uri = URI.parse(uri)
+        end
+
+        def original_filename
+          File.basename(@uri.path)
+        end
+
+        def respond_to?(*args)
+          super or file.respond_to?(*args)
+        end
+
+        def http?
+          @uri.scheme =~ /^https?$/
+        end
+
+      private
+
+        def file
+          @file ||= StringIO.new(Net::HTTP.get_response(@uri).body)
+        end
+
+        def method_missing(*args, &block)
+          file.send(*args, &block)
+        end
+      end
+
+      ##
+      # Caches the file by downloading it from the given URL.
+      #
+      # === Parameters
+      #
+      # [url (String)] The URL where the remote file is stored
+      #
+      def download!(uri)
+        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) 
+        end
+      end
+
+    end # Download
+  end # Uploader
+end # CarrierWave
+

data/spec/mount_spec.rb

@@ -215,6 +215,52 @@ describe CarrierWave::Mount do
       end
     end
 
+    describe '#remote_image_url' do
+      before do
+        response = mock('HTTP Response')
+        response.stub!(:body).and_return('Response Body')
+        Net::HTTP.stub!(:get_response).and_return(response)
+      end
+
+      it "should return nil" do
+        @instance.remote_image_url.should be_nil
+      end
+
+      it "should return previously cached URL" do
+        @instance.remote_image_url = 'http://www.example.com/funky/monkey.png'
+        @instance.remote_image_url.should == 'http://www.example.com/funky/monkey.png'
+      end
+    end
+
+    describe '#remote_image_url=' do
+      before do
+        response = mock('HTTP Response')
+        response.stub!(:body).and_return('Response Body')
+        Net::HTTP.stub!(:get_response).and_return(response)
+      end
+
+      it "should do nothing when nil is assigned" do
+        @instance.remote_image_url = nil
+        @instance.image.should be_blank
+      end
+
+      it "should do nothing when an empty string is assigned" do
+        @instance.remote_image_url = ''
+        @instance.image.should be_blank
+      end
+
+      it "retrieve from cache when a cache name is assigned" do
+        @instance.remote_image_url = 'http://www.example.com/funky/monkey.png'
+        @instance.image.current_path.should =~ /monkey.png$/
+      end
+
+      it "should not write over a previously assigned file" do
+        @instance.image = stub_file('test.jpg')
+        @instance.remote_image_url = '19990512-1202-123-1234/monkey.jpg'
+        @instance.image.current_path.should =~ /test.jpg$/
+      end
+    end
+
     describe '#store_image!' do
 
       before do
@@ -489,4 +535,4 @@ describe CarrierWave::Mount do
     end
   end
 
-end
+end

data/spec/orm/mongoid_spec.rb

@@ -10,12 +10,13 @@ describe CarrierWave::Mongoid do
 
   before do
     uploader = Class.new(CarrierWave::Uploader::Base)
-
-    @class = Mongoid::Document
+    
+    @class = Class.new
     @class.class_eval do
+      include Mongoid::Document
       mount_uploader :image, uploader
     end
-
+    
     @uploader = uploader
   end
 

data/spec/processing/rmagick_spec.rb

@@ -17,6 +17,13 @@ describe CarrierWave::RMagick do
     FileUtils.rm(file_path('landscape_copy.jpg'))
   end
 
+  describe '#convert' do
+    it "should convert the image to the given format" do
+      # TODO: find some way to spec this
+      @instance.convert(:png)
+    end
+  end
+
   describe '#resize_to_fill' do
     it "should resize the image to exactly the given dimensions" do
       @instance.resize_to_fill(200, 200)

data/spec/spec_helper.rb

@@ -19,6 +19,8 @@ require 'spec'
 require 'spec/autorun'
 
 require 'carrierwave'
+require 'timecop'
+require 'time'
 
 require 'logger'
 
@@ -94,4 +96,4 @@ Spec::Runner.configure do |config|
   config.include CarrierWave::Test::Matchers
   config.include CarrierWave::Test::MockFiles
   config.include CarrierWave::Test::MockStorage
-end
+end

data/spec/storage/grid_fs_spec.rb

@@ -10,9 +10,11 @@ describe CarrierWave::Storage::GridFS do
     @uploader.stub!(:grid_fs_database).and_return("carrierwave_test")
     @uploader.stub!(:grid_fs_host).and_return("localhost")
     @uploader.stub!(:grid_fs_access_url).and_return(nil)
+    @uploader.stub!(:grid_fs_username).and_return(nil)
+    @uploader.stub!(:grid_fs_password).and_return(nil)
 
     @storage = CarrierWave::Storage::GridFS.new(@uploader)
-    @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+    @file = stub_tempfile('test.jpg', 'application/xml')
   end
   
   after do
@@ -41,6 +43,10 @@ describe CarrierWave::Storage::GridFS do
       @grid_fs_file.delete
       GridFS::GridStore.read(@database, 'uploads/bar.txt').should == ''
     end
+    
+    it "should store the content type on GridFS" do
+      @grid_fs_file.content_type.should == 'application/xml'
+    end
   end
   
   describe '#retrieve!' do

data/spec/storage/s3_spec.rb

@@ -2,6 +2,7 @@
 
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'aws/s3'
+require 'net/http'
 
 if ENV['S3_SPEC']
   describe CarrierWave::Storage::S3 do
@@ -12,13 +13,14 @@ if ENV['S3_SPEC']
       @uploader.stub!(:s3_bucket).and_return(ENV['CARRIERWAVE_TEST_BUCKET'])
       @uploader.stub!(:s3_access).and_return(:public_read)
       @uploader.stub!(:s3_cnamed).and_return(false)
+      @uploader.stub!(:s3_headers).and_return({'Expires' => 'Fri, 21 Jan 2021 16:51:06 GMT'})
 
       @storage = CarrierWave::Storage::S3.new(@uploader)
-      @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+      @file = stub_tempfile('test.jpg', 'application/xml')
     end
   
     after do
-      AWS::S3::S3Object.delete('uploads/bar.txt', 'carrierwave_test')
+      AWS::S3::S3Object.delete('uploads/bar.txt', @uploader.s3_bucket)
     end
 
     describe '#store!' do
@@ -28,7 +30,7 @@ if ENV['S3_SPEC']
       end
     
       it "should upload the file to s3" do
-        AWS::S3::S3Object.value('uploads/bar.txt', 'carrierwave_test').should == 'this is stuff'
+        AWS::S3::S3Object.value('uploads/bar.txt', @uploader.s3_bucket).should == 'this is stuff'
       end
     
       it "should have a path" do
@@ -36,7 +38,7 @@ if ENV['S3_SPEC']
       end
     
       it "should have an Amazon URL" do
-        @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
+        @s3_file.url.should == "http://s3.amazonaws.com/#{@uploader.s3_bucket}/uploads/bar.txt"
       end
       
       context "with cnamed bucket" do
@@ -49,13 +51,23 @@ if ENV['S3_SPEC']
     
       it "should be deletable" do
         @s3_file.delete
-        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+        AWS::S3::S3Object.exists?('uploads/bar.txt', @uploader.s3_bucket).should be_false
+      end
+      
+      it "should store the content type on S3" do
+        @s3_file.content_type.should == 'application/xml'
+      end
+
+      it "should set headers" do
+        client = Net::HTTP.new("s3.amazonaws.com")
+        headers = client.request_head(URI.parse(@s3_file.url).path)
+        headers['Expires'].should == 'Fri, 21 Jan 2021 16:51:06 GMT'
       end
     end
   
     describe '#retrieve!' do
       before do
-        AWS::S3::S3Object.store('uploads/bar.txt', "A test, 1234", 'carrierwave_test')
+        AWS::S3::S3Object.store('uploads/bar.txt', "A test, 1234", @uploader.s3_bucket)
   
         @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
         @s3_file = @storage.retrieve!('bar.txt')
@@ -70,12 +82,12 @@ if ENV['S3_SPEC']
       end
     
       it "should have an Amazon URL" do
-        @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
+        @s3_file.url.should == "http://s3.amazonaws.com/#{@uploader.s3_bucket}/uploads/bar.txt"
       end
     
       it "should be deletable" do
         @s3_file.delete
-        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+        AWS::S3::S3Object.exists?('uploads/bar.txt', @uploader.s3_bucket).should be_false
       end
     end
 

data/spec/uploader/cache_spec.rb

@@ -13,6 +13,31 @@ describe CarrierWave::Uploader do
     FileUtils.rm_rf(public_path)
   end
 
+  describe '.clean_cached_files!' do
+    before do
+      @cache_dir = File.expand_path(@uploader_class.cache_dir, CarrierWave.root)
+      FileUtils.mkdir_p File.expand_path('20071201-1234-234-2213', @cache_dir)
+      FileUtils.mkdir_p File.expand_path('20071203-1234-234-2213', @cache_dir)
+      FileUtils.mkdir_p File.expand_path('20071205-1234-234-2213', @cache_dir)
+    end
+
+    after { FileUtils.rm_rf(@cache_dir) }
+
+    it "should clear all files older than 24 hours in the default cache directory" do
+      Timecop.freeze(Time.parse('2007-12-06 10:12')) do
+        @uploader_class.clean_cached_files!
+      end
+      Dir.glob("#{@cache_dir}/*").should have(1).element
+    end
+
+    it "should be aliased on the CarrierWave module" do
+      Timecop.freeze(Time.parse('2007-12-06 10:12')) do
+        CarrierWave.clean_cached_files!
+      end
+      Dir.glob("#{@cache_dir}/*").should have(1).element
+    end
+  end
+
   describe '#cache_dir' do
     it "should default to the config option" do
       @uploader.cache_dir.should == 'uploads/tmp'
@@ -181,4 +206,4 @@ describe CarrierWave::Uploader do
     end
   end
 
-end
+end

data/spec/uploader/download_spec.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CarrierWave::Uploader::Download do
+
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+    @uploader = @uploader_class.new
+  end
+  
+  after do
+    FileUtils.rm_rf(public_path)
+  end
+
+  describe '#download!' do
+
+    before do
+      CarrierWave.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
+      response = mock('HTTP Response')
+      response.stub!(:body).and_return('Response Body')
+      Net::HTTP.stub!(:get_response).and_return(response)
+    end
+
+    it "should cache a file" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.file.should be_an_instance_of(CarrierWave::SanitizedFile)
+    end
+
+    it "should be cached" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.should be_cached
+    end
+
+    it "should store the cache name" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.cache_name.should == '20071201-1234-345-2255/file.png'
+    end
+
+    it "should set the filename to the file's sanitized filename" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.filename.should == 'file.png'
+    end
+
+    it "should move it to the tmp dir" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.file.path.should == public_path('uploads/tmp/20071201-1234-345-2255/file.png')
+      @uploader.file.exists?.should be_true
+    end
+
+    it "should set the url" do
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/file.png'
+    end
+
+    it "should do nothing when trying to download an empty file" do
+      @uploader.download!(nil)
+    end
+
+    it "should set permissions if options are given" do
+      @uploader_class.permissions = 0777
+
+      @uploader.download!('http://www.example.com/test/file.png')
+      @uploader.should have_permissions(0777)
+    end
+
+    it "should raise an error when trying to download a local file" do
+      running {
+        @uploader.download!('/etc/passwd')
+      }.should raise_error(CarrierWave::DownloadError)
+    end
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 +01:00
+date: 2010-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    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
@@ -140,7 +160,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.10.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -152,6 +172,16 @@ dependencies:
       - !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: hoe
   type: :development
@@ -160,13 +190,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        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]
 email: 
 - jonas.nicklas@gmail.com
 executables: []
@@ -187,6 +218,7 @@ files:
 - Rakefile
 - 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
@@ -199,6 +231,7 @@ files:
 - 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
@@ -236,6 +269,7 @@ files:
 - lib/carrierwave/uploader/callbacks.rb
 - lib/carrierwave/uploader/configuration.rb
 - lib/carrierwave/uploader/default_url.rb
+- lib/carrierwave/uploader/download.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/processing.rb
@@ -274,6 +308,7 @@ files:
 - 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