remote_files 1.3.1 → 1.3.2

data/lib/remote_files.rb

@@ -45,7 +45,7 @@ module RemoteFiles
       if @synchronize_stores
         @synchronize_stores.call(file)
       else
-        synchronize!(file)
+        file.synchronize!(file)
       end
     elsif block_given?
       @synchronize_stores = block
@@ -53,4 +53,18 @@ module RemoteFiles
       raise "invalid call to RemoteFiles.synchronize_stores"
     end
   end
+
+  def self.delete_file(file = nil, &block)
+    if file
+      if @delete_file
+        @delete_file.call(file)
+      else
+        file.delete_now!(file)
+      end
+    elsif block_given?
+      @delete_file = block
+    else
+      raise "invalid call to RemoteFiles.delete_file"
+    end
+  end
 end

data/lib/remote_files/abstract_store.rb

@@ -34,14 +34,14 @@ module RemoteFiles
       raise "You need to implement #{self.class.name}:#url_matcher"
     end
 
-    def file_from_url(url)
+    def file_from_url(url, options = {})
       matched = url_matcher.match(url)
 
       return nil unless matched
 
       file_identifier = matched[1]
 
-      RemoteFiles::File.new(file_identifier, :stored_in => [identifier])
+      RemoteFiles::File.new(file_identifier, options.merge(:stored_in => [identifier]))
     end
   end
 end

data/lib/remote_files/configuration.rb

@@ -119,7 +119,7 @@ module RemoteFiles
 
     def file_from_url(url)
       stores.each do |store|
-        file = store.file_from_url(url)
+        file = store.file_from_url(url, :configuration => name)
         return file if file
       end
     end

data/lib/remote_files/file.rb

@@ -63,7 +63,7 @@ module RemoteFiles
     end
 
     def delete!
-      configuration.delete!(self)
+      delete_now!
     end
 
     def delete
@@ -74,5 +74,9 @@ module RemoteFiles
         false
       end
     end
+
+    def delete_now!
+      configuration.delete!(self)
+    end
   end
 end

data/lib/remote_files/resque_job.rb

@@ -4,12 +4,26 @@ require 'resque'
 module RemoteFiles
   class ResqueJob
     def self.perform(options)
+      action = options.delete(:_action)
+
       file = RemoteFiles::File.new(options.delete(:identifier), options)
-      file.synchronize!
+
+      case action
+      when :synchronize
+        file.synchronize!
+      when :delete
+        file.delete_now!(file)
+      else
+        raise "unknown action #{action.inspect}"
+      end
     end
   end
 
   synchronize_stores do |file|
-    Resque.enqueue(ResqueJob, file.options)
+    Resque.enqueue(ResqueJob, file.options.merge(:_action => :synchronize))
+  end
+
+  delete_file do |file|
+    Resque.enqueue(ResqueJob, file.options.merge(:_action => :delete))
   end
 end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/test/configuration_test.rb

@@ -175,4 +175,12 @@ describe RemoteFiles::Configuration do
     end
   end
 
+  describe '#file_from_url' do
+    it 'should return a file from this configuration' do
+      file = @configuration.file_from_url('memory://mock2/foo')
+      assert file
+      file.configuration.must_equal @configuration
+    end
+  end
+
 end

data/test/file_test.rb

@@ -84,7 +84,7 @@ describe RemoteFiles::File do
     describe '::from_url' do
       it 'should return a file from the first store that matches' do
         url = 'http://something'
-        @cf.expects(:file_from_url).with(url).returns(@file)
+        @cf.expects(:file_from_url).with(url, :configuration => :default).returns(@file)
         assert_equal @file, RemoteFiles::File.from_url(url)
       end
     end

data/test/resque_job_test.rb

@@ -3,45 +3,73 @@ require 'remote_files/resque_job'
 
 describe RemoteFiles::ResqueJob do
   describe 'loading the implementation file' do
-    before { load 'remote_files/resque_job.rb' }
+    before do
+      @file = RemoteFiles::File.new('identifier',
+        :content_type => 'text/plain',
+        :content      => 'content',
+        :stored_in    => [:s3],
+        :foo          => :bar
+      )
+
+      load 'remote_files/resque_job.rb'
+    end
 
     it 'should setup the right synchronize_stores hook' do
-      file = RemoteFiles::File.new('identifier',
-        :content_type => 'text/plain',
-        :content => 'content',
-        :stored_in => [:s3],
-        :foo => :bar
+      Resque.expects(:enqueue).with(RemoteFiles::ResqueJob,
+        :identifier    => 'identifier',
+        :content_type  => 'text/plain',
+        :stored_in     => [:s3],
+        :foo           => :bar,
+        :configuration => :default,
+        :_action       => :synchronize
       )
 
+      RemoteFiles.synchronize_stores(@file)
+    end
+
+    it 'should setup the right delete_file hook' do
       Resque.expects(:enqueue).with(RemoteFiles::ResqueJob,
-        :identifier => 'identifier',
-        :content_type => 'text/plain',
-        :stored_in => [:s3],
-        :foo => :bar,
-        :configuration => :default
+        :identifier    => 'identifier',
+        :content_type  => 'text/plain',
+        :stored_in     => [:s3],
+        :foo           => :bar,
+        :configuration => :default,
+        :_action       => :delete
       )
 
-      RemoteFiles.synchronize_stores(file)
+      RemoteFiles.delete_file(@file)
     end
   end
 
-  it 'should call #synchronize! on the reconstructed file' do
-    options = {
-      :identifier => 'identifier',
-      :content_type => 'text/plain',
-      :stored_in => [:s3],
-      :foo => :bar
-    }
+  describe "running the job" do
+    before do
+      @options = {
+        :identifier   => 'identifier',
+        :content_type => 'text/plain',
+        :stored_in    => [:s3],
+        :foo          => :bar
+      }
 
-    file = stub
-    file.expects(:synchronize!)
+      @file = stub
 
-    RemoteFiles::File.expects(:new).with('identifier',
-      :content_type => 'text/plain',
-      :stored_in => [:s3],
-      :foo => :bar
-    ).returns(file)
+      RemoteFiles::File.expects(:new).with('identifier',
+        :content_type => 'text/plain',
+        :stored_in    => [:s3],
+        :foo          => :bar
+      ).returns(@file)
+    end
 
-    RemoteFiles::ResqueJob.perform(options)
+    it 'should call #synchronize! on the reconstructed file when asked to' do
+      @file.expects(:synchronize!)
+
+      RemoteFiles::ResqueJob.perform(@options.merge(:_action => :synchronize))
+    end
+
+    it 'should call #synchronize! on the reconstructed file when asked to' do
+      @file.expects(:delete_now!)
+
+      RemoteFiles::ResqueJob.perform(@options.merge(:_action => :delete))
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-11 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: 4069569723129805523
+      hash: 2988257809019653015
 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: 4069569723129805523
+      hash: 2988257809019653015
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24