remote_files 1.4.2 → 1.5.0

data/lib/remote_files/abstract_store.rb

@@ -14,6 +14,10 @@ module RemoteFiles
       options[name] = value
     end
 
+    def directory_name
+      raise "You need to implement #{self.class.name}:#directory_name"
+    end
+
     def store!(file)
       raise "You need to implement #{self.class.name}#store!"
     end

data/lib/remote_files/configuration.rb

@@ -114,8 +114,7 @@ module RemoteFiles
     end
 
     def synchronize!(file)
-      file.missing_stores.each do |store_identifier|
-        store = lookup_store(store_identifier)
+      file.missing_stores.each do |store|
         store.store!(file)
         file.stored_in << store.identifier
       end

data/lib/remote_files/file.rb

@@ -37,8 +37,12 @@ module RemoteFiles
       missing_stores.empty?
     end
 
+    def stores
+      @stored_in.map { |store_id| configuration.lookup_store(store_id) }
+    end
+
     def missing_stores
-      configuration.stores.map(&:identifier) - @stored_in
+      configuration.stores - stores
     end
 
     def url(store_identifier = nil)
@@ -55,6 +59,21 @@ module RemoteFiles
       url(prioritized_stores[0])
     end
 
+    def retrieve!
+      stores.each do |store|
+        begin
+          file = store.retrieve!(identifier)
+          next unless file
+          @content      = file.content
+          @content_type = file.content_type
+          return true
+        rescue Error => e
+        end
+      end
+
+      raise NotFoundError
+    end
+
     def store!
       configuration.store!(self)
     end

data/lib/remote_files/file_store.rb

@@ -43,5 +43,9 @@ module RemoteFiles
     def url_matcher
       @url_matcher ||= /file:\/\/localhost#{directory}\/(.*)/
     end
+
+    def directory_name
+      options[:directory].to_s
+    end
   end
 end

data/lib/remote_files/fog_store.rb

@@ -35,9 +35,9 @@ module RemoteFiles
     def url(identifier)
       case options[:provider]
       when 'AWS'
-        "https://s3.amazonaws.com/#{options[:directory]}/#{Fog::AWS.escape(identifier)}"
+        "https://s3.amazonaws.com/#{directory_name}/#{Fog::AWS.escape(identifier)}"
       when 'Rackspace'
-        "https://storage.cloudfiles.com/#{options[:directory]}/#{Fog::Rackspace.escape(identifier, '/')}"
+        "https://storage.cloudfiles.com/#{directory_name}/#{Fog::Rackspace.escape(identifier, '/')}"
       else
         raise "#{self.class.name}#url was not implemented for the #{options[:provider]} provider"
       end
@@ -46,9 +46,9 @@ module RemoteFiles
     def url_matcher
       @url_matcher ||= case options[:provider]
       when 'AWS'
-        /https?:\/\/s3[^\.]*.amazonaws.com\/#{options[:directory]}\/(.*)/
+        /https?:\/\/s3[^\.]*.amazonaws.com\/#{directory_name}\/(.*)/
       when 'Rackspace'
-        /https?:\/\/storage.cloudfiles.com\/#{options[:directory]}\/(.*)/
+        /https?:\/\/storage.cloudfiles.com\/#{directory_name}\/(.*)/
       else
         raise "#{self.class.name}#url_matcher was not implemented for the #{options[:provider]} provider"
       end
@@ -65,6 +65,10 @@ module RemoteFiles
       @connection ||= Fog::Storage.new(connection_options)
     end
 
+    def directory_name
+      options[:directory]
+    end
+
     def directory
       @directory ||= lookup_directory || create_directory
     end
@@ -72,12 +76,12 @@ module RemoteFiles
     protected
 
     def lookup_directory
-      connection.directories.get(options[:directory])
+      connection.directories.get(directory_name)
     end
 
     def create_directory
       connection.directories.new(
-        :key => options[:directory],
+        :key => directory_name,
         :public => options[:public]
       ).tap do |dir|
         dir.save

data/lib/remote_files/memory_store.rb

@@ -34,6 +34,10 @@ module RemoteFiles
       )
     end
 
+    def directory_name
+      self.identifier.to_s
+    end
+
     def delete!(identifier)
       data.delete(identifier)
     end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 end

data/test/file_store_test.rb

@@ -79,4 +79,10 @@ describe RemoteFiles::FileStore do
     end
   end
 
+  describe '#directory_name' do
+    it 'returns the name of the directory' do
+      @store.directory_name.must_equal @directory.to_s
+    end
+  end
+
 end

data/test/file_test.rb

@@ -37,10 +37,17 @@ describe RemoteFiles::File do
     end
   end
 
+  describe '#stores' do
+    it 'should give an array of stores where the file is stored' do
+      @file.stored_in.replace([:s3])
+      @file.stores.must_equal([@s3])
+    end
+  end
+
   describe '#missing_stores' do
-    it 'should give an array of store identifiers where the file is not stored' do
+    it 'should give an array of stores where the file is not stored' do
       @file.stored_in.replace([:s3])
-      @file.missing_stores.must_equal([:cf])
+      @file.missing_stores.must_equal([@cf])
     end
   end
 
@@ -103,4 +110,39 @@ describe RemoteFiles::File do
       @file.delete!
     end
   end
+
+  describe '#retrieve!' do
+    before do
+      @file_with_content = RemoteFiles::File.new('identifier', :content => 'content', :content_type => 'content_type')
+
+      @store = stub
+      @file.stubs(:stores).returns([@store])
+    end
+
+    describe 'when the file is found' do
+      before do
+        @store.expects(:retrieve!).returns(@file_with_content)
+      end
+
+      it 'fills in the content and content_type' do
+        @file.content.must_be_nil
+        @file.content_type.must_be_nil
+
+        @file.retrieve!
+
+        @file.content.must_equal 'content'
+        @file.content_type.must_equal 'content_type'
+      end
+    end
+
+    describe 'when the file is not found' do
+      before do
+        @store.expects(:retrieve!).returns(nil)
+      end
+
+      it 'raises a NotFoundError' do
+        proc { @file.retrieve! }.must_raise(RemoteFiles::NotFoundError)
+      end
+    end
+  end
 end

data/test/fog_store_test.rb

@@ -174,4 +174,10 @@ describe RemoteFiles::FogStore do
     end
   end
 
+  describe '#directory_name' do
+    it 'returns the name of the directory' do
+      @store.directory_name.must_equal 'directory'
+    end
+  end
+
 end

data/test/memory_store_test.rb

@@ -68,4 +68,11 @@ describe RemoteFiles::MemoryStore do
     end
   end
 
+
+  describe '#directory_name' do
+    it 'returns the store identifier' do
+      @store.directory_name.must_equal 'mem'
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -343498225094597126
+      hash: 708350776970309851
 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: -343498225094597126
+      hash: 708350776970309851
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24