remote_files 1.2.1 → 1.2.2

data/lib/remote_files/fog_store.rb

@@ -66,11 +66,22 @@ module RemoteFiles
     end
 
     def directory
-      @directory ||= connection.directories.new(
-        :key    => options[:directory],
-        :public => options[:public]
-      )
+      @directory ||= lookup_directory || create_directory
+    end
+
+    protected
+
+    def lookup_directory
+      connection.directories.get(options[:directory])
     end
 
+    def create_directory
+      connection.directories.new(
+        :key => options[:directory],
+        :public => options[:public]
+      ).tap do |dir|
+        dir.save
+      end
+    end
   end
 end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/test/fog_store_test.rb

@@ -8,8 +8,6 @@ describe RemoteFiles::FogStore do
       :aws_secret_access_key => 'secret_access_key'
     })
 
-    @directory = @connection.directories.create(:key => 'directory')
-
     @store = RemoteFiles::FogStore.new(:fog)
     @store[:provider] = 'AWS'
     @store[:aws_access_key_id]     = 'access_key_id'
@@ -32,6 +30,16 @@ describe RemoteFiles::FogStore do
 
       directory.key.must_equal('directory')
     end
+
+    it 'should create the remote directory if it does not exist' do
+      assert_nil @connection.directories.get('directory')
+
+      directory = @store.directory
+      assert directory
+      assert_equal 'directory', directory.key
+
+      assert @connection.directories.get('directory')
+    end
   end
 
   describe '#store!' do
@@ -42,7 +50,7 @@ describe RemoteFiles::FogStore do
     it 'should store the file in the directory' do
       @store.store!(@file)
 
-      fog_file = @directory.files.get('identifier')
+      fog_file = @store.directory.files.get('identifier')
 
       fog_file.must_be_instance_of(Fog::Storage::AWS::File)
       fog_file.content_type.must_equal('text/plain')
@@ -50,14 +58,14 @@ describe RemoteFiles::FogStore do
     end
 
     it 'should raise a RemoteFiles::Error when an error happens' do
-      @directory.destroy
+      @store.directory.destroy
       proc { @store.store!(@file) }.must_raise(RemoteFiles::Error)
     end
   end
 
   describe '#retrieve!' do
     it 'should return a RemoteFiles::File when found' do
-      @directory.files.create(
+      @store.directory.files.create(
         :body         => 'content',
         :content_type => 'text/plain',
         :key          => 'identifier'
@@ -75,7 +83,7 @@ describe RemoteFiles::FogStore do
     end
 
     it 'should raise a RemoteFiles::Error when error' do
-      @directory.destroy
+      @store.directory.destroy
       proc { @store.retrieve!('identifier') }.must_raise(RemoteFiles::Error)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2511634523792852721
+      hash: 3219444270301945371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2511634523792852721
+      hash: 3219444270301945371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24