remote_files 1.0.0 → 1.1.0

data/lib/remote_files.rb

@@ -63,6 +63,13 @@ module RemoteFiles
     true
   end
 
+  def self.delete!(file)
+    file.stored_in.each do |store_identifier|
+      store = lookup_store(store_identifier)
+      store.delete!(file.identifier)
+    end
+  end
+
   def self.synchronize!(file)
     file.missing_stores.each do |store_identifier|
       store = lookup_store(store_identifier)

data/lib/remote_files/abstract_store.rb

@@ -6,6 +6,14 @@ module RemoteFiles
       @identifier = identifier
     end
 
+    def options
+      @options ||= {}
+    end
+
+    def []=(name, value)
+      options[name] = value
+    end
+
     def store!(file)
       raise "You need to implement #{self.class.name}#store!"
     end
@@ -14,8 +22,26 @@ module RemoteFiles
       raise "You need to implement #{self.class.name}#retrieve!"
     end
 
+    def delete!(identifier)
+      raise "You need to implement #{self.class.name}#delete!"
+    end
+
     def url(identifier)
       raise "You need to implement #{self.class.name}#url"
     end
+
+    def url_matcher
+      raise "You need to implement #{self.class.name}:#url_matcher"
+    end
+
+    def file_from_url(url)
+      matched = url_matcher.match(url)
+
+      return nil unless matched
+
+      file_identifier = matched[1]
+
+      RemoteFiles::File.new(file_identifier, :stored_in => [identifier])
+    end
   end
 end

data/lib/remote_files/file.rb

@@ -10,6 +10,13 @@ module RemoteFiles
       @options      = options
     end
 
+    def self.from_url(url)
+      RemoteFiles.stores.each do |store|
+        file = store.file_from_url(url)
+        return file if file
+      end
+    end
+
     def options
       @options.merge(
         :identifier   => identifier,
@@ -55,5 +62,18 @@ module RemoteFiles
     def synchronize!
       RemoteFiles.synchronize!(self)
     end
+
+    def delete!
+      RemoteFiles.delete!(self)
+    end
+
+    def delete
+      begin
+        delete!
+        true
+      rescue RemoteFiles::Error => e
+        false
+      end
+    end
   end
 end

data/lib/remote_files/file_store.rb

@@ -0,0 +1,47 @@
+require 'pathname'
+
+# This is good for use in deveopment
+
+module RemoteFiles
+  class FileStore < AbstractStore
+
+    def directory
+      @directory ||= Pathname.new(options[:directory]).tap do |dir|
+        dir.mkdir unless dir.exist?
+        raise "#{dir} is not a directory" unless dir.directory?
+      end
+    end
+
+    def store!(file)
+      ::File.open(directory + file.identifier, 'w') do |f|
+        f.write(file.content)
+        # what about content-type?
+      end
+    end
+
+    def retrieve!(identifier)
+      content = File.new(directory + identifier).read
+
+      ::File.new(identifier,
+        :content      => content,
+        :stored_in    => [self.identifier]
+        # what about content-type? maybe use the mime-types gem?
+      )
+    rescue Errno::ENOENT => e
+      raise NotFoundError, e.message
+    end
+
+    def delete!(identifier)
+      ::File.delete(directory + identifier)
+    rescue Errno::ENOENT => e
+    end
+
+    def url(identifier)
+      "file://localhost/#{directory + identifier}"
+    end
+
+    def url_matcher
+      @url_matcher ||= /file:\/\/localhost\/#{directory}\/(.*)/
+    end
+  end
+end

data/lib/remote_files/fog_store.rb

@@ -43,12 +43,19 @@ module RemoteFiles
       end
     end
 
-    def options
-      @options ||= {}
+    def url_matcher
+      @url_matcher ||= case options[:provider]
+      when 'AWS'
+        /https?:\/\/s3[^\.]*.amazonaws.com\/#{options[:directory]}\/(.*)/
+      when 'Rackspace'
+        /https?:\/\/storage.cloudfiles.com\/#{options[:directory]}\/(.*)/
+      else
+        raise "#{self.class.name}#url_matcher was not implemented for the #{options[:provider]} provider"
+      end
     end
 
-    def []=(name, value)
-      options[name] = value
+    def delete!(identifier)
+      connection.delete_object(directory.key, identifier)
     end
 
     def connection

data/lib/remote_files/memory_store.rb

@@ -0,0 +1,46 @@
+# This is good for use in tests.
+# Be sure to call #clear! before each test run.
+
+module RemoteFiles
+  class MemoryStore < AbstractStore
+    def data
+      @data ||= {}
+    end
+
+    def clear!
+      data.clear
+    end
+
+    def self.clear!
+      RemoteFiles.stores.each do |store|
+        store.clear! if store.is_a?(RemoteFiles::MemoryStore)
+      end
+    end
+
+    def store!(file)
+      data[file.identifier] = { :content => file.content, :content_type => file.content_type}
+    end
+
+    def retrieve!(identifier)
+      raise NotFoundError, "#{identifier} not found in #{self.identifier} store" unless data.has_key?(identifier)
+
+      File.new(identifier,
+        :content      => data[identifier][:content],
+        :content_type => data[identifier][:content_type],
+        :stored_in    => [self.identifier]
+      )
+    end
+
+    def delete!(identifier)
+      data.delete(identifier)
+    end
+
+    def url(identifier)
+      "memory://#{self.identifier}/#{identifier}"
+    end
+
+    def url_matcher
+      @url_matcher ||= /memory:\/\/#{identifier}\/(.*)/
+    end
+  end
+end

data/lib/remote_files/mock_store.rb

@@ -1,25 +1,5 @@
-module RemoteFiles
-  class MockStore < AbstractStore
-    def data
-      @data ||= {}
-    end
-
-    def store!(file)
-      data[file.identifier] = { :content => file.content, :content_type => file.content_type}
-    end
-
-    def retrieve!(identifier)
-      raise NotFoundError, "#{identifier} not found in #{self.identifier} store" unless data.has_key?(identifier)
+require 'remote_files/memory_store'
 
-      File.new(identifier,
-        :content      => data[identifier][:content],
-        :content_type => data[identifier][:content_type],
-        :stored_in    => [self.identifier]
-      )
-    end
-
-    def url(identifier)
-      "mock://#{self.identifier}/#{identifier}"
-    end
-  end
+module RemoteFiles
+  MockStore = MemoryStore
 end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/test/file_test.rb

@@ -63,7 +63,7 @@ describe RemoteFiles::File do
     end
   end
 
-  describe 'current_url' do
+  describe '#current_url' do
     it 'should return the url from the first store where the file is currently stored' do
       @s3.stubs(:url).returns('s3_url')
       @cf.stubs(:url).returns('cf_url')
@@ -80,5 +80,13 @@ describe RemoteFiles::File do
       @file.stored_in.replace([])
       @file.current_url.must_be_nil
     end
+
+    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)
+        assert_equal @file, RemoteFiles::File.from_url(url)
+      end
+    end
   end
 end

data/test/fog_store_test.rb

@@ -105,4 +105,65 @@ describe RemoteFiles::FogStore do
       end
     end
   end
+
+  describe '#file_from_url' do
+    describe 'for an S3 store' do
+      before { @store[:provider] = 'AWS' }
+
+      it 'should create a file if the bucket matches' do
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/s3.txt')
+        assert file
+        assert_equal 'key/on/s3.txt', file.identifier
+
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/other_bucket/key/on/s3.txt')
+        assert !file
+
+        file = @store.file_from_url('http://storage.cloudfiles.com/directory/key/on/s3.txt')
+        assert !file
+      end
+    end
+
+    describe 'for a cloudfiles store' do
+      before { @store[:provider] = 'Rackspace' }
+
+      it 'should create a file if the container matches' do
+        file = @store.file_from_url('http://storage.cloudfiles.com/directory/key/on/s3.txt')
+        assert file
+        assert_equal 'key/on/s3.txt', file.identifier
+
+        file = @store.file_from_url('http://storage.cloudfiles.com/other_container/key/on/s3.txt')
+        assert !file
+
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/s3.txt')
+        assert !file
+      end
+    end
+
+    describe 'for other stores' do
+      before { @store[:provider] = 'Google' }
+
+      it 'should raise a RuntimeError' do
+        proc { @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/s3.txt') }.must_raise(RuntimeError)
+      end
+    end
+  end
+
+  describe '#delete!' do
+    before do
+      @store.directory.files.create(
+        :body         => 'content',
+        :content_type => 'text/plain',
+        :key          => 'identifier',
+      )
+    end
+
+    it 'should destroy the file' do
+      assert @store.directory.files.get('identifier')
+
+      @store.delete!('identifier')
+
+      assert !@store.directory.files.get('identifier')
+    end
+  end
+
 end

data/test/remote_files_test.rb

@@ -146,6 +146,15 @@ describe RemoteFiles do
     end
   end
 
+  describe '::delete!' 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)
+      RemoteFiles.delete!(@file)
+    end
+  end
+
   describe '::synchronize!' do
     describe 'when the file is not stored anywhere' do
       before { @file.stored_in.replace([]) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -117,7 +117,9 @@ extra_rdoc_files: []
 files:
 - lib/remote_files/abstract_store.rb
 - lib/remote_files/file.rb
+- lib/remote_files/file_store.rb
 - lib/remote_files/fog_store.rb
+- lib/remote_files/memory_store.rb
 - lib/remote_files/mock_store.rb
 - lib/remote_files/resque_job.rb
 - lib/remote_files/version.rb
@@ -142,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3554087706226059699
+      hash: -3981899794566552461
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3554087706226059699
+      hash: -3981899794566552461
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24