omnistore 0.0.9 → 0.0.10

data/lib/omnistore/storage/local.rb

@@ -4,6 +4,7 @@ module OmniStore
       extend self
 
       class Mountpoint
+        MEGABYTE = 1024*1024
         attr_reader :dir
 
         def initialize(name, dir)
@@ -27,6 +28,26 @@ module OmniStore
           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)
@@ -39,6 +60,39 @@ module OmniStore
         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!
@@ -62,6 +116,14 @@ module OmniStore
         mp.delete(path)
       end
 
+      def read(path, options = {}, mp = mountpoint, &block)
+        mp.read(path, options, &block)
+      end
+
+      def write(path, options_or_data = nil, options = {}, mp = mountpoint)
+        mp.write(path, options_or_data, options)
+      end
+
       def each(&block)
         if block_given?
           @@mountpoint.each{|m| yield m }

data/lib/omnistore/storage/s3.rb

@@ -33,6 +33,10 @@ module OmniStore
           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
@@ -65,6 +69,10 @@ module OmniStore
         mp.delete(path, options)
       end
 
+      def read(path, options = {}, mp = mountpoint, &block)
+        mp.read(path, options, &block)
+      end
+
       def write(path, options_or_data = nil, options = {}, mp = mountpoint)
         mp.write(path, options_or_data, options)
       end

data/lib/omnistore/version.rb

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

data/spec/omnistore/storage/s3_spec.rb

@@ -3,15 +3,8 @@ 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
+    AWS::S3::Bucket.any_instance.stub(:exists?).and_return(true)
     OmniStore::Config.storage = 's3'
     OmniStore::Config.mountpoint = AWS_BUCKET
     OmniStore::Storage.remount!
@@ -30,7 +23,7 @@ describe "OmniStore::Storage::S3" do
     end
 
     context 'when specified a bucket name that does not exists' do
-      before { OmniStore::Config.mountpoint = AWS_BUCKET + Time.new.to_i.to_s }
+      before { AWS::S3::Bucket.any_instance.stub(:exists?).and_return(false) }
       it { should raise_error OmniStore::Errors::InvalidMountpoint }
     end
   end
@@ -45,31 +38,40 @@ describe "OmniStore::Storage::S3" do
     subject { OmniStore::Storage::S3.exist?(src) }
 
     context 'when specified a object that does not exist' do
+      before { AWS::S3::S3Object.any_instance.stub(:exists?).and_return(false) }
       it { should be_false } 
     end
 
     context 'when specified a object that exist' do
-      before { create_object(src) }
-      after  { delete_object(src) }
+      before { AWS::S3::S3Object.any_instance.stub(:exists?).and_return(true) }
       it { should be_true } 
     end
   end
 
   describe '#delete' do
     let(:src) { TEST_FILENAME }
+    before { OmniStore::Storage::S3::Mountpoint.any_instance.stub(:delete).with(src, {}) }
     subject { lambda { OmniStore::Storage::S3.delete(src) } }
 
-    context 'when specified a object that does not exist' do
-      it { should_not raise_error } 
-    end
+    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
+  describe '#read' do
+    let(:src) { TEST_FILENAME }
+    let(:data) { 'Hello World' }
+    before { OmniStore::Storage::S3::Mountpoint.any_instance.stub(:read).with(src, {}).and_yield(data) }
+    subject { OmniStore::Storage::S3.read(src){|chunk| chunk } }
+
+    it { should eq data }
+  end
+
+  describe '#write' do
+    let(:src)  { TEST_FILENAME }
+    let(:data) { 'Hello World' }
+    before { OmniStore::Storage::S3::Mountpoint.any_instance.stub(:write).with(src, nil, {}) }
+    subject { lambda { OmniStore::Storage::S3.write(src) } }
+
+    it { should_not raise_error } 
   end
 
   describe '#each' do
@@ -107,7 +109,7 @@ describe "OmniStore::Storage::S3" do
 
       context 'when key specified' do
         let(:key) { 'test' }
-        it { should match "#{AWS_BUCKET}.+/#{key}" }
+        it { should match "#{AWS_BUCKET}/#{key}" }
       end
 
       context 'when secure is true' do
@@ -124,6 +126,32 @@ describe "OmniStore::Storage::S3" do
 
     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 }
@@ -131,23 +159,29 @@ describe "OmniStore::Storage::S3" do
       subject { lambda { OmniStore::Storage::S3.mountpoint.move(src, dst, other) } }
 
       before do
-        OmniStore::Config.mountpoint = { :a => AWS_BUCKET, :b => AWS_BUCKET }
+        OmniStore::Config.mountpoint = { :a => AWS_BUCKET, :b => AWS_BUCKET + 'b' }
         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) }
+      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 { create_object(src, :a) }
-        after  { delete_object(dst, :b) }
+        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

data/spec/spec_helper.rb

@@ -8,10 +8,9 @@ require 'aws-sdk'
 require 'omnistore'
 
 TMPDIR   = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
-#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']
+AWS_BUCKET = 'AWS_BUCKET'
 
 OmniStore.configure do |config|
   config.storage = 'local'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnistore
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -71898321
+      hash: 1003914863
 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: -71898321
+      hash: 1003914863
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24