remote_files 1.6.0 → 1.6.1

data/lib/remote_files/configuration.rb

@@ -116,10 +116,21 @@ module RemoteFiles
     end
 
     def delete_now!(file)
+      exceptions = []
       file.stored_in.each do |store_identifier|
         store = lookup_store(store_identifier)
-        store.delete!(file.identifier)
+        begin
+          store.delete!(file.identifier)
+        rescue NotFoundError => e
+          exceptions << e
+        end
+      end
+
+      if exceptions.size == file.stored_in.size # they all failed
+        raise exceptions.first
       end
+
+      true
     end
 
     def synchronize!(file)

data/lib/remote_files/file_store.rb

@@ -32,13 +32,14 @@ module RemoteFiles
         :stored_in    => [self]
         # what about content-type? maybe use the mime-types gem?
       )
-    rescue Errno::ENOENT => e
-      raise NotFoundError, e.message
+    rescue Errno::ENOENT
+      raise NotFoundError, $!.message, $!.backtrace
     end
 
     def delete!(identifier)
       (directory + identifier).delete
-    rescue Errno::ENOENT => e
+    rescue Errno::ENOENT
+      raise NotFoundError, $!.message, $!.backtrace
     end
 
     def url(identifier)

data/lib/remote_files/fog_store.rb

@@ -56,6 +56,8 @@ module RemoteFiles
 
     def delete!(identifier)
       connection.delete_object(directory.key, identifier)
+    rescue Fog::Errors::NotFound, Excon::Errors::NotFound
+      raise NotFoundError, $!.message, $!.backtrace
     end
 
     def connection

data/lib/remote_files/memory_store.rb

@@ -39,6 +39,7 @@ module RemoteFiles
     end
 
     def delete!(identifier)
+      raise NotFoundError, "#{identifier} not found in #{self.identifier} store" unless data.has_key?(identifier)
       data.delete(identifier)
     end
 

data/lib/remote_files/resque_job.rb

@@ -13,7 +13,10 @@ module RemoteFiles
       when :synchronize
         file.synchronize!
       when :delete
-        file.delete_now!
+        begin
+          file.delete_now!
+        rescue NotFoundError
+        end
       else
         raise "unknown action #{action.inspect}"
       end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/test/configuration_test.rb

@@ -158,11 +158,41 @@ describe RemoteFiles::Configuration do
   end
 
   describe '::delete_now!' do
-    it 'should delete the file from all the stores' do
+    before do
       @file.stored_in.replace([:mock1, :mock2])
-      @mock_store1.expects(:delete!).with(@file.identifier)
-      @mock_store2.expects(:delete!).with(@file.identifier)
-      @configuration.delete_now!(@file)
+    end
+
+    describe 'when the file is in all of stores' do
+      before do
+        @mock_store1.data[@file.identifier] = {:content_type => 'text/plain', :content => 'content'}
+        @mock_store2.data[@file.identifier] = {:content_type => 'text/plain', :content => 'content'}
+      end
+
+      it 'should delete the file from all the stores' do
+        @configuration.delete_now!(@file)
+        @mock_store1.data.has_key?(@file.identifier).must_equal false
+        @mock_store2.data.has_key?(@file.identifier).must_equal false
+      end
+    end
+
+    describe 'when the file is in some of stores' do
+      before do
+        @mock_store2.data[@file.identifier] = {:content_type => 'text/plain', :content => 'content'}
+      end
+
+      it 'should delete the file from all the stores' do
+        @configuration.delete_now!(@file)
+        @mock_store1.data.has_key?(@file.identifier).must_equal false
+        @mock_store2.data.has_key?(@file.identifier).must_equal false
+      end
+    end
+
+    describe 'when the file is in none of stores' do
+      it 'raises a NotFoundError' do
+        lambda { @configuration.delete_now!(@file) }.must_raise(RemoteFiles::NotFoundError)
+        @mock_store1.data.has_key?(@file.identifier).must_equal false
+        @mock_store2.data.has_key?(@file.identifier).must_equal false
+      end
     end
   end
 

data/test/file_store_test.rb

@@ -70,6 +70,10 @@ describe RemoteFiles::FileStore do
       end
     end
 
+    it 'raises a NotFoundError if the file does not exist' do
+      lambda { @store.delete!('unknown') }.must_raise(RemoteFiles::NotFoundError)
+    end
+
     it 'should destroy the file' do
       assert (@store.directory + 'identifier').exist?
 

data/test/fog_store_test.rb

@@ -165,6 +165,11 @@ describe RemoteFiles::FogStore do
       )
     end
 
+    it 'raises a NotFoundError if the file does not exist' do
+      @store.directory.key = 'unknown' # to force an exception out of the fog
+      lambda { @store.delete!('unknown') }.must_raise(RemoteFiles::NotFoundError)
+    end
+
     it 'should destroy the file' do
       assert @store.directory.files.get('identifier')
 

data/test/memory_store_test.rb

@@ -59,6 +59,10 @@ describe RemoteFiles::MemoryStore do
       @store.data['identifier'] = {:content_type => 'text/plain', :content => 'content'}
     end
 
+    it 'raises a NotFoundError if the file does not exist' do
+      lambda { @store.delete!('unknown') }.must_raise(RemoteFiles::NotFoundError)
+    end
+
     it 'should destroy the file' do
       assert @store.data['identifier']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -146,18 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 424450237323346317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 424450237323346317
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24