remote_files 1.3.3 → 1.3.4

data/lib/remote_files/configuration.rb

@@ -103,6 +103,10 @@ module RemoteFiles
     end
 
     def delete!(file)
+      RemoteFiles.delete_file(file)
+    end
+
+    def delete_now!(file)
       file.stored_in.each do |store_identifier|
         store = lookup_store(store_identifier)
         store.delete!(file.identifier)

data/lib/remote_files/file.rb

@@ -63,7 +63,7 @@ module RemoteFiles
     end
 
     def delete!
-      delete_now!
+      configuration.delete!(self)
     end
 
     def delete
@@ -76,7 +76,7 @@ module RemoteFiles
     end
 
     def delete_now!
-      configuration.delete!(self)
+      configuration.delete_now!(self)
     end
   end
 end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/lib/remote_files.rb

@@ -59,7 +59,7 @@ module RemoteFiles
       if @delete_file
         @delete_file.call(file)
       else
-        file.delete_now!(file)
+        file.delete_now!
       end
     elsif block_given?
       @delete_file = block

data/test/configuration_test.rb

@@ -131,12 +131,37 @@ describe RemoteFiles::Configuration do
     end
   end
 
-  describe '::delete!' do
+  describe '::delete_now!' do
     it 'should delete the file from all the stores' do
       @file.stored_in.replace([:mock1, :mock2])
       @mock_store1.expects(:delete!).with(@file.identifier)
       @mock_store2.expects(:delete!).with(@file.identifier)
-      @configuration.delete!(@file)
+      @configuration.delete_now!(@file)
+    end
+  end
+
+  describe '::delete!' do
+    describe 'when no handler has been defined' do
+      before do
+        RemoteFiles.instance_variable_set(:@delete_file, nil)
+      end
+
+      it 'deletes the file' do
+        @file.expects(:delete_now!)
+        @configuration.delete!(@file)
+      end
+    end
+
+    describe 'when a handler is defined' do
+      before do
+        @deleted_files = []
+        RemoteFiles.delete_file { |file| @deleted_files << file }
+      end
+
+      it 'should call the handler' do
+        @configuration.delete!(@file)
+        @deleted_files.must_equal [@file]
+      end
     end
   end
 

data/test/file_test.rb

@@ -89,4 +89,18 @@ describe RemoteFiles::File do
       end
     end
   end
+
+  describe '#delete_now!' do
+    it 'asks the configuration to delete the file' do
+      @file.configuration.expects(:delete_now!).with(@file).returns(true)
+      @file.delete_now!
+    end
+  end
+
+  describe '#delete!' do
+    it 'asks the configuration to delete the file' do
+      @file.configuration.expects(:delete!).with(@file).returns(true)
+      @file.delete!
+    end
+  end
 end

data/test/resque_job_test.rb

@@ -65,7 +65,7 @@ describe RemoteFiles::ResqueJob do
       RemoteFiles::ResqueJob.perform(@options.merge(:_action => :synchronize))
     end
 
-    it 'should call #synchronize! on the reconstructed file when asked to' do
+    it 'should call #delete_now! on the reconstructed file when asked to' do
       @file.expects(:delete_now!)
 
       RemoteFiles::ResqueJob.perform(@options.merge(:_action => :delete))

data/test/test_helper.rb

@@ -19,9 +19,10 @@ MiniTest::Spec.class_eval do
       conf.clear
     end
 
-    $syncs = []
     RemoteFiles.synchronize_stores do |file|
-      $syncs << {:identifier => file.identifier, :missing_stores => file.missing_stores}
+    end
+
+    RemoteFiles.delete_file do |file|
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3612222537816062651
+      hash: -1615496902750922328
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3612222537816062651
+      hash: -1615496902750922328
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24