carrierwave 0.2.3 → 0.2.4

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: 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-13 00:00:00 +02:00
+date: 2009-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: []