remote_files 1.1.0 → 1.2.0

data/lib/remote_files/file_store.rb

@@ -13,16 +13,16 @@ module RemoteFiles
     end
 
     def store!(file)
-      ::File.open(directory + file.identifier, 'w') do |f|
+      (directory + file.identifier).open('w') do |f|
         f.write(file.content)
         # what about content-type?
       end
     end
 
     def retrieve!(identifier)
-      content = File.new(directory + identifier).read
+      content = (directory + identifier).read
 
-      ::File.new(identifier,
+      RemoteFiles::File.new(identifier,
         :content      => content,
         :stored_in    => [self.identifier]
         # what about content-type? maybe use the mime-types gem?
@@ -32,16 +32,16 @@ module RemoteFiles
     end
 
     def delete!(identifier)
-      ::File.delete(directory + identifier)
+      (directory + identifier).delete
     rescue Errno::ENOENT => e
     end
 
     def url(identifier)
-      "file://localhost/#{directory + identifier}"
+      "file://localhost#{directory + identifier}"
     end
 
     def url_matcher
-      @url_matcher ||= /file:\/\/localhost\/#{directory}\/(.*)/
+      @url_matcher ||= /file:\/\/localhost#{directory}\/(.*)/
     end
   end
 end

data/lib/remote_files/version.rb

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

data/lib/remote_files.rb

@@ -22,6 +22,30 @@ module RemoteFiles
     STORES_MAP[store_identifier] = store
   end
 
+  def self.configure(hash)
+    hash.each do |store_identifier, config|
+      #symbolize_keys!
+      config.each { |name, value| config[name.to_sym] = config.delete(name) }
+
+      #camelize
+      type = config[:type].gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } + 'Store'
+
+      klass = RemoteFiles.const_get(type) rescue nil
+      unless klass
+        require "remote_files/#{config[:type]}_store"
+        klass = RemoteFiles.const_get(type)
+      end
+
+      config.delete(:type)
+
+      add_store(store_identifier.to_sym, :class => klass, :primary => !!config.delete(:primary)) do |store|
+        config.each do |name, value|
+          store[name] = value
+        end
+      end
+    end
+  end
+
   def self.stores
     raise "You need to configure add stores to RemoteFiles using 'RemoteFiles.add_store'" if STORES.empty?
     STORES

data/test/file_store_test.rb

@@ -0,0 +1,82 @@
+require_relative 'test_helper'
+require 'remote_files/file_store'
+
+describe RemoteFiles::FileStore do
+  before do
+    @directory = Pathname.new(File.dirname(__FILE__)) + '../tmp'
+
+    @store = RemoteFiles::FileStore.new(:file)
+    @store[:directory] = @directory
+  end
+
+  describe '#store!' do
+    before do
+      @file = RemoteFiles::File.new('identifier', :content_type => 'text/plain', :content => 'content')
+    end
+
+    it 'should store the file on disk' do
+      @store.store!(@file)
+
+      file_path = @directory + 'identifier'
+      file_path.exist?
+
+      assert_equal 'content', file_path.read
+    end
+  end
+
+  describe '#retrieve!' do
+    it 'should return a RemoteFiles::File when found' do
+      (@store.directory + 'identifier').open('w') do |f|
+        f.write('content')
+      end
+
+      file = @store.retrieve!('identifier')
+
+      file.must_be_instance_of(RemoteFiles::File)
+      file.content.must_equal('content')
+      # file.content_type.must_equal('text/plain')
+    end
+
+    it 'should raise a RemoteFiles::NotFoundError when not found' do
+      (@store.directory + 'identifier').delete rescue nil
+      proc { @store.retrieve!('identifier') }.must_raise(RemoteFiles::NotFoundError)
+    end
+  end
+
+  describe '#url' do
+    it 'should return a file url' do
+      @store.url('identifier').must_equal("file://localhost#{@directory}/identifier")
+    end
+  end
+
+  describe '#file_from_url' do
+    it 'should create a file if the directory matches' do
+      file = @store.file_from_url("file://localhost#{@directory}/identifier")
+      assert file
+      assert_equal 'identifier', file.identifier
+
+      file = @store.file_from_url("file://localhost#{@directory}_other/identifier")
+      assert !file
+
+      file = @store.file_from_url('https://s3.amazonaws.com/mem/identifier')
+      assert !file
+    end
+  end
+
+  describe '#delete!' do
+    before do
+      (@store.directory + 'identifier').open('w') do |f|
+        f.write('content')
+      end
+    end
+
+    it 'should destroy the file' do
+      assert (@store.directory + 'identifier').exist?
+
+      @store.delete!('identifier')
+
+      assert !(@store.directory + 'identifier').exist?
+    end
+  end
+
+end

data/test/fog_store_test.rb

@@ -111,14 +111,14 @@ describe RemoteFiles::FogStore 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')
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/cloud.txt')
         assert file
-        assert_equal 'key/on/s3.txt', file.identifier
+        assert_equal 'key/on/cloud.txt', file.identifier
 
-        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/other_bucket/key/on/s3.txt')
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/other_bucket/key/on/cloud.txt')
         assert !file
 
-        file = @store.file_from_url('http://storage.cloudfiles.com/directory/key/on/s3.txt')
+        file = @store.file_from_url('http://storage.cloudfiles.com/directory/key/on/cloud.txt')
         assert !file
       end
     end
@@ -127,14 +127,14 @@ describe RemoteFiles::FogStore 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')
+        file = @store.file_from_url('http://storage.cloudfiles.com/directory/key/on/cloud.txt')
         assert file
-        assert_equal 'key/on/s3.txt', file.identifier
+        assert_equal 'key/on/cloud.txt', file.identifier
 
-        file = @store.file_from_url('http://storage.cloudfiles.com/other_container/key/on/s3.txt')
+        file = @store.file_from_url('http://storage.cloudfiles.com/other_container/key/on/cloud.txt')
         assert !file
 
-        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/s3.txt')
+        file = @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/cloud.txt')
         assert !file
       end
     end
@@ -143,7 +143,7 @@ describe RemoteFiles::FogStore 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)
+        proc { @store.file_from_url('http://s3-eu-west-1.amazonaws.com/directory/key/on/cloud.txt') }.must_raise(RuntimeError)
       end
     end
   end

data/test/memory_store_test.rb

@@ -0,0 +1,71 @@
+require_relative 'test_helper'
+require 'remote_files/memory_store'
+
+describe RemoteFiles::MemoryStore do
+  before do
+    @store = RemoteFiles::MemoryStore.new(:mem)
+  end
+
+  describe '#store!' do
+    before do
+      @file = RemoteFiles::File.new('identifier', :content_type => 'text/plain', :content => 'content')
+    end
+
+    it 'should store the file in the memory' do
+      @store.store!(@file)
+
+      assert_equal({:content_type => 'text/plain', :content => 'content'}, @store.data['identifier'])
+    end
+  end
+
+  describe '#retrieve!' do
+    it 'should return a RemoteFiles::File when found' do
+      @store.data['identifier'] = {:content_type => 'text/plain', :content => 'content'}
+
+      file = @store.retrieve!('identifier')
+
+      file.must_be_instance_of(RemoteFiles::File)
+      file.content.must_equal('content')
+      file.content_type.must_equal('text/plain')
+    end
+
+    it 'should raise a RemoteFiles::NotFoundError when not found' do
+      proc { @store.retrieve!('identifier') }.must_raise(RemoteFiles::NotFoundError)
+    end
+  end
+
+  describe '#url' do
+    it 'should return a fake memory url' do
+      @store.url('identifier').must_equal('memory://mem/identifier')
+    end
+  end
+
+  describe '#file_from_url' do
+    it 'should create a file if the store identifier matches' do
+      file = @store.file_from_url('memory://mem/identifier')
+      assert file
+      assert_equal 'identifier', file.identifier
+
+      file = @store.file_from_url('memory://other_store/identifier')
+      assert !file
+
+      file = @store.file_from_url('https://s3.amazonaws.com/mem/identifier')
+      assert !file
+    end
+  end
+
+  describe '#delete!' do
+    before do
+      @store.data['identifier'] = {:content_type => 'text/plain', :content => 'content'}
+    end
+
+    it 'should destroy the file' do
+      assert @store.data['identifier']
+
+      @store.delete!('identifier')
+
+      assert !@store.data['identifier']
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -124,8 +124,10 @@ files:
 - lib/remote_files/resque_job.rb
 - lib/remote_files/version.rb
 - lib/remote_files.rb
+- test/file_store_test.rb
 - test/file_test.rb
 - test/fog_store_test.rb
+- test/memory_store_test.rb
 - test/remote_files_test.rb
 - test/resque_job_test.rb
 - test/test_helper.rb
@@ -144,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3981899794566552461
+      hash: 816766500051184913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3981899794566552461
+      hash: 816766500051184913
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -163,8 +165,10 @@ summary: The purpose of the library is to implement a simple interface for uploa
   files to multiple backends and to keep the backends in sync, so that your app will
   keep working when one backend is down.
 test_files:
+- test/file_store_test.rb
 - test/file_test.rb
 - test/fog_store_test.rb
+- test/memory_store_test.rb
 - test/remote_files_test.rb
 - test/resque_job_test.rb
 - test/test_helper.rb