omnistore 0.0.3 → 0.0.4

data/lib/omnistore/storage/local.rb

@@ -11,11 +11,23 @@ module OmniStore
         end
 
         def exist?(path)
-          File.exist?(File.expand_path(path, dir))
+          File.exist?(expand(path))
         end
 
         def delete(path)
-          FileUtils.rm_f(File.expand_path(path, dir))
+          FileUtils.rm(expand(path))
+        end
+
+        def move(src, dest, other = self, options = {})
+          src_path = expand(src)
+          dest_path = expand(dest, other.dir)
+          FileUtils.mv(src_path, dest_path, options)
+        end
+
+        private
+
+        def expand(path, dir = @dir)
+          File.expand_path(path, dir)
         end
       end
 
@@ -35,7 +47,6 @@ module OmniStore
       def exist?(path)
         @@mountpoint.values.find {|m| m.exist?(path) }
       end
-      alias :find :exist?
 
       def delete(path)
         @@mountpoint.values.each {|m| m.delete(path) }

data/lib/omnistore/storage/s3.rb

@@ -23,6 +23,11 @@ module OmniStore
         def write(key, options_or_data = nil, options = nil)
           bucket.objects[key].write(options_or_data, options)
         end
+
+        def move(src, dest, other = self, options = {})
+          options[:bucket_name] = other.bucket.name
+          bucket.objects[key].move_to(dest, options)
+        end
       end
 
       def mount!

data/lib/omnistore/version.rb

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

data/spec/omnistore/storage/local_spec.rb

@@ -3,31 +3,118 @@ 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
 
-  it 'should mount' do
-    OmniStore::Storage::Local.mount!.should_not be_nil
-  end
+  describe "#mount!" do
+    it 'should not raise error' do
+      OmniStore::Config.mountpoint = MOUNTPOINT
+      lambda { OmniStore::Storage::Local.mount! }.should_not 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)
+    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
+    end
+
+    it 'should raise error when mount fails' do
+      OmniStore::Config.mountpoint = nil
+      lambda { OmniStore::Storage::Local.mount! }.should raise_error(OmniStore::Errors::InvalidMountpoint)
+    end
   end
 
-  it 'should exist' do
-    path = 'test.txt'
-    expand_path = File.expand_path(path, OmniStore::Config.mountpoint)
-    FileUtils.touch(expand_path)
-    begin
-      OmniStore::Storage::Local.exist?(path).should be_true
-      OmniStore::Storage::Local.exist?(path+'.bk').should be_false
-    ensure
-      OmniStore::Storage::Local.delete(path)
+  context "single mountpoint" do
+    let(:src) { 'test.txt' }
+    let(:src_fullpath) { expand_path(src) }
+
+    before(:each) do
+      OmniStore::Config.mountpoint = MOUNTPOINT
+      OmniStore::Storage.remount!
+      FileUtils.touch(src_fullpath)
+    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
+
+      it 'should return false' do
+        OmniStore::Storage::Local.exist?(src + '.bk').should be_false
+      end
+    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
+    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) }
+
+      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
+
+      it 'should raise error when source file is not exists' do
+        lambda { mountpoint.move(dst, src) }.should raise_error
+      end
     end
   end
 
+  context "dounble mountpoint" do
+    let(:src) { 'test.txt' }
+    let(:src_fullpath) { expand_path(src, MOUNTPOINT) }
+
+    before(:each) do
+      OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
+      OmniStore::Storage.remount!
+      FileUtils.touch(src_fullpath)
+    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
+
+      it 'should return false' do
+        OmniStore::Storage::Local.exist?(src + '.bk').should be_false
+      end
+    end
+
+    describe "#delete" do
+      it 'should return true' do
+        lambda { OmniStore::Storage::Local.delete(src) }.should 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
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'aws-sdk'
 require 'omnistore'
 
+TMPDIR   = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
 MOUNTPOINT = File.join(File.dirname(__FILE__), '/../data')
 AWS_BUCKET = ENV['AWS_BUCKET']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnistore
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -480897425
+      hash: -704812863
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -480897425
+      hash: -704812863
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24