carrierwave 0.2.4 → 0.3.0

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 NAME = "carrierwave"
-GEM_VERSION = "0.2.4"
+GEM_VERSION = "0.3.0"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://www.example.com"
@@ -102,3 +102,5 @@ end
 
 desc 'Default: run unit tests.'
 task :default => 'spec'
+
+task :superspec => [:spec, :features]

data/lib/carrierwave/mount.rb

@@ -75,6 +75,8 @@ module CarrierWave
     # [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
     #
+    # [write_image_identifier]  Uses the write_uploader method to set the identifier.
+    #
     # === Parameters
     #
     # [column (Symbol)]                   the attribute to mount this uploader on
@@ -125,7 +127,19 @@ module CarrierWave
 
       include CarrierWave::Mount::Extension
 
+      # Make sure to write over accessors directly defined on the class.
+      # Simply super to the included module below.
       class_eval <<-RUBY, __FILE__, __LINE__+1
+        def #{column}; super; end
+        def #{column}=(new_file); super; end
+      RUBY
+
+      # Mixing this in as a Module instead of class_evaling directly, so we
+      # can maintain the ability to super to any of these methods from within
+      # the class.
+      mod = Module.new
+      include mod
+      mod.class_eval <<-RUBY, __FILE__, __LINE__+1
 
         def #{column}
           _mounter(:#{column}).uploader
@@ -186,6 +200,11 @@ module CarrierWave
         def #{column}_processing_error
           _mounter(:#{column}).processing_error
         end
+
+        def write_#{column}_identifier
+          _mounter(:#{column}).write_identifier
+        end
+
       RUBY
 
     end
@@ -225,11 +244,23 @@ module CarrierWave
         @options = record.class.uploader_options[column]
       end
 
+      def write_identifier
+        if remove?
+          record.write_uploader(serialization_column, '')
+        else
+          record.write_uploader(serialization_column, uploader.identifier)
+        end
+      end
+      
+      def identifier
+        record.read_uploader(serialization_column)
+      end
+
       def uploader
         @uploader ||= record.class.uploaders[column].new(record, column)
-        if @uploader.blank?
-          identifier = record.read_uploader(serialization_column)
-          @uploader.retrieve_from_store!(identifier) unless identifier.blank?
+
+        if @uploader.blank? and not identifier.blank?
+          @uploader.retrieve_from_store!(identifier)
         end
         return @uploader
       end
@@ -259,10 +290,8 @@ module CarrierWave
         unless uploader.blank?
           if remove?
             uploader.remove!
-            record.write_uploader(serialization_column, '')
           else
             uploader.store!
-            record.write_uploader(serialization_column, uploader.identifier)
           end
         end
       end

data/lib/carrierwave/orm/activerecord.rb

@@ -17,13 +17,12 @@ module CarrierWave
       validates_integrity_of column if uploader_options[column.to_sym][:validate_integrity]
       validates_processing_of column if uploader_options[column.to_sym][:validate_processing]
 
-      after_create do |record|
+      after_save do |record|
         record.send("store_#{column}!")
-        record.save
       end
 
-      before_update do |record|
-        record.send("store_#{column}!")
+      before_save do |record|
+        record.send("write_#{column}_identifier")
       end
 
       after_destroy do |record|

data/lib/carrierwave/orm/datamapper.rb

@@ -14,9 +14,17 @@ module CarrierWave
       alias_method :read_uploader, :attribute_get
       alias_method :write_uploader, :attribute_set
 
-      before :save do
+      after :save do
         send("store_#{column}!")
       end
+
+      before :save do
+        send("write_#{column}_identifier")
+      end
+
+      after :destroy do
+        send("remove_#{column}!")
+      end
     end
 
   end # DataMapper

data/lib/carrierwave/orm/sequel.rb

@@ -11,10 +11,14 @@ module CarrierWave
       alias_method :read_uploader, :[]
       alias_method :write_uploader, :[]=
 
-      after_create do
+      after_save do
         send("store_#{column}!")
       end
 
+      before_save do
+        send("write_#{column}_identifier")
+      end
+
       before_destroy do
         send("remove_#{column}!")
       end

data/lib/carrierwave/processing/rmagick.rb

@@ -63,6 +63,37 @@ module CarrierWave
   #
   module RMagick
 
+    def self.included(base)
+      super
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def convert(format)
+        process :resize_to_limit => format
+      end
+
+      def resize_to_limit(width, height)
+        process :resize_to_limit => [width, height]
+      end
+
+      def resize_to_fit(width, height)
+        process :resize_to_fit => [width, height]
+      end
+
+      def resize_to_fill(width, height)
+        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
+    end
+
     ##
     # Changes the image encoding format to the given format
     #

data/lib/carrierwave/storage/abstract.rb

@@ -3,107 +3,27 @@ module CarrierWave
 
     ##
     # This file serves mostly as a specification for Storage engines. There is no requirement
-    # that storage engines must be a subclass of this class. However, any storage engine must
-    # conform to the following interface:
-    #
-    # The storage engine must respond to store!, taking an uploader object and a
-    # CarrierWave::SanitizedFile as parameters. This method should do something to store
-    # the given file, and then return an object.
-    #
-    # The storage engine must respond to retrieve!, taking an uploader object and an identifier
-    # as parameters. This method should do retrieve and then return an object.
-    #
-    # The objects returned by store! and retrieve! both *must* respond to +identifier+, taking
-    # no arguments. Identifier is a string that uniquely identifies this file and can be used
-    # to retrieve it later.
+    # that storage engines must be a subclass of this class.
     #
     class Abstract
 
-      # Do something to destroy the file
-      #
-      # === Parameters
-      #
-      # [uploader (CarrierWave::Uploader)] an uploader object
-      # [identifier (String)] uniquely identifies the file
-      #
-      # === Returns
-      #
-      # [bool] True if file was remove or false
-      #
-      def self.destroy!(uploader, identifier)
-        false
+      attr_reader :uploader
+
+      def initialize(uploader)
+        @uploader = uploader
       end
       
-      ##
-      # Do setup specific for this storage engine
-      #
       def self.setup!; end
-
-      ##
-      # Do something to store the file
-      #
-      # === Parameters
-      #
-      # [uploader (CarrierWave::Uploader)] an uploader object
-      # [file (CarrierWave::SanitizedFile)] the file to store
-      #
-      # === Returns
-      #
-      # [#identifier] an object
-      #
-      def self.store!(uploader, file)
-        self.new
-      end
       
-      # Do something to retrieve the file
-      #
-      # === Parameters
-      #
-      # [uploader (CarrierWave::Uploader)] an uploader object
-      # [identifier (String)] uniquely identifies the file
-      #
-      # === Returns
-      #
-      # [#identifier] an object
-      #
-      def self.retrieve!(uploader, identifier)
-        self.new
+      def identifier
+        uploader.filename
       end
       
-      ##
-      # Should return a String that uniquely identifies this file and can be used to retrieve it from
-      # the same storage engine later on.
-      #
-      # This is OPTIONAL
-      #
-      # === Returns
-      #
-      # [String] path to the file
-      #
-      def identifier; end
-
-      ##
-      # Should return the url where the file is publically accessible. If this is not set, then
-      # it is assumed that the url is the path relative to the public directory.
-      #
-      # This is OPTIONAL
-      #
-      # === Returns
-      #
-      # [String] file's url
-      #
-      def url; end
+      def store!
+      end
       
-      ##
-      # Should return the path where the file is corrently located. This is OPTIONAL.
-      #
-      # This is OPTIONAL
-      #
-      # === Returns
-      #
-      # [String] path to the file
-      #
-      def path; end
+      def retrieve!
+      end
       
     end # Abstract
   end # Storage

data/lib/carrierwave/storage/file.rb

@@ -8,23 +8,18 @@ module CarrierWave
     #
     class File < Abstract
 
-      def initialize(uploader)
-        @uploader = uploader
-      end
-
       ##
       # Move the file to the uploader's store path.
       #
       # === Parameters
       #
-      # [uploader (CarrierWave::Uploader)] an uploader object
       # [file (CarrierWave::SanitizedFile)] the file to store
       #
       # === Returns
       #
       # [CarrierWave::SanitizedFile] a sanitized file
       #
-      def self.store!(uploader, file)
+      def store!(file)
         path = ::File.join(uploader.store_path)
         path = ::File.expand_path(path, uploader.public)
         file.move_to(path, CarrierWave.config[:permissions])
@@ -36,14 +31,13 @@ module CarrierWave
       #
       # === Parameters
       #
-      # [uploader (CarrierWave::Uploader)] an uploader object
       # [identifier (String)] the filename of the file
       #
       # === Returns
       #
       # [CarrierWave::SanitizedFile] a sanitized file
       #
-      def self.retrieve!(uploader, identifier)
+      def retrieve!(identifier)
         path = ::File.join(uploader.store_path(identifier))
         path = ::File.expand_path(path, uploader.public)
         CarrierWave::SanitizedFile.new(path)

data/lib/carrierwave/storage/s3.rb

@@ -28,32 +28,86 @@ module CarrierWave
     # The default is :public_read, it should work in most cases.
     #
     class S3 < Abstract
-      
-      def initialize(path, identifier)
-        @path = path
-        @identifier = identifier
-      end
-      
-      ##
-      # Connect to Amazon S3
-      #
-      def self.setup!
-        require 'aws/s3'
-        AWS::S3::Base.establish_connection!(
-          :access_key_id     => CarrierWave.config[:s3][:access_key_id],
-          :secret_access_key => CarrierWave.config[:s3][:secret_access_key]
-        )
+
+      class File
+
+        def initialize(path, identifier)
+          @path = path
+          @identifier = identifier
+        end
+
+        ##
+        # Returns the current path of the file on S3
+        #
+        # === Returns
+        #
+        # [String] A path
+        #
+        def path
+          @path
+        end
+
+        ##
+        # Returns the filename on S3
+        #
+        # === Returns
+        #
+        # [String] path to the file
+        #
+        def identifier
+          @identifier
+        end
+
+        ##
+        # Reads the contents of the file from S3
+        #
+        # === Returns
+        #
+        # [String] contents of the file
+        #
+        def read
+          AWS::S3::S3Object.value @path, bucket
+        end
+
+        ##
+        # Remove the file from Amazon S3
+        #
+        def delete
+          AWS::S3::S3Object.delete @path, bucket
+        end
+
+        ##
+        # Returns the url on Amazon's S3 service
+        #
+        # === Returns
+        #
+        # [String] file's url
+        #
+        def url
+          ["http://s3.amazonaws.com", bucket, @path].compact.join('/')
+        end
+
+      private
+
+        def bucket
+          CarrierWave::Storage::S3.bucket
+        end
+
+        def access
+          CarrierWave::Storage::S3.access
+        end
+
       end
-      
+
       ##
       # === Returns
       #
       # [String] the bucket set in the config options
-      # 
+      #
       def self.bucket
         CarrierWave.config[:s3][:bucket]
       end
-      
+
       ##
       # === Returns
       #
@@ -62,91 +116,49 @@ module CarrierWave
       def self.access
         CarrierWave.config[:s3][:access]
       end
-      
+
+      ##
+      # Connect to Amazon S3
+      #
+      def self.setup!
+        require 'aws/s3'
+        AWS::S3::Base.establish_connection!(
+          :access_key_id     => CarrierWave.config[:s3][:access_key_id],
+          :secret_access_key => CarrierWave.config[:s3][:secret_access_key]
+        )
+      end
+
       ##
       # Store the file on S3
       #
       # === Parameters
       #
-      # [uploader (CarrierWave::Uploader)] an uploader object
-      # [file (CarrierWave::SanitizedFile)] the file to store
+      # [file (CarrierWave::Storage::S3::File)] the file to store
       #
       # === Returns
       #
       # [CarrierWave::Storage::S3] the stored file
       #
-      def self.store!(uploader, file)
-        AWS::S3::S3Object.store(::File.join(uploader.store_path), file.read, bucket, :access => access)
-        self.new(uploader.store_dir, uploader.filename)
+      def store!(file)
+        AWS::S3::S3Object.store(::File.join(uploader.store_path), file.read, self.class.bucket, :access => self.class.access)
+        CarrierWave::Storage::S3::File.new(uploader.store_dir, uploader.filename)
       end
-      
+
       # Do something to retrieve the file
       #
       # @param [CarrierWave::Uploader] uploader an uploader object
       # @param [String] identifier uniquely identifies the file
       #
-      # [uploader (CarrierWave::Uploader)] an uploader object
       # [identifier (String)] uniquely identifies the file
       #
       # === Returns
       #
-      # [CarrierWave::Storage::S3] the stored file
-      #
-      def self.retrieve!(uploader, identifier)
-        self.new(uploader.store_path(identifier), identifier)
-      end
-
-      ##
-      # Returns the current path of the file on S3
-      #
-      # === Returns
-      #
-      # [String] A path
-      #
-      def path
-        @path
-      end
-
-      ##
-      # Returns the filename on S3
-      #
-      # === Returns
-      #
-      # [String] path to the file
+      # [CarrierWave::Storage::S3::File] the stored file
       #
-      def identifier
-        @identifier
+      def retrieve!(identifier)
+        CarrierWave::Storage::S3::File.new(uploader.store_path(identifier), identifier)
       end
 
-      ##
-      # Reads the contents of the file from S3
-      #
-      # === Returns
-      #
-      # [String] contents of the file
-      #
-      def read
-        AWS::S3::S3Object.value @path, self.class.bucket
-      end
-
-      ##
-      # Remove the file from Amazon S3
-      #
-      def delete
-        AWS::S3::S3Object.delete @path, self.class.bucket
-      end
-
-      ##
-      # Returns the url on Amazon's S3 service
-      #
-      # === Returns
-      #
-      # [String] file's url
-      #
-      def url
-        ["http://s3.amazonaws.com", self.class.bucket, @path].compact.join('/')
-      end
-      
     end # S3
   end # Storage
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/proxy.rb

@@ -30,7 +30,7 @@ module CarrierWave
       # [String] uniquely identifies a file
       #
       def identifier
-        file.identifier if file.respond_to?(:identifier)
+        storage.identifier if storage.respond_to?(:identifier)
       end
 
       ##

data/lib/carrierwave/uploader/store.rb

@@ -120,7 +120,7 @@ module CarrierWave
         cache!(new_file) if new_file
         if @file and @cache_id
           with_callbacks(:store, new_file) do
-            @file = storage.store!(self, @file)
+            @file = storage.store!(@file)
             @cache_id = nil
           end
         end
@@ -135,7 +135,7 @@ module CarrierWave
       #
       def retrieve_from_store!(identifier)
         with_callbacks(:retrieve_from_store, identifier) do
-          @file = storage.retrieve!(self, identifier)
+          @file = storage.retrieve!(identifier)
         end
       end
 
@@ -146,7 +146,7 @@ module CarrierWave
       end
 
       def storage
-        self.class.storage
+        @storage ||= self.class.storage.new(self)
       end
 
     end # Store

data/spec/mount_spec.rb

@@ -19,21 +19,19 @@ describe CarrierWave::Mount do
     end
 
     it "should maintain the ability to super" do
-      pending "I can't make this work with datamapper" do
-        @class.class_eval do
-          def image_uploader
-            super
-          end
-
-          def image=(val)
-            super
-          end
+      @class.class_eval do
+        def image_uploader
+          super
         end
 
-        @instance.image_uploader.should be_an_instance_of(@uploader)
-        @instance.image = stub_file('test.jpg')
-        @instance.image.should be_an_instance_of(@uploader)
+        def image=(val)
+          super
+        end
       end
+
+      @instance.image_uploader.should be_an_instance_of(@uploader)
+      @instance.image = stub_file('test.jpg')
+      @instance.image.should be_an_instance_of(@uploader)
     end
     
     describe '#image_uploader' do
@@ -74,12 +72,12 @@ describe CarrierWave::Mount do
       end
       
       it "should retrieve a file from the storage if a value is stored in the database" do
-        @instance.should_receive(:read_uploader).with(:image).and_return('test.jpg')
+        @instance.should_receive(:read_uploader).with(:image).at_least(:once).and_return('test.jpg')
         @instance.image.should be_an_instance_of(@uploader)
       end
       
       it "should set the path to the store dir" do
-        @instance.should_receive(:read_uploader).with(:image).and_return('test.jpg')
+        @instance.should_receive(:read_uploader).with(:image).at_least(:once).and_return('test.jpg')
         @instance.image.current_path.should == public_path('uploads/test.jpg')
       end
     
@@ -161,7 +159,7 @@ describe CarrierWave::Mount do
       end
       
       it "should get the url from a retrieved file" do
-        @instance.should_receive(:read_uploader).with(:image).and_return('test.jpg')
+        @instance.should_receive(:read_uploader).at_least(:once).with(:image).and_return('test.jpg')
         @instance.image_url.should == '/uploads/test.jpg'
       end
 
@@ -250,14 +248,7 @@ describe CarrierWave::Mount do
         @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.should_receive(:write_uploader).with(:image, "")
         @instance.image = stub_file('test.jpg')
         path = @instance.image.current_path
         @instance.remove_image = true
@@ -371,6 +362,22 @@ describe CarrierWave::Mount do
       end
     end
 
+    describe '#write_image_identifier' do
+      it "should write to the column" do
+        @instance.should_receive(:write_uploader).with(:image, "test.jpg")
+        @instance.image = stub_file('test.jpg')
+        @instance.write_image_identifier
+      end
+
+      it "should remove from the column when remove_image is true" do
+        @instance.image = stub_file('test.jpg')
+        @instance.store_image!
+        @instance.remove_image = true
+        @instance.should_receive(:write_uploader).with(:image, "")
+        @instance.write_image_identifier
+      end
+    end
+
   end
   
   describe '#mount_uploader with a block' do
@@ -473,20 +480,18 @@ describe CarrierWave::Mount do
     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.should_receive(:read_uploader).at_least(:once).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
+    describe '#write_image_identifier' 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!
+        @instance.write_image_identifier
       end
 
       it "should remove from the given column when remove_image is true" do
@@ -494,7 +499,7 @@ describe CarrierWave::Mount do
         @instance.store_image!
         @instance.remove_image = true
         @instance.should_receive(:write_uploader).with(:monkey, "")
-        @instance.store_image!
+        @instance.write_image_identifier
       end
     end
   end

data/spec/orm/datamapper_spec.rb

@@ -101,14 +101,14 @@ describe CarrierWave::DataMapper do
       @event.image.current_path.should == public_path('uploads/test.jpeg')
     end
     
-    it "should do nothing when a validation fails" do
-      pending "how do we test with and without dm-validations?"
-      @class.validate { |r| r.errors.add :textfile, "FAIL!" }
-      @event.image = stub_file('test.jpeg')
-      @event.save
-      @event.image.should be_an_instance_of(@uploader)
-      @event.image.current_path.should =~ /^#{public_path('uploads/tmp')}/
-    end
+    # it "should do nothing when a validation fails" do
+    #   pending "how do we test with and without dm-validations?"
+    #   @class.validate { |r| r.errors.add :textfile, "FAIL!" }
+    #   @event.image = stub_file('test.jpeg')
+    #   @event.save
+    #   @event.image.should be_an_instance_of(@uploader)
+    #   @event.image.current_path.should =~ /^#{public_path('uploads/tmp')}/
+    # end
     
     it "should assign the filename to the database" do
       @event.image = stub_file('test.jpeg')
@@ -117,14 +117,14 @@ describe CarrierWave::DataMapper do
       @event.attribute_get(:image).should == 'test.jpeg'
     end
     
-    it "should assign the filename before validation" do
-      pending "how do we test with and without dm-validations?"
-      @class.validate { |r| r.errors.add_to_base "FAIL!" if r[:image].nil? }
-      @event.image = stub_file('test.jpeg')
-      @event.save
-      @event.reload
-      @event.attribute_get(:image).should == 'test.jpeg'
-    end
+    # it "should assign the filename before validation" do
+    #   pending "how do we test with and without dm-validations?"
+    #   @class.validate { |r| r.errors.add_to_base "FAIL!" if r[:image].nil? }
+    #   @event.image = stub_file('test.jpeg')
+    #   @event.save
+    #   @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')
@@ -137,5 +137,23 @@ describe CarrierWave::DataMapper do
     end
 
   end
+
+  describe '#destroy' do
+    
+    it "should do nothing when no file has been assigned" do
+      @event.destroy
+    end
+    
+    it "should remove the file from the filesystem" do
+      @event.image = stub_file('test.jpeg')
+      @event.save.should be_true
+      File.exist?(public_path('uploads/test.jpeg')).should be_true
+      @event.image.should be_an_instance_of(@uploader)
+      @event.image.current_path.should == public_path('uploads/test.jpeg')
+      @event.destroy
+      File.exist?(public_path('uploads/test.jpeg')).should be_false
+    end
+
+  end
   
 end

data/spec/orm/sequel_spec.rb

@@ -136,24 +136,20 @@ describe CarrierWave::Sequel do
       end 
      
       it "should assign the filename to the database" do
-        pending "Sequel support is currently broken" do
-          @event.image = stub_file('test.jpeg')
-          @event.save.should be_true
-          @event.reload
-          @event[:image].should == 'test.jpeg'
-        end
+        @event.image = stub_file('test.jpeg')
+        @event.save.should be_true
+        @event.reload
+        @event[:image].should == 'test.jpeg'
       end
 
       it "should remove the image if remove_image? returns true" do
-        pending "Sequel support is currently broken" do
-          @event.image = stub_file('test.jpeg')
-          @event.save
-          @event.remove_image = true
-          @event.save
-          @event.reload
-          @event.image.should be_blank
-          @event[:image].should == ''
-        end
+        @event.image = stub_file('test.jpeg')
+        @event.save
+        @event.remove_image = true
+        @event.save
+        @event.reload
+        @event.image.should be_blank
+        @event[:image].should == ''
       end
     end
     
@@ -178,12 +174,10 @@ describe CarrierWave::Sequel do
         end
 
         it "should assign an overridden filename to the database" do
-          pending "Sequel support is currently broken" do
-            @event.image = stub_file('test.jpeg')
-            @event.save.should be_true
-            @event.reload
-            @event[:image].should == 'jonas.jpeg'
-          end
+          @event.image = stub_file('test.jpeg')
+          @event.save.should be_true
+          @event.reload
+          @event[:image].should == 'jonas.jpeg'
         end
 
       end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ require 'spec/autorun'
 require 'carrierwave'
 
 require 'logger'
-CarrierWave.logger = Logger.new(File.join(File.dirname(__FILE__), 'test.log'))
+CarrierWave.logger = Logger.new(nil)
 
 alias :running :lambda
 

data/spec/uploader/remove_spec.rb

@@ -21,7 +21,10 @@ describe CarrierWave::Uploader do
       @stored_file.stub!(:identifier).and_return('this-is-me')
       @stored_file.stub!(:delete)
 
-      @uploader_class.storage.stub!(:store!).and_return(@stored_file)
+      @storage = mock('a storage engine')
+      @storage.stub!(:store!).and_return(@stored_file)
+
+      @uploader_class.storage.stub!(:new).and_return(@storage)
       @uploader.store!(@file)
     end
 

data/spec/uploader/store_spec.rb

@@ -67,9 +67,12 @@ describe CarrierWave::Uploader do
       @stored_file = mock('a stored file')
       @stored_file.stub!(:path).and_return('/path/to/somewhere')
       @stored_file.stub!(:url).and_return('http://www.example.com')
-      @stored_file.stub!(:identifier).and_return('this-is-me')
 
-      @uploader_class.storage.stub!(:store!).and_return(@stored_file)
+      @storage = mock('a storage engine')
+      @storage.stub!(:store!).and_return(@stored_file)
+      @storage.stub!(:identifier).and_return('this-is-me')
+
+      @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
     end
 
     it "should set the current path" do
@@ -105,7 +108,7 @@ describe CarrierWave::Uploader do
 
     it "should instruct the storage engine to store the file" do
       @uploader.cache!(@file)
-      @uploader_class.storage.should_receive(:store!).with(@uploader, @uploader.file).and_return(:monkey)
+      @storage.should_receive(:store!).with(@uploader.file).and_return(:monkey)
       @uploader.store!
     end
 
@@ -126,7 +129,7 @@ describe CarrierWave::Uploader do
 
     it "should not re-store a retrieved file" do
       @stored_file = mock('a stored file')
-      @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
+      @storage.stub!(:retrieve!).and_return(@stored_file)
 
       @uploader_class.storage.should_not_receive(:store!)
       @uploader.retrieve_from_store!('monkey.txt')
@@ -139,9 +142,12 @@ describe CarrierWave::Uploader do
       @stored_file = mock('a stored file')
       @stored_file.stub!(:path).and_return('/path/to/somewhere')
       @stored_file.stub!(:url).and_return('http://www.example.com')
-      @stored_file.stub!(:identifier).and_return('this-is-me')
 
-      @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
+      @storage = mock('a storage engine')
+      @storage.stub!(:retrieve!).and_return(@stored_file)
+      @storage.stub!(:identifier).and_return('this-is-me')
+
+      @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
     end
 
     it "should set the current path" do
@@ -165,7 +171,7 @@ describe CarrierWave::Uploader do
     end
 
     it "should instruct the storage engine to retrieve the file and store the result" do
-      @uploader_class.storage.should_receive(:retrieve!).with(@uploader, 'monkey.txt').and_return(@stored_file)
+      @storage.should_receive(:retrieve!).with('monkey.txt').and_return(@stored_file)
       @uploader.retrieve_from_store!('monkey.txt')
       @uploader.file.should == @stored_file
     end
@@ -194,7 +200,10 @@ describe CarrierWave::Uploader do
         @stored_file.stub!(:path).and_return('/path/to/somewhere')
         @stored_file.stub!(:url).and_return('http://www.example.com')
 
-        @uploader_class.storage.stub!(:store!).and_return(@stored_file)
+        @storage = mock('a storage engine')
+        @storage.stub!(:store!).and_return(@stored_file)
+
+        @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
       end
 
       after do
@@ -230,7 +239,10 @@ describe CarrierWave::Uploader do
         @stored_file.stub!(:path).and_return('/path/to/somewhere')
         @stored_file.stub!(:url).and_return('http://www.example.com')
 
-        @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
+        @storage = mock('a storage engine')
+        @storage.stub!(:retrieve!).and_return(@stored_file)
+
+        @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
       end
 
       it "should set the current path" do
@@ -244,7 +256,7 @@ describe CarrierWave::Uploader do
       end
 
       it "should pass the identifier to the storage engine" do
-        @uploader_class.storage.should_receive(:retrieve!).with(@uploader, 'monkey.txt').and_return(@stored_file)
+        @storage.should_receive(:retrieve!).with('monkey.txt').and_return(@stored_file)
         @uploader.retrieve_from_store!('monkey.txt')
         @uploader.file.should == @stored_file
       end

data/spec/uploader/url_spec.rb

@@ -21,12 +21,12 @@ describe CarrierWave::Uploader do
     end
 
     it "should raise ArgumentError when version doesn't exist" do
-      lambda { @uploader.url(:thumb) }.should raise_error ArgumentError
+      lambda { @uploader.url(:thumb) }.should raise_error(ArgumentError)
     end
 
     it "should not raise ArgumentError when versions version exists" do
       @uploader_class.version(:thumb)
-      lambda { @uploader.url(:thumb) }.should_not raise_error ArgumentError
+      lambda { @uploader.url(:thumb) }.should_not raise_error(ArgumentError)
     end
 
     it "should get the directory relative to public, prepending a slash" do

data/spec/uploader/versions_spec.rb

@@ -157,8 +157,14 @@ describe CarrierWave::Uploader do
         @thumb_stored_file.stub!(:path).and_return('/path/to/somewhere/thumb')
         @thumb_stored_file.stub!(:url).and_return('http://www.example.com/thumb')
 
-        @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
-        @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
+        @storage = mock('a storage engine')
+        @storage.stub!(:store!).and_return(@base_stored_file)
+
+        @thumb_storage = mock('a storage engine for thumbnails')
+        @thumb_storage.stub!(:store!).and_return(@thumb_stored_file)
+
+        @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
+        @uploader_class.version(:thumb).storage.stub!(:new).with(@uploader.thumb).and_return(@thumb_storage)
       end
 
       after do
@@ -186,8 +192,8 @@ describe CarrierWave::Uploader do
 
       it "should instruct the storage engine to store the file and its version" do
         @uploader.cache!(@file)
-        @uploader_class.storage.should_receive(:store!).with(@uploader, @uploader.file).and_return(:monkey)
-        @uploader_class.version(:thumb).storage.should_receive(:store!).with(@uploader.thumb, @uploader.thumb.file).and_return(:gorilla)
+        @storage.should_receive(:store!).with(@uploader.file).and_return(:monkey)
+        @thumb_storage.should_receive(:store!).with(@uploader.thumb.file).and_return(:gorilla)
         @uploader.store!
       end
 
@@ -203,8 +209,14 @@ describe CarrierWave::Uploader do
         @base_stored_file = mock('a stored file')
         @thumb_stored_file = mock('a thumb version of a stored file')
 
-        @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
-        @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
+        @storage = mock('a storage engine')
+        @storage.stub!(:store!).and_return(@base_stored_file)
+
+        @thumb_storage = mock('a storage engine for thumbnails')
+        @thumb_storage.stub!(:store!).and_return(@thumb_stored_file)
+
+        @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
+        @uploader_class.version(:thumb).storage.stub!(:new).with(@uploader.thumb).and_return(@thumb_storage)
 
         @base_stored_file.stub!(:delete)
         @thumb_stored_file.stub!(:delete)
@@ -239,27 +251,47 @@ describe CarrierWave::Uploader do
 
     describe '#retrieve_from_store!' do
       before do
-        @stored_file = mock('a stored file')
-        @stored_file.stub!(:path).and_return('/path/to/somewhere')
-        @stored_file.stub!(:url).and_return('http://www.example.com')
+        @uploader_class.storage = mock_storage('base')
+        @uploader_class.version(:thumb).storage = mock_storage('thumb')
+
+        @file = File.open(file_path('test.jpg'))
+
+        @base_stored_file = mock('a stored file')
+        @base_stored_file.stub!(:path).and_return('/path/to/somewhere')
+        @base_stored_file.stub!(:url).and_return('http://www.example.com')
+
+        @thumb_stored_file = mock('a thumb version of a stored file')
+        @thumb_stored_file.stub!(:path).and_return('/path/to/somewhere/thumb')
+        @thumb_stored_file.stub!(:url).and_return('http://www.example.com/thumb')
+
+        @storage = mock('a storage engine')
+        @storage.stub!(:retrieve!).and_return(@base_stored_file)
+
+        @thumb_storage = mock('a storage engine for thumbnails')
+        @thumb_storage.stub!(:retrieve!).and_return(@thumb_stored_file)
 
-        @uploader_class.storage.stub!(:retrieve!).and_return(@stored_file)
+        @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
+        @uploader_class.version(:thumb).storage.stub!(:new).with(@uploader.thumb).and_return(@thumb_storage)
       end
 
       it "should set the current path" do
         @uploader.retrieve_from_store!('monkey.txt')
         @uploader.current_path.should == '/path/to/somewhere'
+        @uploader.thumb.current_path.should == '/path/to/somewhere/thumb'
       end
 
       it "should set the url" do
         @uploader.retrieve_from_store!('monkey.txt')
         @uploader.url.should == 'http://www.example.com'
+        @uploader.thumb.url.should == 'http://www.example.com/thumb'
       end
 
       it "should pass the identifier to the storage engine" do
-        @uploader_class.storage.should_receive(:retrieve!).with(@uploader, 'monkey.txt').and_return(@stored_file)
+        @storage.should_receive(:retrieve!).with('monkey.txt').and_return(@base_stored_file)
+        @thumb_storage.should_receive(:retrieve!).with('monkey.txt').and_return(@thumb_stored_file)
         @uploader.retrieve_from_store!('monkey.txt')
-        @uploader.file.should == @stored_file
+        @uploader.file.should == @base_stored_file
+        @uploader.thumb.file.should == @thumb_stored_file
       end
 
       it "should not set the filename" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 +02:00
+date: 2009-06-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -68,7 +68,6 @@ files:
 - spec/orm/sequel_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
-- spec/test.log
 - spec/uploader/cache_spec.rb
 - spec/uploader/default_path_spec.rb
 - spec/uploader/extension_whitelist_spec.rb

data/spec/test.log

@@ -1,172 +0,0 @@
-# Logfile created on Tue May 19 07:31:54 +0200 2009 by /
-CarrierWave: removing file
-CarrierWave::Storage::File: removing file /Users/jonas/Projects/carrierwave/spec/public/uploads/test.jpeg
-CarrierWave: removing file
-CarrierWave::Storage::File: removing file /Users/jonas/Projects/carrierwave/spec/public/uploads/test.jpeg
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave::Storage::File: removing file /Users/jonas/Projects/carrierwave/spec/public/uploads/test.jpeg
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-I, [2009-05-26T22:35:08.573579 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.578609 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.583446 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.588405 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.592588 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.660552 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:08.667078 #17868]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.885824 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.889315 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.894496 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.898364 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.901933 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.907043 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:35.911022 #17876]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.065681 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.069419 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.074548 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.078657 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.083570 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.088308 #17881]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:35:39.092214 #17881]  INFO -- : CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-I, [2009-05-26T22:36:44.348636 #17909]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:36:44.420280 #17909]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:36:44.430348 #17909]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.892779 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.892930 #17927]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:37:41.892974 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.900865 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.900969 #17927]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:37:41.901011 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.908823 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:37:41.908946 #17927]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:37:41.909008 #17927]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.373466 #17935]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.373646 #17935]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:38:12.373696 #17935]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.381293 #17935]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.381412 #17935]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:38:12.381458 #17935]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.388623 #17935]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:38:12.388736 #17935]  INFO -- : CarrierWave: removing file for version thumb
-I, [2009-05-26T22:38:12.388779 #17935]  INFO -- : CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-I, [2009-05-26T22:39:18.757584 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.761525 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.766127 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.770454 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.775113 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.779044 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:18.783626 #17962]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.291400 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.294956 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.299237 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.302966 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.306106 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.309840 #17982]  INFO -- : CarrierWave: removing file
-I, [2009-05-26T22:39:36.313799 #17982]  INFO -- : CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file
-CarrierWave: removing file
-CarrierWave: removing file for version thumb
-CarrierWave: removing file