omnistore 0.0.4 → 0.0.5

data/lib/omnistore/storage/local.rb

@@ -6,8 +6,17 @@ module OmniStore
       class Mountpoint
         attr_reader :dir
 
-        def initialize(dir)
-          @dir = dir
+        def initialize(name, dir)
+          @name = name
+          @dir  = dir
+        end
+
+        def name
+          @name
+        end
+
+        def url
+          "file://#{dir}"
         end
 
         def exist?(path)
@@ -34,22 +43,30 @@ module OmniStore
       def mount!
         @@mountpoint = {}
         case mountpoint = OmniStore::Config.mountpoint
-        when Array then mountpoint.each {|m| validate(m); @@mountpoint[m] = Mountpoint.new(m) }
-        when Hash  then mountpoint.each {|k,v| validate(v); @@mountpoint[k] = Mountpoint.new(v) }
-        else m = mountpoint.to_s; validate(m); @@mountpoint[m] = Mountpoint.new(m)
+        when Array then mountpoint.each {|m| validate(m); @@mountpoint[m] = Mountpoint.new(File.basename(m), m) }
+        when Hash  then mountpoint.each {|k,v| validate(v); @@mountpoint[k] = Mountpoint.new(k, v) }
+        else m = mountpoint.to_s; validate(m); @@mountpoint[m] = Mountpoint.new(File.basename(m), m)
         end
       end
 
-      def mountpoint(key)
+      def mountpoint(key = @@mountpoint.keys[0])
         @@mountpoint[key]
       end
 
-      def exist?(path)
-        @@mountpoint.values.find {|m| m.exist?(path) }
+      def exist?(path, mp = mountpoint)
+        mp.exist?(path)
       end
 
-      def delete(path)
-        @@mountpoint.values.each {|m| m.delete(path) }
+      def delete(path, mp = mountpoint)
+        mp.delete(path)
+      end
+
+      def each(&block)
+        if block_given?
+          @@mountpoint.each{|m| yield m }
+        else
+          Enumerator.new(@@mountpoint.values)
+        end
       end
 
       private

data/lib/omnistore/storage/s3.rb

@@ -8,10 +8,19 @@ module OmniStore
       class Mountpoint
         attr_reader :bucket
 
-        def initialize(bucket)
+        def initialize(name, bucket)
+          @name   = name
           @bucket = bucket
         end
 
+        def name
+          @name
+        end
+
+        def url
+          bucket.url
+        end
+
         def exist?(key)
           bucket.objects[key].exists?
         end
@@ -20,7 +29,7 @@ module OmniStore
           bucket.objects[key].delete(options)
         end
 
-        def write(key, options_or_data = nil, options = nil)
+        def write(key, options_or_data = nil, options = {})
           bucket.objects[key].write(options_or_data, options)
         end
 
@@ -33,27 +42,35 @@ module OmniStore
       def mount!
         @@buckets = {}
         case mountpoint = OmniStore::Config.mountpoint
-        when Array then mountpoint.each {|m| b = validate(m); @@buckets[m] = Mountpoint.new(b) }
-        when Hash  then mountpoint.each {|k,v| b = validate(v); @@buckets[k] = Mountpoint.new(b) }
-        else m = mountpoint.to_s; b = validate(m); @@buckets[m] = Mountpoint.new(b)
+        when Array then mountpoint.each {|m| b = validate(m); @@buckets[m] = Mountpoint.new(m, b) }
+        when Hash  then mountpoint.each {|k,v| b = validate(v); @@buckets[k] = Mountpoint.new(k, b) }
+        else m = mountpoint.to_s; b = validate(m); @@buckets[m] = Mountpoint.new(m, b)
         end
       end
 
-      def mountpoint(key)
+      def mountpoint(key = @@buckets.keys[0])
         @@buckets[key]
       end
 
-      def exist?(path)
-        @@buckets.values.find {|b| b.exist?(path) }
+      def exist?(path, mp = mountpoint)
+        mp.exist?(path)
       end
       alias :find :exist?
 
-      def delete(path, options = {})
-        @@buckets.values.each {|b| b.delete(path, options) }
+      def delete(path, options = {}, mp = mountpoint)
+        mp.delete(path, options)
       end
 
-      def write(path, options_or_data = nil, options = nil)
-        @@buckets.values.each {|b| b.write(path, options_or_data, options) }
+      def write(path, options_or_data = nil, options = {}, mp = mountpoint)
+        mp.write(path, options_or_data, options)
+      end
+
+      def each(&block)
+        if block_given?
+          @@buckets.each{|b| yield b }
+        else
+          Enumerator.new(@@buckets.values)
+        end
       end
 
       private

data/lib/omnistore/version.rb

@@ -1,3 +1,3 @@
 module OmniStore
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/omnistore/storage/local_spec.rb

@@ -2,118 +2,118 @@ require 'spec_helper'
 require 'fileutils'
 
 describe OmniStore::Storage::Local do
-
-  def expand_path(path, mountpoint = OmniStore::Config.mountpoint)
-    File.expand_path(path, mountpoint)
-  end
-
   before(:each) do
     OmniStore::Config.storage = 'local'
     OmniStore::Config.mountpoint = MOUNTPOINT
+    OmniStore::Storage.remount!
   end
 
-  describe "#mount!" do
-    it 'should not raise error' do
-      OmniStore::Config.mountpoint = MOUNTPOINT
-      lambda { OmniStore::Storage::Local.mount! }.should_not raise_error
+  let(:src) { TEST_FILENAME }
+  let(:src_fullpath) { expand_path(src, MOUNTPOINT) }
+
+  describe '#mount!' do
+    subject { lambda { OmniStore::Storage::Local.mount! } }
+
+    context 'when specified a directory path that exists' do
+      it { should_not raise_error }
+    end
+
+    context 'when specified two directory paths that exists' do
+      before { OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR } }
+      it { should_not raise_error }
     end
 
-    it 'should not raise error when hash mountpoint' do
-      OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
-      lambda { OmniStore::Storage::Local.mount! }.should_not raise_error
+    context 'when specified a directory path that does not exists' do
+      before { OmniStore::Config.mountpoint = MOUNTPOINT + Time.new.to_i.to_s }
+      it { should raise_error }
     end
 
-    it 'should raise error when mount fails' do
-      OmniStore::Config.mountpoint = nil
-      lambda { OmniStore::Storage::Local.mount! }.should raise_error(OmniStore::Errors::InvalidMountpoint)
+    context 'when specified a file path that exists' do
+      before { OmniStore::Config.mountpoint = File.expand_path(__FILE__) }
+      it { should raise_error }
     end
   end
 
-  context "single mountpoint" do
-    let(:src) { 'test.txt' }
-    let(:src_fullpath) { expand_path(src) }
+  describe '#mountpoint' do
+    subject { OmniStore::Storage::Local.mountpoint }
+    it { should be_a OmniStore::Storage::Local::Mountpoint }
+  end
+
+  describe '#exist?' do
+    subject { OmniStore::Storage::Local.exist?(src) }
 
-    before(:each) do
-      OmniStore::Config.mountpoint = MOUNTPOINT
-      OmniStore::Storage.remount!
-      FileUtils.touch(src_fullpath)
+    context 'when specified a file path that does not exist' do
+      let(:src) { TEST_FILENAME + Time.new.to_i.to_s }
+      it { should be_false } 
     end
-    after(:each)  { FileUtils.rm_f(src_fullpath) }
 
-    describe "#exist?" do
-      it 'should return true' do
-        OmniStore::Storage::Local.exist?(src).should be_true
-      end
+    context 'when specified a file path that exist' do
+      it { should be_true } 
+    end
+  end
 
-      it 'should return false' do
-        OmniStore::Storage::Local.exist?(src + '.bk').should be_false
-      end
+  describe '#delete' do
+    subject { lambda { OmniStore::Storage::Local.delete(src) } }
+
+    context 'when specified a file path that does not exist' do
+      let(:src) { TEST_FILENAME + Time.new.to_i.to_s }
+      it { should raise_error } 
     end
 
-    describe "#delete" do
-      it 'should return true' do
-        lambda { OmniStore::Storage::Local.delete(src) }.should_not raise_error
-        File.exist?(src_fullpath).should be_false
-      end
+    context 'when specified a file path that exist' do
+      let(:src) { t = Tempfile.new(TEST_FILENAME, MOUNTPOINT); File.basename(t.path) }
+      it { should_not raise_error } 
     end
+  end
 
-    describe "#move" do
-      let(:dst) { src + '.mv' }
-      let(:dst_fullpath) { expand_path(dst) }
-      let(:mountpoint) { OmniStore::Storage::Local.mountpoint(MOUNTPOINT) }
-      after(:each)  { FileUtils.rm_f(dst_fullpath) }
+  describe '#each' do
+    subject { OmniStore::Storage::Local.each }
+    it { should be_a Enumerator }
+  end
 
-      it 'should move to target path' do
-        lambda { mountpoint.move(src, dst) }.should_not raise_error
-        File.exist?(src_fullpath).should be_false
-        File.exist?(dst_fullpath).should be_true
-      end
+  describe OmniStore::Storage::Local::Mountpoint do
+    subject { OmniStore::Storage::Local.mountpoint }
 
-      it 'should raise error when source file is not exists' do
-        lambda { mountpoint.move(dst, src) }.should raise_error
-      end
+    context 'when single mountpoit' do
+      its(:name) { should eq File.basename(MOUNTPOINT) }
+      its(:url)  { should eq "file://#{File.expand_path(MOUNTPOINT)}" }
     end
-  end
 
-  context "dounble mountpoint" do
-    let(:src) { 'test.txt' }
-    let(:src_fullpath) { expand_path(src, MOUNTPOINT) }
+    context 'when double mountpoint' do
+      before do
+        OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
+        OmniStore::Storage.remount!
+      end
+      subject { OmniStore::Storage::Local.mountpoint(:b) }
 
-    before(:each) do
-      OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
-      OmniStore::Storage.remount!
-      FileUtils.touch(src_fullpath)
+      its(:name) { should eq :b }
+      its(:url)  { should eq "file://#{File.expand_path(TMPDIR)}" }
     end
-    after(:each)  { FileUtils.rm_f(src_fullpath) }
 
-    describe "#exist?" do
-      it 'should return true' do
-        OmniStore::Storage::Local.exist?(src).should be_true
+    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 }
+      let(:other) { OmniStore::Storage::Local.mountpoint(:a) }
+      subject { lambda { OmniStore::Storage::Local.mountpoint.move(src, dst, other) } }
+
+      before do
+        OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
+        OmniStore::Storage.remount!
       end
+      after { other.delete(dst) rescue nil }
 
-      it 'should return false' do
-        OmniStore::Storage::Local.exist?(src + '.bk').should be_false
+      context 'when specified a file path that does not exist' do
+        let(:src) { TEST_FILENAME + Time.new.to_i.to_s }
+        it { should raise_error } 
       end
-    end
 
-    describe "#delete" do
-      it 'should return true' do
-        lambda { OmniStore::Storage::Local.delete(src) }.should raise_error
+      context 'when specified a file path that exist' do
+        it { should_not raise_error } 
       end
-    end
 
-    describe "#move" do
-      let(:dst) { src + '.mv' }
-      let(:dst_fullpath) { expand_path(dst, TMPDIR) }
-      let(:mountpoint)   { OmniStore::Storage::Local.mountpoint(:a) }
-      let(:another)      { OmniStore::Storage::Local.mountpoint(:b) }
-      after(:each)  { FileUtils.rm_f(dst_fullpath) }
-
-      it 'should move to target path of another mountpoint' do
-        lambda { mountpoint.move(src, dst, another) }.should_not raise_error
-        File.exist?(src_fullpath).should be_false
-        File.exist?(File.join(MOUNTPOINT, dst)).should be_false
-        File.exist?(File.join(TMPDIR, dst)).should be_true
+      context 'when move to another mountpoint' do
+        let(:other) { OmniStore::Storage::Local.mountpoint(:b) }
+        it { should_not raise_error } 
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,11 +3,14 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'rspec'
+require 'tempfile'
 require 'aws-sdk'
 require 'omnistore'
 
 TMPDIR   = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
-MOUNTPOINT = File.join(File.dirname(__FILE__), '/../data')
+#MOUNTPOINT = File.join(File.dirname(__FILE__), '/../data')
+MOUNTPOINT = File.expand_path(File.join(File.dirname(__FILE__), '/../data'))
+TEST_FILENAME = 'test.txt'
 AWS_BUCKET = ENV['AWS_BUCKET']
 
 OmniStore.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnistore
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -89,6 +89,7 @@ files:
 - README.md
 - Rakefile
 - data/.gitkeep
+- data/test.txt
 - lib/omnistore.rb
 - lib/omnistore/config.rb
 - lib/omnistore/config/option.rb
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -704812863
+      hash: 411340815
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -704812863
+      hash: 411340815
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24