carrierwave 0.2.0 → 0.2.1

data/README.rdoc

@@ -172,6 +172,8 @@ in the case of images, a small thumbnail would be a good indicator:
       </p>
     <% end %>
 
+NOTE: this feature currently requires write access to your filesystem. If write access is unavailable (e.g. Heroku) you will not be able to upload files. You can prevent CarrierWave from writing to the file system by setting `CarrierWave.config[:cache_to_cache_dir] = false`. This will however break redisplays of forms.
+
 == Using Amazon S3
 
 You'll need to configure a bucket, access id and secret key like this:

data/Rakefile

@@ -3,12 +3,13 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 gem 'rdoc', '>=2.4.0'
 require 'rdoc'
+require 'sdoc'
 
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 NAME = "carrierwave"
-GEM_VERSION = "0.2.0"
+GEM_VERSION = "0.2.1"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://www.example.com"
@@ -43,6 +44,7 @@ end
 Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
   rd.title = "CarrierWave"
+  rd.template = 'direct'
   rd.options << "--diagram" if ENV["DIAGRAM"]
   rd.rdoc_dir = File.join(File.dirname(__FILE__), 'doc')
   rd.rdoc_files.include("README.rdoc", "LICENSE", "TODO", 'lib/carrierwave/**/*.rb')

data/lib/carrierwave.rb

@@ -48,6 +48,7 @@ CarrierWave.config = {
   },
   :store_dir => 'uploads',
   :cache_dir => 'uploads/tmp',
+  :cache_to_cache_dir => true,
   :mount => {
     :ignore_integrity_errors => true,
     :ignore_processing_errors => true,
@@ -57,6 +58,7 @@ CarrierWave.config = {
 }
 
 if defined?(Merb)
+
   CarrierWave.config[:root] = Merb.root
   CarrierWave.config[:public] = Merb.dir_for(:public)
 
@@ -66,18 +68,19 @@ if defined?(Merb)
   Merb.push_path(:uploader, Merb.root / "app" / "uploaders")
 
   Merb.add_generators File.dirname(__FILE__) / 'generators' / 'uploader_generator'
-end
 
-if defined?(Rails)
+elsif defined?(Rails)
+
   CarrierWave.config[:root] = Rails.root
   CarrierWave.config[:public] = File.join(Rails.root, 'public')
 
   require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord')
 
   ActiveSupport::Dependencies.load_paths << File.join(Rails.root, "app", "uploaders")
-end
 
-if defined?(Sinatra)
+elsif defined?(Sinatra)
+
   CarrierWave.config[:root] = Sinatra::Application.root
   CarrierWave.config[:public] = Sinatra::Application.public
+
 end

data/lib/carrierwave/mount.rb

@@ -56,23 +56,36 @@ module CarrierWave
     #
     # [image]                   Returns an instance of the uploader only if anything has been uploaded
     # [image=]                  Caches the given file
+    #
+    # [image_url]               Returns the url to the uploaded file
+    #
     # [image_cache]             Returns a string that identifies the cache location of the file 
     # [image_cache=]            Retrieves the file from the cache based on the given cache name
+    #
     # [image_uploader]          Returns an instance of the uploader
     # [image_uploader=]         Sets the uploader (be careful!)
+    #
+    # [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.
+    #
     # [store_image!]            Stores a file that has been assigned with +image=+
+    #
     # [image_integrity_error]   Returns an error object if the last file to be assigned caused an integrty error
+    # [image_processing_error]  Returns an error object if the last file to be assigned caused a processing error
     #
     # === Parameters
     #
-    # [column (Symbol)] the attribute to mount this uploader on
-    # [uploader (CarrierWave::Uploader)] the uploader class to mount
-    # [options (Hash{Symbol => Object})] a set of options
-    # [&block (Proc)] customize anonymous uploaders
+    # [column (Symbol)]                   the attribute to mount this uploader on
+    # [uploader (CarrierWave::Uploader)]  the uploader class to mount
+    # [options (Hash{Symbol => Object})]  a set of options
+    # [&block (Proc)]                     customize anonymous uploaders
     #
     # === Options
     # 
-    # [:ignore_integrity_errors (Boolean)] if set to true, integrity errors will result in caching failing silently
+    # [:mount_on => Symbol] if the name of the column to be serialized to differs you can override it using this option
+    # [:ignore_integrity_errors => Boolean] if set to true, integrity errors will result in caching failing silently
+    # [:ignore_processing_errors => Boolean] if set to true, processing errors will result in caching failing silently
     #
     # === Examples
     #
@@ -122,6 +135,10 @@ module CarrierWave
           _uploader_set(:#{column}, uploader)             #   _uploader_set(:image, uploader)
         end                                               # end
                                                           #
+        def #{column}_url(*args)                          # def image_url(*args)
+          _uploader_get_url(:#{column}, *args)            #   _uploader_get_url(:image, *args)
+        end                                               # end
+                                                          #
         def #{column}                                     # def image
           _uploader_get_column(:#{column})                #   _uploader_get_column(:image)
         end                                               # end
@@ -138,6 +155,18 @@ module CarrierWave
           _uploader_set_cache(:#{column}, cache_name)     #   _uploader_set_cache(:image, cache_name)
         end                                               # end
                                                           #
+        def remove_#{column}                              # def remove_image
+          _uploader_remove[:#{column}]                    #   _uploader_remove[:image]
+        end                                               # end
+                                                          #
+        def remove_#{column}=(value)                      # def remove_image=(value)
+          _uploader_remove[:#{column}] = value            #   _uploader_remove[:image] = value
+        end                                               # end
+                                                          #
+        def remove_#{column}?                             # def remove_image?
+          _uploader_remove?(:#{column})                   #   _uploader_remove?(:image)
+        end                                               # end
+                                                          #
         def store_#{column}!                              # def store_image!
           _uploader_store!(:#{column})                    #   _uploader_store!(:image)
         end                                               # end
@@ -183,7 +212,7 @@ module CarrierWave
       def _uploader_get_column(column)
         return _uploader_get(column) unless _uploader_get(column).blank?
 
-        identifier = read_uploader(column)
+        identifier = read_uploader(_uploader_options(column)[:mount_on] || column)
 
         unless identifier.blank?
           _uploader_get(column).retrieve_from_store!(identifier)
@@ -203,6 +232,11 @@ module CarrierWave
         raise e unless _uploader_options(column)[:ignore_processing_errors]
       end
 
+      def _uploader_get_url(column, *args)
+        _uploader_get_column(column)
+        _uploader_get(column).url(*args)
+      end
+
       def _uploader_get_cache(column)
         _uploader_get(column).cache_name
       end
@@ -213,11 +247,24 @@ module CarrierWave
 
       def _uploader_store!(column)
         unless _uploader_get(column).blank?
-          _uploader_get(column).store!
-          write_uploader(column, _uploader_get(column).identifier)
+          if _uploader_remove?(column)
+            _uploader_set(column, nil)
+            write_uploader(column, '')
+          else
+            _uploader_get(column).store!
+            write_uploader(_uploader_options(column)[:mount_on] || column, _uploader_get(column).identifier)
+          end
         end
       end
 
+      def _uploader_remove
+        @_uploader_remove ||= {}
+      end
+
+      def _uploader_remove?(column)
+        !_uploader_remove[column].blank? and _uploader_remove[column] !~ /\A0|false$\z/
+      end
+
       def _uploader_integrity_errors
         @_uploader_integrity_errors ||= {}
       end

data/lib/carrierwave/test/matchers.rb

@@ -7,7 +7,7 @@ module CarrierWave
     #
     module Matchers
 
-      class BeIdenticalTo
+      class BeIdenticalTo # :nodoc:
         def initialize(expected)
           @expected = expected
         end
@@ -27,7 +27,7 @@ module CarrierWave
         BeIdenticalTo.new(expected)
       end
 
-      class HavePermissions
+      class HavePermissions # :nodoc:
         def initialize(expected)
           @expected = expected
         end
@@ -51,7 +51,7 @@ module CarrierWave
         HavePermissions.new(expected)
       end
 
-      class BeNoLargerThan
+      class BeNoLargerThan # :nodoc:
         def initialize(width, height)
           @width, @height = width, height
         end
@@ -79,7 +79,7 @@ module CarrierWave
         BeNoLargerThan.new(width, height)
       end
 
-      class HaveDimensions
+      class HaveDimensions # :nodoc:
         def initialize(width, height)
           @width, @height = width, height
         end

data/lib/carrierwave/uploader.rb

@@ -259,11 +259,16 @@ module CarrierWave
     #
     # [String] the location where this file is accessible via a url
     #
-    def url
-      if file.respond_to?(:url) and not file.url.blank?
-        file.url
-      elsif current_path
-        File.expand_path(current_path).gsub(File.expand_path(public), '')
+    def url(*args)
+      if(args.first)
+        # recursively proxy to version
+        versions[args.first.to_sym].url(*args[1..-1])
+      else
+        if file.respond_to?(:url) and not file.url.blank?
+          file.url
+        elsif current_path
+          File.expand_path(current_path).gsub(File.expand_path(public), '')
+        end
       end
     end
 
@@ -291,6 +296,17 @@ module CarrierWave
       file.read if file.respond_to?(:read)
     end
 
+    ##
+    # Fetches the size of the currently stored/cached file
+    #
+    # === Returns
+    #
+    # [Integer] size of the file
+    #
+    def size
+      file.respond_to?(:size) ? file.size : 0
+    end
+
     ##
     # Override this in your Uploader to change the filename.
     #
@@ -356,6 +372,12 @@ module CarrierWave
     ## Cache
     ####################
 
+    ##
+    #
+    def cached?
+      @cache_id
+    end
+
     ##
     # Override this in your Uploader to change the directory where files are cached.
     #
@@ -420,7 +442,10 @@ module CarrierWave
         @filename = new_file.filename
         self.original_filename = new_file.filename
 
-        @file = @file.copy_to(cache_path, CarrierWave.config[:permissions])
+        if CarrierWave.config[:cache_to_cache_dir]
+          @file = @file.copy_to(cache_path, CarrierWave.config[:permissions])
+        end
+
         process!
 
         versions.each do |name, v|
@@ -520,7 +545,7 @@ module CarrierWave
     #
     def store!(new_file=nil)
       cache!(new_file) if new_file
-      if @file
+      if @file and @cache_id
         @file = storage.store!(self, @file)
         @cache_id = nil
         versions.each { |name, v| v.store!(new_file) }

data/rails_generators/uploader/templates/uploader.rb

@@ -1,41 +1,41 @@
 class <%= class_name %>Uploader
 
   include CarrierWave::Uploader
-  
+
   # Include RMagick or ImageScience support
   #     include CarrierWave::RMagick
   #     include CarrierWave::ImageScience
-  
+
   # Choose what kind of storage to use for this uploader
   storage :file
   #     storage :s3
-  
+
   # Process files as they are uploaded.
   #     process :scale => [200, 300]
-  # 
+  #
   #     def scale(width, height)
   #       # do something
-  #     end 
-  
+  #     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"
   #     end
-  
+
   # Override the directory where uploaded files will be stored
-  #     def store_dir
-  #       "something"
-  #     end
-  
-end
+  # 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
+end

data/spec/fixtures/bork.txt

@@ -1 +1 @@
-bork bork bork
+bork bork bork Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/spec/mount_spec.rb

@@ -86,9 +86,9 @@ describe CarrierWave::Mount do
       
       it "should do nothing when an empty string is assigned" do
         @instance.should_not_receive(:write_uploader)
-        @instance.image = ''
+        @instance.image = stub_file('test.jpg')
       end
-      
+
       it "should fail silently if the image fails an integrity check" do
         @uploader.class_eval do
           def extension_white_list
@@ -111,6 +111,36 @@ describe CarrierWave::Mount do
       
     end
 
+    describe '#image_url' do
+      
+      it "should return nil when nothing has been assigned" do
+        @instance.should_receive(:read_uploader).with(:image).and_return(nil)
+        @instance.image_url.should be_nil
+      end
+      
+      it "should return nil when an empty string has been assigned" do
+        @instance.should_receive(:read_uploader).with(:image).and_return('')
+        @instance.image_url.should be_nil
+      end
+      
+      it "should get the url from a retrieved file" do
+        @instance.should_receive(:read_uploader).with(:image).and_return('test.jpg')
+        @instance.image_url.should == '/uploads/test.jpg'
+      end
+
+      it "should get the url from a cached file" do
+        @instance.image = stub_file('test.jpg')
+        @instance.image_url.should =~ %r{uploads/tmp/[\d\-]+/test.jpg}
+      end
+
+      it "should get the url from a cached file's version" do
+        @uploader.version(:thumb)
+        @instance.image = stub_file('test.jpg')
+        @instance.image_url(:thumb).should =~ %r{uploads/tmp/[\d\-]+/thumb_test.jpg}
+      end
+
+    end
+
     describe '#image_cache' do
 
       before do
@@ -182,8 +212,59 @@ describe CarrierWave::Mount do
         @instance.store_image!
         @instance.image.current_path.should == public_path('uploads/test.jpg')
       end
+
+      it "write to the column" do
+        @instance.should_receive(:write_uploader).with(:image, "test.jpg")
+        @instance.image = stub_file('test.jpg')
+        @instance.store_image!
+      end
+
+      it "should remove an uploaded file when remove_image? returns true" do
+        @instance.image = stub_file('test.jpg')
+        @instance.remove_image = true
+        @instance.store_image!
+        @instance.image.should be_nil
+      end
     end
-    
+
+    describe '#remove_image' do
+      
+      it "should store a value" do
+        @instance.remove_image = true
+        @instance.remove_image.should be_true
+      end
+      
+    end
+
+    describe '#remove_image?' do
+      
+      it "should be true when the value is truthy" do
+        @instance.remove_image = true
+        @instance.remove_image?.should be_true
+      end
+      
+      it "should be false when the value is falsey" do
+        @instance.remove_image = false
+        @instance.remove_image?.should be_false
+      end
+      
+      it "should be false when the value is ''" do
+        @instance.remove_image = ''
+        @instance.remove_image?.should be_false
+      end
+      
+      it "should be false when the value is '0'" do
+        @instance.remove_image = '0'
+        @instance.remove_image?.should be_false
+      end
+
+      it "should be false when the value is 'false'" do
+        @instance.remove_image = 'false'
+        @instance.remove_image?.should be_false
+      end
+      
+    end
+
     describe '#image_integrity_error' do
 
       it "should be nil by default" do
@@ -321,5 +402,38 @@ describe CarrierWave::Mount do
 
   end
 
+  describe '#mount_uploader with :mount_on => :monkey' do
+
+  
+    before do
+      @class = Class.new
+      @class.send(:extend, CarrierWave::Mount)
+
+      @uploader = Class.new do
+        include CarrierWave::Uploader
+      end
+
+      @class.mount_uploader(:image, @uploader, :mount_on => :monkey)
+      @instance = @class.new
+    end
+
+    describe '#image' do
+      
+      it "should retrieve a file from the storage if a value is stored in the database" do
+        @instance.should_receive(:read_uploader).with(:monkey).twice.and_return('test.jpg')
+        @instance.image.should be_an_instance_of(@uploader)
+        @instance.image.current_path.should == public_path('uploads/test.jpg')
+      end
+    
+    end
+
+    describe '#store_image!' do
+      it "should write to the given column" do
+        @instance.should_receive(:write_uploader).with(:monkey, "test.jpg")
+        @instance.image = stub_file('test.jpg')
+        @instance.store_image!
+      end
+    end
+  end
 
 end

data/spec/orm/activerecord_spec.rb

@@ -25,6 +25,7 @@ class TestMigration < ActiveRecord::Migration
 end
 
 class Event < ActiveRecord::Base; end # setup a basic AR class for testing
+$arclass = 0
 
 describe CarrierWave::ActiveRecord do
   
@@ -35,7 +36,13 @@ describe CarrierWave::ActiveRecord do
     after { Event.delete_all }
     
     before do
-      @class = Class.new(ActiveRecord::Base)
+      # My god, what a horrible, horrible solution, but AR validations don't work
+      # unless the class has a name. This is the best I could come up with :S
+      $arclass += 1
+      eval <<-RUBY
+        class Event#{$arclass} < Event; end
+        @class = Event#{$arclass}
+      RUBY
       @class.table_name = "events"
       @uploader = Class.new do
         include CarrierWave::Uploader
@@ -151,6 +158,16 @@ describe CarrierWave::ActiveRecord do
         @event[:image].should == 'test.jpeg'
       end
       
+      it "should remove the image if remove_image? returns true" do
+        @event.image = stub_file('test.jpeg')
+        @event.save!
+        @event.remove_image = true
+        @event.save!
+        @event.reload
+        @event.image.should be_nil
+        @event[:image].should == ''
+      end
+
     end
     
     describe 'with overriddent filename' do
@@ -184,6 +201,43 @@ describe CarrierWave::ActiveRecord do
 
     end
     
+    describe 'with validates_presence_of' do
+
+      before do
+        @class.validates_presence_of :image
+        @event.stub!(:name).and_return('jonas')
+      end
+
+      it "should be valid if a file has been cached" do
+        @event.image = stub_file('test.jpeg')
+        @event.should be_valid
+      end
+
+      it "should not be valid if a file has not been cached" do
+        @event.should_not be_valid
+      end
+
+    end
+
+    describe 'with validates_size_of' do
+
+      before do
+        @class.validates_size_of :image, :maximum => 40
+        @event.stub!(:name).and_return('jonas')
+      end
+
+      it "should be valid if a file has been cached that matches the size criteria" do
+        @event.image = stub_file('test.jpeg')
+        @event.should be_valid
+      end
+
+      it "should not be valid if a file has been cached that does not match the size criteria" do
+        @event.image = stub_file('bork.txt')
+        @event.should_not be_valid
+      end
+
+    end
+    
   end
   
 end

data/spec/orm/datamapper_spec.rb

@@ -127,7 +127,17 @@ describe CarrierWave::DataMapper do
       @event.reload
       @event.attribute_get(:image).should == 'test.jpeg'
     end
-    
+
+    it "should remove the image if remove_image? returns true" do
+      @event.image = stub_file('test.jpeg')
+      @event.save
+      @event.remove_image = true
+      @event.save
+      @event.reload
+      @event.image.should be_nil
+      @event.attribute_get(:image).should == ''
+    end
+
   end
   
 end

data/spec/orm/sequel_spec.rb

@@ -132,7 +132,16 @@ describe CarrierWave::Sequel do
         @event.reload
         @event[:image].should == 'test.jpeg'
       end
-      
+
+      it "should remove the image if remove_image? returns true" do
+        @event.image = stub_file('test.jpeg')
+        @event.save
+        @event.remove_image = true
+        @event.save
+        @event.reload
+        @event.image.should be_nil
+        @event[:image].should == ''
+      end
     end
     
     describe 'with overriddent filename' do

data/spec/uploader_spec.rb

@@ -200,6 +200,17 @@ describe CarrierWave::Uploader do
       @uploader.read.should == "this is stuff"
     end
   end
+
+  describe '#size' do
+    it "should be zero by default" do
+      @uploader.size.should == 0
+    end
+
+    it "should get the size of a cached file" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.size.should == 13
+    end
+  end
   
   describe '#store_dir' do
     it "should default to the config option" do
@@ -241,7 +252,7 @@ describe CarrierWave::Uploader do
       @uploader.mounted_as.should == :llama
     end
   end
-  
+
   describe '#url' do
     before do
       CarrierWave::Uploader.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
@@ -255,7 +266,21 @@ describe CarrierWave::Uploader do
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
     end
-    
+
+    it "should get the directory relative to public for a specific version" do
+      @uploader_class.version(:thumb)
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.url(:thumb).should == '/uploads/tmp/20071201-1234-345-2255/thumb_test.jpg'
+    end
+
+    it "should get the directory relative to public for a nested version" do
+      @uploader_class.version(:thumb) do
+        version(:mini)
+      end
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.url(:thumb, :mini).should == '/uploads/tmp/20071201-1234-345-2255/thumb_mini_test.jpg'
+    end
+
     it "should return file#url if available" do
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.file.stub!(:url).and_return('http://www.example.com/someurl.jpg')
@@ -270,25 +295,25 @@ describe CarrierWave::Uploader do
   end
   
   describe '#to_s' do
-      before do
-        CarrierWave::Uploader.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
-      end
+    before do
+      CarrierWave::Uploader.stub!(:generate_cache_id).and_return('20071201-1234-345-2255')
+    end
 
-      it "should default to nil" do
-        @uploader.to_s.should be_nil
-      end
+    it "should default to nil" do
+      @uploader.to_s.should be_nil
+    end
 
-      it "should get the directory relative to public, prepending a slash" do
-        @uploader.cache!(File.open(file_path('test.jpg')))
-        @uploader.to_s.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
-      end
+    it "should get the directory relative to public, prepending a slash" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.to_s.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
+    end
 
-      it "should return file#url if available" do
-        @uploader.cache!(File.open(file_path('test.jpg')))
-        @uploader.file.stub!(:url).and_return('http://www.example.com/someurl.jpg')
-        @uploader.to_s.should == 'http://www.example.com/someurl.jpg'
-      end
+    it "should return file#url if available" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.file.stub!(:url).and_return('http://www.example.com/someurl.jpg')
+      @uploader.to_s.should == 'http://www.example.com/someurl.jpg'
     end
+  end
   
   describe '#cache!' do
     
@@ -300,6 +325,11 @@ describe CarrierWave::Uploader do
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.file.should be_an_instance_of(CarrierWave::SanitizedFile)
     end
+
+    it "should be cached" do
+      @uploader.cache!(File.open(file_path('test.jpg')))
+      @uploader.should be_cached
+    end
     
     it "should store the cache name" do
       @uploader.cache!(File.open(file_path('test.jpg')))
@@ -316,6 +346,15 @@ describe CarrierWave::Uploader do
       @uploader.file.path.should == public_path('uploads/tmp/20071201-1234-345-2255/test.jpg')
       @uploader.file.exists?.should be_true
     end
+
+    it "should not move it if cache_to_cache_dir is false" do
+      CarrierWave.config[:cache_to_cache_dir] = false
+      path = file_path('test.jpg')
+      @uploader.cache!(File.open(path))
+      @uploader.current_path.should == path
+      @uploader.file.exists?.should be_true
+      CarrierWave.config[:cache_to_cache_dir] = true
+    end
     
     it "should set the url" do
       @uploader.cache!(File.open(file_path('test.jpg')))
@@ -380,6 +419,11 @@ describe CarrierWave::Uploader do
       @uploader.retrieve_from_cache!('20071201-1234-345-2255/test.jpeg')
       @uploader.file.should be_an_instance_of(CarrierWave::SanitizedFile)
     end
+
+    it "should be cached" do
+      @uploader.retrieve_from_cache!('20071201-1234-345-2255/test.jpeg')
+      @uploader.should be_cached
+    end
     
     it "should set the path to the tmp dir" do
       @uploader.retrieve_from_cache!('20071201-1234-345-2255/test.jpeg')
@@ -474,7 +518,12 @@ describe CarrierWave::Uploader do
       @uploader.store!(@file)
       @uploader.current_path.should == '/path/to/somewhere'
     end
-    
+
+    it "should not be cached" do
+      @uploader.store!(@file)
+      @uploader.should_not be_cached
+    end
+
     it "should set the url" do
       @uploader.store!(@file)
       @uploader.url.should == 'http://www.example.com'
@@ -516,6 +565,15 @@ describe CarrierWave::Uploader do
     it "should do nothing when trying to store an empty file" do
       @uploader.store!(nil)
     end
+
+    it "should not re-store a retrieved file" do
+      @stored_file = mock('a stored file')
+      @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
+
+      @uploader_class.storage.should_not_receive(:store!)
+      @uploader.retrieve_from_store!('monkey.txt')
+      @uploader.store!
+    end
   end
   
   describe '#retrieve_from_store!' do
@@ -533,6 +591,11 @@ describe CarrierWave::Uploader do
       @uploader.current_path.should == '/path/to/somewhere'
     end
 
+    it "should not be cached" do
+      @uploader.retrieve_from_store!('monkey.txt')
+      @uploader.should_not be_cached
+    end
+
     it "should set the url" do
       @uploader.retrieve_from_store!('monkey.txt')
       @uploader.url.should == 'http://www.example.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 +02:00
+date: 2009-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,45 +29,37 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
-- lib/carrierwave
 - lib/carrierwave/mount.rb
-- lib/carrierwave/orm
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
 - lib/carrierwave/orm/sequel.rb
-- lib/carrierwave/processing
 - lib/carrierwave/processing/image_science.rb
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
-- lib/carrierwave/storage
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/s3.rb
-- lib/carrierwave/test
 - lib/carrierwave/test/matchers.rb
 - lib/carrierwave/uploader.rb
 - lib/carrierwave.rb
-- lib/generators
 - lib/generators/uploader_generator.rb
-- spec/fixtures
 - spec/fixtures/bork.txt
 - spec/fixtures/test.jpeg
 - spec/fixtures/test.jpg
 - spec/mount_spec.rb
-- spec/orm
 - spec/orm/activerecord_spec.rb
 - spec/orm/datamapper_spec.rb
 - spec/orm/sequel_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
 - spec/uploader_spec.rb
-- rails_generators/uploader
-- rails_generators/uploader/templates
 - rails_generators/uploader/templates/uploader.rb
 - rails_generators/uploader/uploader_generator.rb
 - rails_generators/uploader/USAGE
 has_rdoc: true
 homepage: http://www.example.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -88,9 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simple and powerful uploads for Merb and Rails
 test_files: []