tori 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef7b4999b8e45c9a0dc01694ed2d959d17937605
-  data.tar.gz: cc3f86d2242538bbe8dd0e6014d2df4ba2078c6f
+  metadata.gz: e11c2e0db7bb0f1a6c31deecc5a07f21d38b8f56
+  data.tar.gz: f6b4c1abe7704d7b6e0718993771cb7842ee9c7c
 SHA512:
-  metadata.gz: e613f73fcfb2195a1f3635527be1a60e2627bc0db7c1c39f10056d35c970f3683666519cb4d3afecde4e69faff43df83a089ae0e9ef31fb2f84e5fa772827799
-  data.tar.gz: e7c63029df20ff69d6def1c69bbe38ea7f2c27bb1a2afe4d8fe417851bf8de84f15709802e64e7e7c0fec9e9d2bc5a48ee5779cb3560990029c1d026fff820d5
+  metadata.gz: 0bc44fe133ca9d2192066f6a01bd2f3f252f5994b48fa08b6614282fd7a96b56fcbab13dbafdb4ad7e05e6e9c281e92de7dc5e5f381bf0c3e874f3c6515972bf
+  data.tar.gz: e051c4febe852bbc5f37f4978ee4cd67db08bbd561575b3affaabdd73d5cf1195c94e9ca4032ec5b3ada5c85551ab7548580db3c622c23bf81c6cbeaf8af230f

data/lib/tori/backend/filesystem.rb

@@ -1,6 +1,8 @@
 module Tori
   module Backend
     class FileSystem
+      ResourceError = Class.new(StandardError)
+
       attr_accessor :root
       def initialize(root)
         @root = root
@@ -11,6 +13,10 @@ module Tori
         pathname = path(filename)
         FileUtils.mkdir_p pathname.dirname
 
+        if resource.nil? && opts && opts[:body]
+          resource = opts[:body]
+        end
+
         case resource
         when String
           ::File.open(pathname, 'wb'){ |f| f.write resource }
@@ -21,6 +27,8 @@ module Tori
               ::IO.copy_stream src, dst
             }
           }
+        when NilClass
+          raise ResourceError, "null resource"
         else
           ::File.open(pathname, 'wb') do |dst|
             ::IO.copy_stream resource, dst

data/lib/tori/backend/s3.rb

@@ -113,9 +113,9 @@ module Tori
         put_object key: filename, body: body, **opts
       end
 
-      def head(filename = nil)
+      def head(filename = nil, **opts)
         if filename
-          head_object key: filename
+          head_object key: filename, **opts
         else
           head_bucket
         end

data/lib/tori/file.rb

@@ -38,10 +38,6 @@ module Tori
       !@from.nil?
     end
 
-    def read
-      backend.read name
-    end
-
     def write(opts = nil)
       opts ||= {}
       backend.write name, @from, opts.merge(from_path: @from_path)
@@ -73,7 +69,7 @@ module Tori
       if respond_to_missing?(sym, false)
         backend.__send__ sym, name, *args, &block
       else
-        fail NameError, "undefined method `#{sym}' for #{Tori.config.backend.inspect}"
+        raise NameError, "undefined method `#{sym}' for #{backend}"
       end
     end
   end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/test/test_tori_backend_filesystem.rb

@@ -25,9 +25,16 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
   test "#read" do
     assert { "text" == @filesystem.read("testfile") }
     assert_raise(Errno::ENOENT){ @filesystem.read("nothing_file") }
+
     bin = (0..0xFF).to_a.pack("c*")
-    File.open(@filesystem.root.join("binfile"), 'wb'){ |f| f.write bin }
+    File.open(@filesystem.root.join("binfile"), 'wb') { |f| f.write bin }
     assert { bin == @filesystem.read("binfile") }
+
+    utf8 = "こんにちは世界"
+    File.open(@filesystem.root.join("utf8file"), 'wb') { |f| f.write utf8 }
+    assert { utf8 != @filesystem.read("utf8file") }
+    assert { utf8 == @filesystem.read("utf8file", external_encoding: Encoding::UTF_8) }
+
     assert { Encoding::ASCII_8BIT == @filesystem.read("binfile").encoding }
     assert { Encoding::UTF_8 == @filesystem.read("binfile", external_encoding: Encoding::UTF_8).encoding }
   end
@@ -48,6 +55,16 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
     @filesystem.write("copyfile", "string")
     assert { "string" == @filesystem.read("copyfile") }
 
+    assert_raise(Tori::Backend::FileSystem::ResourceError) do
+      @filesystem.write("copyfile", nil)
+    end
+
+    @filesystem.write("copyfile", nil, body: "S3 compatible API")
+    assert { "S3 compatible API" == @filesystem.read("copyfile") }
+
+    @filesystem.write("copyfile", "resource is priority", body: "S3 compatible API")
+    assert { "resource is priority" == @filesystem.read("copyfile") }
+
     bin = (0..0xFF).to_a.pack("c*")
     @filesystem.write("binfile", bin)
     assert { bin == @filesystem.read("binfile") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core