omnistore 0.0.10 → 0.0.11

data/lib/omnistore/storage/local.rb

@@ -1,111 +1,32 @@
+require 'omnistore/storage/local/mountpoint'
+
 module OmniStore
   module Storage
     module Local
       extend self
 
-      class Mountpoint
-        MEGABYTE = 1024*1024
-        attr_reader :dir
-
-        def initialize(name, dir)
-          @name = name
-          @dir  = dir
-        end
-
-        def name
-          @name
-        end
-
-        def url(key = nil, options = {})
-          "file://#{dir}/#{key}"
-        end
-
-        def exist?(path)
-          File.exist?(expand(path))
-        end
-
-        def delete(path)
-          FileUtils.rm(expand(path))
-        end
-
-        def read(path, options = {}, &block)
-          size = options[:chunk_size] || MEGABYTE
-          open(expand(path), 'rb') do |f|
-            block.call(f.read(size)) until f.eof?
-          end
-        end
-
-        def write(path, options_or_data = nil, options = {})
-          opts = convert_args_to_options_hash(options_or_data, options)
-          size = opts[:chunk_size] || MEGABYTE
-          data = convert_data_to_io_obj(opts)
-          begin
-            open(expand(path), 'wb') do |f|
-              f.write(data.read(size)) until data.eof?
-            end
-          ensure
-            data.close unless data.closed?
-          end
-        end
-
-        def move(src, dest, other = self, options = {})
-          src_path = expand(src)
-          dest_path = expand(dest, other.dir)
-          FileUtils.mkdir_p(File.dirname(dest_path)) if options[:force]
-          FileUtils.mv(src_path, dest_path, options)
-        end
-
-        private
-
-        def expand(path, dir = @dir)
-          File.expand_path(path, dir)
-        end
-        
-        def convert_args_to_options_hash(*args)
-          case args.count
-          when 0 then {}
-          when 1 then args[0].is_a?(Hash) ? args[0] : { :data => args[0] }
-          when 2 then args[1].merge(:data => args[0])
-          else
-            msg = "expected 0, 1 or 2 arguments, got #{args.count}"
-            raise ArgumentError, msg
-          end
-        end
-
-        def convert_data_to_io_obj(options)
-          data = options.delete(:data)
-          if data.is_a?(String)
-            data.force_encoding("BINARY") if data.respond_to?(:force_encoding)
-            StringIO.new(data)
-          elsif data.is_a?(Pathname)
-            open_file(data.to_s)
-          elsif data.respond_to?(:read) and data.respond_to?(:eof?)
-            data
-          else
-            msg = "invalid :data option, expected a String, Pathname or "
-            msg << "an object that responds to #read and #eof?"
-            raise ArgumentError, msg
-          end
-        end
-
-        def open_file(path)
-          file_opts = ['rb']
-          file_opts << { :encoding => "BINARY" } if Object.const_defined?(:Encoding)
-          File.open(path, *file_opts)
-        end
-      end
-
       def mount!
-        @@mountpoint = {}
+        @@keys = {}
         case mountpoint = OmniStore::Config.mountpoint
-        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)
+        when Array
+          mountpoint.each do |m|
+            validate(m)
+            @@keys[m] = {:name => File.basename(m), :dir => m}
+          end
+        when Hash
+          mountpoint.each do |k,v|
+            validate(v)
+            @@keys[k] = {:name => k, :dir => v}
+          end
+        else
+          m = mountpoint.to_s
+          validate(m)
+          @@keys[m] = {:name => File.basename(m), :dir => m}
         end
       end
 
-      def mountpoint(key = @@mountpoint.keys[0])
-        @@mountpoint[key]
+      def mountpoint(key = @@keys.keys.first)
+        new_mountpoint(key)
       end
 
       def exist?(path, mp = mountpoint)
@@ -126,9 +47,9 @@ module OmniStore
 
       def each(&block)
         if block_given?
-          @@mountpoint.each{|m| yield m }
+          @@keys.each{|key| yield new_mountpoint(key) }
         else
-          Enumerator.new(@@mountpoint.values)
+          Enumerator.new(@@keys.map{|key| new_mountpoint(key) })
         end
       end
 
@@ -137,6 +58,11 @@ module OmniStore
       def validate(mountpoint)
         raise OmniStore::Errors::InvalidMountpoint unless File.exist?(mountpoint) && File.directory?(mountpoint)
       end
+
+      def new_mountpoint(key)
+        return nil unless @@keys.key?(key)
+        Mountpoint.new(@@keys[key][:name], @@keys[key][:dir])
+      end
     end
   end
 end

data/lib/omnistore/storage/local/mountpoint.rb

@@ -0,0 +1,103 @@
+module OmniStore
+  module Storage
+    module Local
+      class Mountpoint
+        MEGABYTE = 1024*1024
+        attr_reader :dir
+
+        def initialize(name, dir)
+          @name = name
+          @dir  = dir
+        end
+
+        def name
+          @name
+        end
+
+        def url(key = nil, options = {})
+          "file://#{dir}/#{key}"
+        end
+
+        def exist?(path)
+          File.exist?(expand(path))
+        end
+
+        def delete(path)
+          FileUtils.rm(expand(path))
+        end
+
+        def read(path, options = {}, &block)
+          size = options[:chunk_size] || MEGABYTE
+          open(expand(path), 'rb') do |f|
+            if block_given?
+              block.call(f.read(size)) until f.eof?
+            else
+              f.read
+            end
+          end
+        end
+
+        def write(path, options_or_data = nil, options = {})
+          opts = convert_args_to_options_hash(options_or_data, options)
+          size = opts[:chunk_size] || MEGABYTE
+          data = convert_data_to_io_obj(opts)
+          begin
+            open(expand(path), 'wb') do |f|
+              f.write(data.read(size)) until data.eof?
+            end
+          ensure
+            data.close unless data.closed?
+          end
+        end
+
+        def move(src, dest, other = self, options = {})
+          src_path = expand(src)
+          dest_path = expand(dest, other.dir)
+          FileUtils.mkdir_p(File.dirname(dest_path)) if options[:force]
+          FileUtils.mv(src_path, dest_path, options)
+        end
+
+        private
+
+        def expand(path, dir = @dir)
+          File.expand_path(path, dir)
+        end
+        
+        def convert_args_to_options_hash(*args)
+          case args.count
+          when 0 then {}
+          when 1 then args[0].is_a?(Hash) ? args[0] : { :data => args[0] }
+          when 2 then args[1].merge(:data => args[0])
+          else
+            msg = "expected 0, 1 or 2 arguments, got #{args.count}"
+            raise ArgumentError, msg
+          end
+        end
+
+        def convert_data_to_io_obj(options)
+          data = options.delete(:data)
+          if data.is_a?(String)
+            data.force_encoding("BINARY") if data.respond_to?(:force_encoding)
+            StringIO.new(data)
+          elsif data.is_a?(Pathname)
+            open_file(data.to_s)
+          elsif data.respond_to?(:read) and data.respond_to?(:eof?)
+            data
+          else
+            msg = "invalid :data option, expected a String, Pathname or "
+            msg << "an object that responds to #read and #eof?"
+            raise ArgumentError, msg
+          end
+        end
+
+        def open_file(path)
+          file_opts = ['rb']
+          file_opts << { :encoding => "BINARY" } if Object.const_defined?(:Encoding)
+          File.open(path, *file_opts)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/omnistore/storage/s3.rb

@@ -1,63 +1,33 @@
 require 'aws-sdk'
+require 'omnistore/storage/s3/mountpoint'
 
 module OmniStore
   module Storage
     module S3
       extend self
 
-      class Mountpoint
-        attr_reader :bucket
-
-        def initialize(name, bucket)
-          @name   = name
-          @bucket = bucket
-        end
-
-        def name
-          @name
-        end
-
-        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)
-          bucket.objects[key].exists?
-        end
-
-        def delete(key, options = {})
-          bucket.objects[key].delete(options)
-        end
-
-        def read(key, options = {}, &block)
-          bucket.objects[key].read(options, &block)
-        end
-
-        def write(key, options_or_data = nil, options = {})
-          bucket.objects[key].write(options_or_data, options)
-        end
-
-        def move(src, dest, other = self, options = {})
-          options[:bucket_name] = other.bucket.name
-          bucket.objects[src].move_to(dest, options)
-        end
-      end
-
       def mount!
-        @@buckets = {}
+        @@keys = {}
         case mountpoint = OmniStore::Config.mountpoint
-        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)
+        when Array
+          mountpoint.each do |m|
+            b = validate(m)
+            @@keys[m] = {:name => m, :bucket => b}
+          end
+        when Hash
+          mountpoint.each do |k,v|
+            b = validate(v)
+            @@keys[k] = {:name => k, :bucket => b}
+          end
+        else
+          m = mountpoint.to_s
+          b = validate(m)
+          @@keys[m] = {:name => m, :bucket => b}
         end
       end
 
-      def mountpoint(key = @@buckets.keys[0])
-        @@buckets[key]
+      def mountpoint(key = @@keys.keys.first)
+        new_mountpoint(key)
       end
 
       def exist?(path, mp = mountpoint)
@@ -79,9 +49,9 @@ module OmniStore
 
       def each(&block)
         if block_given?
-          @@buckets.each{|b| yield b }
+          @@keys.each{|key| yield new_mountpoint(key) }
         else
-          Enumerator.new(@@buckets.values)
+          Enumerator.new(@@keys.map{|key| new_mountpoint(key)})
         end
       end
 
@@ -101,6 +71,11 @@ module OmniStore
         opts[:proxy_uri]         = OmniStore::Config.proxy_uri  if OmniStore::Config.proxy_uri
         opts
       end
+
+      def new_mountpoint(key)
+        return nil unless @@keys.key?(key)
+        Mountpoint.new(@@keys[key][:name], @@keys[key][:bucket])
+      end
     end
   end
 end

data/lib/omnistore/storage/s3/mountpoint.rb

@@ -0,0 +1,47 @@
+module OmniStore
+  module Storage
+    module S3
+      class Mountpoint
+        attr_reader :bucket
+
+        def initialize(name, bucket)
+          @name   = name
+          @bucket = bucket
+        end
+
+        def name
+          @name
+        end
+
+        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)
+          bucket.objects[key].exists?
+        end
+
+        def delete(key, options = {})
+          bucket.objects[key].delete(options)
+        end
+
+        def read(key, options = {}, &block)
+          bucket.objects[key].read(options, &block)
+        end
+
+        def write(key, options_or_data = nil, options = {})
+          bucket.objects[key].write(options_or_data, options)
+        end
+
+        def move(src, dest, other = self, options = {})
+          options[:bucket_name] = other.bucket.name
+          bucket.objects[src].move_to(dest, options)
+        end
+      end
+    end
+  end
+end

data/lib/omnistore/version.rb

@@ -1,3 +1,3 @@
 module OmniStore
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/omnistore/storage/local/mountpoint_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe OmniStore::Storage::Local::Mountpoint do
+  subject { OmniStore::Storage::Local.mountpoint }
+
+  context 'when single mountpoit' do
+    its(:name) { should eq File.basename(MOUNTPOINT) }
+    its(:url)  { should eq "file://#{File.expand_path(MOUNTPOINT)}/" }
+  end
+
+  context 'when double mountpoint' do
+    before do
+      OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
+      OmniStore::Storage.remount!
+    end
+    subject { OmniStore::Storage::Local.mountpoint(:b) }
+
+    its(:name) { should eq :b }
+    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 }
+    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 }
+
+    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
+
+    context 'when specified a file path that exist' do
+      it { should_not raise_error } 
+    end
+
+    context 'when move to another mountpoint' do
+      let(:other) { OmniStore::Storage::Local.mountpoint(:b) }
+      it { should_not raise_error } 
+    end
+  end
+end

data/spec/omnistore/storage/local_spec.rb

@@ -70,65 +70,4 @@ describe OmniStore::Storage::Local do
     subject { OmniStore::Storage::Local.each }
     it { should be_a Enumerator }
   end
-
-  describe OmniStore::Storage::Local::Mountpoint do
-    subject { OmniStore::Storage::Local.mountpoint }
-
-    context 'when single mountpoit' do
-      its(:name) { should eq File.basename(MOUNTPOINT) }
-      its(:url)  { should eq "file://#{File.expand_path(MOUNTPOINT)}/" }
-    end
-
-    context 'when double mountpoint' do
-      before do
-        OmniStore::Config.mountpoint = { :a => MOUNTPOINT, :b => TMPDIR }
-        OmniStore::Storage.remount!
-      end
-      subject { OmniStore::Storage::Local.mountpoint(:b) }
-
-      its(:name) { should eq :b }
-      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 }
-      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 }
-
-      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
-
-      context 'when specified a file path that exist' do
-        it { should_not raise_error } 
-      end
-
-      context 'when move to another mountpoint' do
-        let(:other) { OmniStore::Storage::Local.mountpoint(:b) }
-        it { should_not raise_error } 
-      end
-    end
-  end
 end

data/spec/omnistore/storage/s3/mountpoint_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe 'OmniStore::Storage::S3::Mountpoint' do
+  
+  before(:each) do
+    AWS::S3::Bucket.any_instance.stub(:exists?).and_return(true)
+    OmniStore::Config.storage = 's3'
+    OmniStore::Config.mountpoint = AWS_BUCKET
+    OmniStore::Storage.remount!
+  end
+
+  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 '#delete' do
+    let(:src) { TEST_FILENAME }
+    before { AWS::S3::S3Object.any_instance.stub(:delete).with({}) }
+    subject { lambda { OmniStore::Storage::S3.mountpoint.delete(src) } }
+
+    it { should_not raise_error } 
+  end
+
+  describe '#read' do
+    let(:src) { TEST_FILENAME }
+    let(:data) { 'Hello World' }
+    before { AWS::S3::S3Object.any_instance.stub(:read).and_yield(data) }
+    subject { OmniStore::Storage::S3.mountpoint.read(src){|chunk| chunk } }
+
+    it { should eq data }
+  end
+
+  describe '#write' do
+    let(:src)  { TEST_FILENAME }
+    let(:data) { 'Hello World' }
+    before { AWS::S3::S3Object.any_instance.stub(:write).with(data, {}) }
+    subject { lambda { OmniStore::Storage::S3.mountpoint.write(src, data) } }
+
+    it { should_not raise_error } 
+  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 + 'b' }
+      OmniStore::Storage.remount!
+    end
+
+    context 'when move to same mountpoint' do
+      before do
+        AWS::S3::S3Object.any_instance.stub(:move_to).with do |*args|
+          args[0].should eq dst
+          args[1][:bucket_name].should eq AWS_BUCKET
+          true
+        end
+      end
+      it { should_not raise_error } 
+    end
+
+    context 'when move to another mountpoint' do
+      before do
+        AWS::S3::S3Object.any_instance.stub(:move_to).with do |*args|
+          args[0].should eq dst
+          args[1][:bucket_name].should eq other.bucket.name
+          true
+        end
+      end
+      let(:other) { OmniStore::Storage::S3.mountpoint(:b) }
+      it { should_not raise_error } 
+    end
+  end
+
+end

data/spec/omnistore/storage/s3_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'fileutils'
 
 describe "OmniStore::Storage::S3" do
 
@@ -79,112 +78,4 @@ describe "OmniStore::Storage::S3" do
     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 '#delete' do
-      let(:src) { TEST_FILENAME }
-      before { AWS::S3::S3Object.any_instance.stub(:delete).with({}) }
-      subject { lambda { OmniStore::Storage::S3.mountpoint.delete(src) } }
-
-      it { should_not raise_error } 
-    end
-
-    describe '#read' do
-      let(:src) { TEST_FILENAME }
-      let(:data) { 'Hello World' }
-      before { AWS::S3::S3Object.any_instance.stub(:read).and_yield(data) }
-      subject { OmniStore::Storage::S3.mountpoint.read(src){|chunk| chunk } }
-
-      it { should eq data }
-    end
-
-    describe '#write' do
-      let(:src)  { TEST_FILENAME }
-      let(:data) { 'Hello World' }
-      before { AWS::S3::S3Object.any_instance.stub(:write).with(data, {}) }
-      subject { lambda { OmniStore::Storage::S3.mountpoint.write(src, data) } }
-
-      it { should_not raise_error } 
-    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 + 'b' }
-        OmniStore::Storage.remount!
-      end
- 
-      context 'when move to same mountpoint' do
-        before do
-          AWS::S3::S3Object.any_instance.stub(:move_to).with do |*args|
-            args[0].should eq dst
-            args[1][:bucket_name].should eq AWS_BUCKET
-            true
-          end
-        end
-        it { should_not raise_error } 
-      end
-
-      context 'when move to another mountpoint' do
-        before do
-          AWS::S3::S3Object.any_instance.stub(:move_to).with do |*args|
-            args[0].should eq dst
-            args[1][:bucket_name].should eq other.bucket.name
-            true
-          end
-        end
-        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.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -96,11 +96,15 @@ files:
 - lib/omnistore/errors.rb
 - lib/omnistore/storage.rb
 - lib/omnistore/storage/local.rb
+- lib/omnistore/storage/local/mountpoint.rb
 - lib/omnistore/storage/s3.rb
+- lib/omnistore/storage/s3/mountpoint.rb
 - lib/omnistore/version.rb
 - omnistore.gemspec
 - spec/omnistore/config_spec.rb
+- spec/omnistore/storage/local/mountpoint_spec.rb
 - spec/omnistore/storage/local_spec.rb
+- spec/omnistore/storage/s3/mountpoint_spec.rb
 - spec/omnistore/storage/s3_spec.rb
 - spec/omnistore/storage_spec.rb
 - spec/omnistore_spec.rb
@@ -119,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1003914863
+      hash: -552854129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1003914863
+      hash: -552854129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -137,7 +141,9 @@ specification_version: 3
 summary: Providers a single point of entry for storage
 test_files:
 - spec/omnistore/config_spec.rb
+- spec/omnistore/storage/local/mountpoint_spec.rb
 - spec/omnistore/storage/local_spec.rb
+- spec/omnistore/storage/s3/mountpoint_spec.rb
 - spec/omnistore/storage/s3_spec.rb
 - spec/omnistore/storage_spec.rb
 - spec/omnistore_spec.rb