tori 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954188d945ed7e2571b4f9d3acb4658bf1b8d36a
-  data.tar.gz: e1b66fb27490fd05f5744efe1f8b1ffb5a78671f
+  metadata.gz: ef22b0bed2a470cd73649e4b670b4367f62bf54b
+  data.tar.gz: 5c2091a805f0523332f1899311b152895d0480a0
 SHA512:
-  metadata.gz: 2e2ede21685e50eb023c0a8ddb7158ef55667832ab46d0a5638793ec563ea19e19821ad3649b057f81c0f7d6d14e133ede37cf18d94cb71c36d3f0745435ead6
-  data.tar.gz: efae86ba56f3864370475dc346dac71377f47034e60ab88db730ef02b8b2fa0ca90fe6f45e54f0515d722e7d2ce3ed0f26138f444f2e9ec3b91fc6b5a9d6da2e
+  metadata.gz: d1aaf455fec43764adeb11cce85fe032e86497233fa7bbbced114960a39c8ba559732d7328e74248270c3af4600f8ccddf47e3d2b32a32b3391d4c2c49a053a4
+  data.tar.gz: 1e8a4198727bed9e08ba4e32c2a7081fbf72df7563590e59c91cfd6a74bb4ad3122bee46584c6c09e8778d49a5ffa4d0b5c3fe2360529e04798fc053aea7bf9b

data/lib/tori/backend/s3.rb

@@ -130,22 +130,18 @@ module Tori
         signer.presigned_url(method, bucket: @bucket, key: filename)
       end
 
-      def open(filename)
-        blob = read(filename)
-        opt = [::File.basename(filename), ::File.extname(filename)]
+      def open(filename, opts = {})
+        names = [::File.basename(filename), ::File.extname(filename)]
+        tmpdir = opts.delete(:tmpdir)
 
         if block_given?
-          Tempfile.create(opt) do |f|
-            f.write blob
-            f.fsync
-            f.rewind
+          Tempfile.create(names, tmpdir, opts) do |f|
+            get_object(key: filename, response_target: f.path)
             yield f
           end
         else
-          f = Tempfile.open(opt)
-          f.write blob
-          f.fsync
-          f.rewind
+          f = Tempfile.open(names, tmpdir, opts)
+          get_object(key: filename, response_target: f.path)
           f
         end
       end

data/lib/tori/file.rb

@@ -59,9 +59,9 @@ module Tori
       backend.respond_to?(sym, include_private)
     end
 
-    def method_missing(sym, *args)
+    def method_missing(sym, *args, &block)
       if respond_to_missing?(sym, false)
-        backend.__send__ sym, name, *args
+        backend.__send__ sym, name, *args, &block
       else
         fail NameError, "undefined method `#{sym}' for #{Tori.config.backend.inspect}"
       end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/test_tori_backend_s3.rb

@@ -115,17 +115,19 @@ class TestToriBackendS3 < Test::Unit::TestCase
     path = nil
     @backend.open("testfile") do |f|
       assert_instance_of File, f
+      assert { "text" == f.read }
       path = f.path
     end
     assert { false == File.exist?(path) }
-    f = @backend.open("testfile")
+    f = @backend.open("testfile", tmpdir: "test/tmp")
     assert_instance_of Tempfile, f
+    assert { f.path =~ %r{test/tmp/.*} }
     f.close!
 
     @backend.write("path/to/file", @testfile_path)
     @backend.open("path/to/file") do |f|
       assert_instance_of File, f
-      path = f.path
+      assert { "text" == f.read }
     end
   end
 end

data/test/test_tori_file.rb

@@ -81,5 +81,6 @@ class TestToriFile < Test::Unit::TestCase
   test "#method_missing" do
     assert { true == Tori::File.new(nil).respond_to?(:read) }
     assert_raise(NameError) { Tori::File.new(nil).undefined }
+    assert { [true, Encoding.find('utf-8'), 'test/tmp'] == Tori::File.new(nil).open('rb', external_encoding: 'utf-8'){ |f| [f.binmode?, f.external_encoding, f.path] } }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core