omnistore 0.0.2 → 0.0.3

data/lib/omnistore/storage/local.rb

@@ -3,16 +3,48 @@ module OmniStore
     module Local
       extend self
 
-      @@mountpoint = nil
+      class Mountpoint
+        attr_reader :dir
+
+        def initialize(dir)
+          @dir = dir
+        end
+
+        def exist?(path)
+          File.exist?(File.expand_path(path, dir))
+        end
+
+        def delete(path)
+          FileUtils.rm_f(File.expand_path(path, dir))
+        end
+      end
 
       def mount!
-        mountpoint = OmniStore::Config.mountpoint.to_s
-        raise OmniStore::Errors::InvalidMountpoint unless File.exist?(mountpoint) && File.directory?(mountpoint)
-        @@mountpoint = mountpoint
+        @@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)
+        end
+      end
+
+      def mountpoint(key)
+        @@mountpoint[key]
       end
 
       def exist?(path)
-        File.exist?(File.join(@@mountpoint, path))
+        @@mountpoint.values.find {|m| m.exist?(path) }
+      end
+      alias :find :exist?
+
+      def delete(path)
+        @@mountpoint.values.each {|m| m.delete(path) }
+      end
+
+      private
+
+      def validate(mountpoint)
+        raise OmniStore::Errors::InvalidMountpoint unless File.exist?(mountpoint) && File.directory?(mountpoint)
       end
     end
   end

data/lib/omnistore/storage/s3.rb

@@ -5,24 +5,60 @@ module OmniStore
     module S3
       extend self
 
-      @@bucket = nil
+      class Mountpoint
+        attr_reader :bucket
+
+        def initialize(bucket)
+          @bucket = bucket
+        end
+
+        def exist?(key)
+          bucket.objects[key].exists?
+        end
+
+        def delete(key, options = {})
+          bucket.objects[key].delete(options)
+        end
+
+        def write(key, options_or_data = nil, options = nil)
+          bucket.objects[key].write(options_or_data, options)
+        end
+      end
 
       def mount!
-        bucket = AWS::S3.new(options).buckets[OmniStore::Config.mountpoint]
-        raise OmniStore::Errors::InvalidMountpoint unless bucket.exists?
-        @@bucket = bucket
+        @@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)
+        end
+      end
+
+      def mountpoint(key)
+        @@buckets[key]
       end
 
       def exist?(path)
-        @@bucket.objects[path].exists?
+        @@buckets.values.find {|b| b.exist?(path) }
+      end
+      alias :find :exist?
+
+      def delete(path, options = {})
+        @@buckets.values.each {|b| b.delete(path, options) }
       end
 
       def write(path, options_or_data = nil, options = nil)
-        @@bucket.objects[path].write(options_or_data, options)
+        @@buckets.values.each {|b| b.write(path, options_or_data, options) }
       end
 
       private
 
+      def validate(name)
+        bucket = AWS::S3.new(options).buckets[name]
+        raise OmniStore::Errors::InvalidMountpoint unless bucket.exists?
+        bucket
+      end
+
       def options
         opts = {}
         opts[:access_key_id]     = OmniStore::Config.access_key if OmniStore::Config.access_key

data/lib/omnistore/version.rb

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

data/spec/omnistore/storage/local_spec.rb

@@ -3,6 +3,12 @@ require 'fileutils'
 
 describe OmniStore::Storage::Local do
 
+  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
@@ -14,9 +20,14 @@ describe OmniStore::Storage::Local do
 
   it 'should exist' do
     path = 'test.txt'
-    FileUtils.touch(File.join(OmniStore::Config.mountpoint, path))
-    OmniStore::Storage::Local.exist?(path).should be_true
-    OmniStore::Storage::Local.exist?(path+'.bk').should be_false
+    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)
+    end
   end
 
 end

data/spec/omnistore/storage/s3_spec.rb

@@ -5,7 +5,7 @@ describe "OmniStore::Storage::S3" do
 
   before(:each) do
     OmniStore::Config.storage = 's3'
-    OmniStore::Config.mountpoint = ENV['AWS_BUCKET']
+    OmniStore::Config.mountpoint = AWS_BUCKET
     OmniStore::Storage.remount!
   end
 
@@ -19,10 +19,14 @@ describe "OmniStore::Storage::S3" do
   end
 
   it 'should exist' do
-    path = 'test.txt'
-    OmniStore::Storage::S3.write(path, '')
-    OmniStore::Storage::S3.exist?(path).should be_true
-    OmniStore::Storage::S3.exist?(path+'.bk').should be_false
+    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)
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'aws-sdk'
 require 'omnistore'
 
 MOUNTPOINT = File.join(File.dirname(__FILE__), '/../data')
+AWS_BUCKET = ENV['AWS_BUCKET']
+
 OmniStore.configure do |config|
   config.storage = 'local'
   config.mountpoint = MOUNTPOINT
@@ -26,6 +28,5 @@ RSpec.configure do |config|
     OmniStore::Config.reset_endpoint
     OmniStore::Config.reset_proxy_uri
     OmniStore.logger.level = Logger::FATAL
-    FileUtils.rm_rf(Dir.glob(File.join(MOUNTPOINT, '*')))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnistore
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 671942063
+      hash: -480897425
 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: 671942063
+      hash: -480897425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24