jnicklas-carrierwave 0.2.3 → 0.2.4

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 NAME = "carrierwave"
-GEM_VERSION = "0.2.3"
+GEM_VERSION = "0.2.4"
 AUTHOR = "Jonas Nicklas"
 EMAIL = "jonas.nicklas@gmail.com"
 HOMEPAGE = "http://www.example.com"

data/lib/carrierwave/orm/activerecord.rb

@@ -25,6 +25,10 @@ module CarrierWave
       before_update do |record|
         record.send("store_#{column}!")
       end
+
+      after_destroy do |record|
+        record.send("remove_#{column}!")
+      end
     end
 
     ##

data/lib/carrierwave/processing/rmagick.rb

@@ -88,6 +88,33 @@ module CarrierWave
       end
     end
 
+    ##
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. Will only resize the image if it is larger than the
+    # specified dimensions. The resulting image may be shorter or narrower than specified
+    # in the smaller dimension but will not be larger than the specified values.
+    #
+    # === Parameters
+    #
+    # [width (Integer)] the width to scale the image to
+    # [height (Integer)] the height to scale the image to
+    #
+    # === Yields
+    #
+    # [Magick::Image] additional manipulations to perform
+    #
+    def resize_to_limit(width, height)
+      manipulate! do |img|
+        geometry = Magick::Geometry.new(width, height, 0, 0, Magick::GreaterGeometry)
+        new_img = img.change_geometry(geometry) do |new_width, new_height|
+          img.resize(new_width, new_height)
+        end
+        destroy_image(img)
+        new_img = yield(new_img) if block_given?
+        new_img
+      end
+    end
+
     ##
     # From the RMagick documentation: "Resize the image to fit within the
     # specified dimensions while retaining the original aspect ratio. The
@@ -167,9 +194,9 @@ module CarrierWave
         else
           filled = new_img.color_floodfill(1, 1, ::Magick::Pixel.from_color(background))
         end
-        new_img.destroy!
+        destroy_image(new_img)
         filled.composite!(img, gravity, ::Magick::OverCompositeOp)
-        img.destroy!
+        destroy_image(img)
         filled = yield(filled) if block_given?
         filled
       end
@@ -204,15 +231,21 @@ module CarrierWave
           list << yield( frame )
         end
         list.write(current_path)
-        list.destroy!
+        destroy_image(list)
       else
         frame = image.first
         yield( frame ).write(current_path)
-        frame.destroy!
+        destroy_image(frame)
       end
     rescue ::Magick::ImageMagickError => e
       raise CarrierWave::ProcessingError.new("Failed to manipulate with rmagick, maybe it is not an image? Original Error: #{e}")
     end
 
+  private
+  
+    def destroy_image(image)
+      image.destroy! if image.respond_to?(:destroy!)
+    end
+
   end # RMagick
 end # CarrierWave

data/lib/carrierwave/storage/file.rb

@@ -7,29 +7,10 @@ module CarrierWave
     # pretty much it.
     #
     class File < Abstract
-      
+
       def initialize(uploader)
         @uploader = uploader
       end
-      
-      ##
-      # Delete the file to the uploader's store path.
-      #
-      # === Parameters
-      #
-      # [uploader (CarrierWave::Uploader)] an uploader object
-      # [file (CarrierWave::SanitizedFile)] the file to store
-      #
-      # === Returns
-      #
-      # [bool] True if file was removed or false
-      #
-      def self.destroy!(uploader, file)
-        unless file.blank?
-          CarrierWave.logger.info "CarrierWave::Storage::File: removing file #{file.path}"
-          file.delete
-        end
-      end
 
       ##
       # Move the file to the uploader's store path.
@@ -49,7 +30,7 @@ module CarrierWave
         file.move_to(path, CarrierWave.config[:permissions])
         file
       end
-      
+
       ##
       # Retrieve the file from its store path
       #
@@ -67,7 +48,7 @@ module CarrierWave
         path = ::File.expand_path(path, uploader.public)
         CarrierWave::SanitizedFile.new(path)
       end
-      
+
     end # File
   end # Storage
 end # CarrierWave

data/lib/carrierwave/storage/s3.rb

@@ -29,8 +29,8 @@ module CarrierWave
     #
     class S3 < Abstract
       
-      def initialize(store_path, identifier)
-        @store_path = store_path
+      def initialize(path, identifier)
+        @path = path
         @identifier = identifier
       end
       
@@ -95,7 +95,18 @@ module CarrierWave
       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
       #
@@ -115,7 +126,14 @@ module CarrierWave
       # [String] contents of the file
       #
       def read
-        S3Object.value @store_path, self.class.bucket
+        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
 
       ##
@@ -126,7 +144,7 @@ module CarrierWave
       # [String] file's url
       #
       def url
-        ["http://s3.amazonaws.com", self.class.bucket, @store_path].compact.join('/')
+        ["http://s3.amazonaws.com", self.class.bucket, @path].compact.join('/')
       end
       
     end # S3

data/lib/carrierwave/uploader/remove.rb

@@ -10,7 +10,7 @@ module CarrierWave
       def remove!
         with_callbacks(:remove) do
           CarrierWave.logger.info 'CarrierWave: removing file'
-          storage.destroy!(self, file)
+          @file.delete if @file
           @file = nil
           @cache_id = nil
         end

data/spec/orm/activerecord_spec.rb

@@ -167,7 +167,25 @@ describe CarrierWave::ActiveRecord do
       end
 
     end
-    
+
+    describe '#destroy' do
+      
+      it "should do nothing when no file has been assigned" do
+        @event.save.should be_true
+        @event.destroy
+      end
+      
+      it "should remove the file from the filesystem" do
+        @event.image = stub_file('test.jpeg')
+        @event.save.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
+
     describe 'with overriddent filename' do
       
       describe '#save' do

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

@@ -19,9 +19,9 @@ describe CarrierWave::Uploader do
       @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')
+      @stored_file.stub!(:delete)
 
       @uploader_class.storage.stub!(:store!).and_return(@stored_file)
-      @uploader_class.storage.stub!(:destroy!)
       @uploader.store!(@file)
     end
 
@@ -46,8 +46,8 @@ describe CarrierWave::Uploader do
       @uploader.identifier.should be_nil
     end
 
-    it "should instruct the storage engine to remove the file" do
-      @uploader_class.storage.should_receive(:destroy!).with(@uploader, @uploader.file)
+    it "should delete the file" do
+      @stored_file.should_receive(:delete)
       @uploader.remove!
     end
 

data/spec/uploader/versions_spec.rb

@@ -206,11 +206,8 @@ describe CarrierWave::Uploader do
         @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
         @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
 
-        @uploader_class.storage.stub!(:store!).and_return(@base_stored_file)
-        @uploader_class.version(:thumb).storage.stub!(:store!).and_return(@thumb_stored_file)
-
-        @uploader_class.storage.stub!(:destroy!)
-        @uploader_class.version(:thumb).storage.stub!(:destroy!)
+        @base_stored_file.stub!(:delete)
+        @thumb_stored_file.stub!(:delete)
 
         @uploader.store!(@file)
       end
@@ -231,9 +228,9 @@ describe CarrierWave::Uploader do
         @uploader.thumb.url.should be_nil
       end
 
-      it "should instruct the storage engine to remove the file and its versions" do
-        @uploader_class.storage.should_receive(:destroy!).with(@uploader, @uploader.file)
-        @uploader_class.version(:thumb).storage.should_receive(:destroy!).with(@uploader.thumb, @uploader.thumb.file)
+      it "should delete all the files" do
+        @base_stored_file.should_receive(:delete)
+        @thumb_stored_file.should_receive(:delete)
         @uploader.remove!
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnicklas-carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: []