omnistore 0.0.8 → 0.0.9

data/lib/omnistore/storage/local.rb

@@ -15,8 +15,8 @@ module OmniStore
           @name
         end
 
-        def url
-          "file://#{dir}/"
+        def url(key = nil, options = {})
+          "file://#{dir}/#{key}"
         end
 
         def exist?(path)

data/lib/omnistore/storage/s3.rb

@@ -17,8 +17,12 @@ module OmniStore
           @name
         end
 
-        def url
-          bucket.url
+        def url(key = nil, options = {})
+          if key
+            bucket.objects[key].public_url(:secure => options[:secure] != false).to_s
+          else
+            bucket.url
+          end
         end
 
         def exist?(key)

data/lib/omnistore/version.rb

@@ -1,3 +1,3 @@
 module OmniStore
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/omnistore/storage/local_spec.rb

@@ -90,6 +90,20 @@ describe OmniStore::Storage::Local do
       its(:url)  { should eq "file://#{File.expand_path(TMPDIR)}/" }
     end
 
+    describe '#url' do
+      let(:key) { nil }
+      subject { OmniStore::Storage::Local.mountpoint.url(key) }
+
+      context 'when key is not specified' do
+        it { should eq "file://#{File.expand_path(MOUNTPOINT)}/" }
+      end
+
+      context 'when key specified' do
+        let(:key) { 'test' }
+        it { should eq "file://#{File.expand_path(MOUNTPOINT)}/#{key}" }
+      end
+    end
+
     describe '#move' do
       let(:src)   { t = Tempfile.new(TEST_FILENAME, MOUNTPOINT); File.basename(t.path) }
       let(:dst)   { TEST_FILENAME + Time.new.to_i.to_s }

data/spec/omnistore/storage/s3_spec.rb

@@ -3,30 +3,154 @@ require 'fileutils'
 
 describe "OmniStore::Storage::S3" do
 
+  def create_object(src, key = AWS_BUCKET)
+    OmniStore::Storage::S3.mountpoint(key).bucket.objects[src].write('Hello World!')
+  end
+
+  def delete_object(src, key = AWS_BUCKET)
+    OmniStore::Storage::S3.mountpoint(key).bucket.objects[src].delete
+  end
+
   before(:each) do
     OmniStore::Config.storage = 's3'
     OmniStore::Config.mountpoint = AWS_BUCKET
     OmniStore::Storage.remount!
   end
 
-  it 'should mount' do
-    OmniStore::Storage::S3.mount!.should_not be_nil
+  describe '#mount!' do
+    subject { lambda { OmniStore::Storage::S3.mount! } }
+
+    context 'when specified a bucket name that exists' do
+      it { should_not raise_error }
+    end
+
+    context 'when specified two bucket names that exists' do
+      before { OmniStore::Config.mountpoint = { :a => AWS_BUCKET, :b => AWS_BUCKET } }
+      it { should_not raise_error }
+    end
+
+    context 'when specified a bucket name that does not exists' do
+      before { OmniStore::Config.mountpoint = AWS_BUCKET + Time.new.to_i.to_s }
+      it { should raise_error OmniStore::Errors::InvalidMountpoint }
+    end
+  end
+
+  describe '#mountpoint' do
+    subject { OmniStore::Storage::S3.mountpoint }
+    it { should be_a OmniStore::Storage::S3::Mountpoint }
   end
 
-  it 'should raise error when mount fails' do
-    OmniStore::Config.mountpoint = "a"
-    lambda { OmniStore::Storage::S3.mount! }.should raise_error(OmniStore::Errors::InvalidMountpoint)
+  describe '#exist?' do
+    let(:src) { TEST_FILENAME }
+    subject { OmniStore::Storage::S3.exist?(src) }
+
+    context 'when specified a object that does not exist' do
+      it { should be_false } 
+    end
+
+    context 'when specified a object that exist' do
+      before { create_object(src) }
+      after  { delete_object(src) }
+      it { should be_true } 
+    end
   end
 
-  it 'should exist' do
-    key = 'test.txt'
-    OmniStore::Storage::S3.write(key, '')
-    begin
-      OmniStore::Storage::S3.exist?(key).should be_true
-      OmniStore::Storage::S3.exist?(key+'.bk').should be_false
-    ensure
-      OmniStore::Storage::S3.delete(key)
+  describe '#delete' do
+    let(:src) { TEST_FILENAME }
+    subject { lambda { OmniStore::Storage::S3.delete(src) } }
+
+    context 'when specified a object that does not exist' do
+      it { should_not raise_error } 
+    end
+
+    context 'when specified a object path that exist' do
+      before { create_object(src) }
+      it 'should delete object' do
+        should_not raise_error
+        OmniStore::Storage::S3.exist?(src).should be_false
+      end
     end
   end
 
+  describe '#each' do
+    subject { OmniStore::Storage::S3.each }
+    it { should be_a Enumerator }
+  end
+
+  describe 'OmniStore::Storage::S3::Mountpoint' do
+    subject { OmniStore::Storage::S3.mountpoint }
+
+    context 'when single mountpoit' do
+      its(:name) { should eq AWS_BUCKET }
+      its(:url)  { should match "#{AWS_BUCKET}" }
+    end
+
+    context 'when double mountpoint' do
+      before do
+        OmniStore::Config.mountpoint = { :a => AWS_BUCKET, :b => AWS_BUCKET }
+        OmniStore::Storage.remount!
+      end
+      subject { OmniStore::Storage::S3.mountpoint(:b) }
+
+      its(:name) { should eq :b }
+      its(:url)  { should match "#{AWS_BUCKET}" }
+    end
+
+    describe '#url' do
+      let(:key) { nil }
+      let(:options) { {} }
+      subject { OmniStore::Storage::S3.mountpoint.url(key, options) }
+
+      context 'when key is not specified' do
+        it { should match "#{AWS_BUCKET}" }
+      end
+
+      context 'when key specified' do
+        let(:key) { 'test' }
+        it { should match "#{AWS_BUCKET}.+/#{key}" }
+      end
+
+      context 'when secure is true' do
+        let(:key) { 'test' }
+        let(:options) { { :secure => true } }
+        it { should match "^https://.*#{AWS_BUCKET}.*/#{key}" }
+      end
+
+      context 'when secure is false' do
+        let(:key) { 'test' }
+        let(:options) { { :secure => false } }
+        it { should match "^http://.*#{AWS_BUCKET}.*/#{key}" }
+      end
+
+    end
+
+    describe '#move' do
+      let(:src) { TEST_FILENAME }
+      let(:dst)   { TEST_FILENAME + Time.new.to_i.to_s }
+      let(:other) { OmniStore::Storage::S3.mountpoint(:a) }
+      subject { lambda { OmniStore::Storage::S3.mountpoint.move(src, dst, other) } }
+
+      before do
+        OmniStore::Config.mountpoint = { :a => AWS_BUCKET, :b => AWS_BUCKET }
+        OmniStore::Storage.remount!
+      end
+ 
+      context 'when specified a object that does not exist' do
+        it { should raise_error AWS::S3::Errors::NoSuchKey } 
+      end
+
+      context 'when specified a object that exist' do
+        before { create_object(src, :a) }
+        after  { delete_object(dst, :a) }
+        it { should_not raise_error } 
+      end
+
+      context 'when move to another mountpoint' do
+        before { create_object(src, :a) }
+        after  { delete_object(dst, :b) }
+        let(:other) { OmniStore::Storage::S3.mountpoint(:b) }
+        it { should_not raise_error } 
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnistore
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1053533393
+      hash: -71898321
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1053533393
+      hash: -71898321
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24