tori 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e78b51cb71ee2dae463df6a3b2bc3518c9d4b1
-  data.tar.gz: a451f2d4fd7cdc7b4dcf15d4792a8ce36bbaabe7
+  metadata.gz: 7f9e73b59d43f6d816af38e163263f8ad366b29f
+  data.tar.gz: 61c1bfa6790ebf0b8f5e9ee6aa967c2a56d4150f
 SHA512:
-  metadata.gz: 9e0474b601c7e5b5c9ecc9a53b8218eed8e39b8ae768527894f1eed5e28b2e10387dcebccf9a89d11e46fc8d5937495ba63997504648cbcb3d8456319595ea1e
-  data.tar.gz: 8f3dfe3d4309f8528129a341805c881fcfb3d23139ac9357cbaefbc41990ab892f3be9992730125e6ea2b057840b0ff3e58d3a2d4603bafb7b63c61dce3ed717
+  metadata.gz: 62cf0872b2c0798d92a223c45badb6a7665bbddf923af5b42ef3e24588a081632b4e26805cbfde96092899c3fb8ea4730288a6e28fb68dccfd66c4d7c90f17e9
+  data.tar.gz: c95fe43b976782cc20085f1ef00a562bd3b3eba620d6c13ecc66c6c19909dcbb1680f4962f4b1444dbbb0d26e930aae77211ce3944be51ff97e84d2f1142392b

data/lib/tori/backend/filesystem.rb

@@ -10,17 +10,19 @@ module Tori
       def write(filename, resource, opts = nil)
         case resource
         when String
-          ::File.open(path(filename), 'w'){ |f| f.write resource }
+          ::File.open(path(filename), 'wb'){ |f| f.write resource }
         when Pathname
           # see also https://bugs.ruby-lang.org/issues/11199
           ::File.open(resource) { |src|
             FileUtils.mkdir_p path(filename).dirname
-            ::File.open(path(filename), 'w'){ |dst|
+            ::File.open(path(filename), 'wb'){ |dst|
               ::IO.copy_stream src, dst
             }
           }
         else
-          ::IO.copy_stream resource, path(filename)
+          ::File.open(path(filename), 'wb') do |dst|
+            ::IO.copy_stream resource, dst
+          end
         end
       end
 
@@ -34,7 +36,7 @@ module Tori
       alias exists? exist?
 
       def read(filename)
-        ::File.read path(filename)
+        ::File.read(path(filename), mode: 'rb')
       end
 
       def path(filename)

data/lib/tori/backend/s3.rb

@@ -14,6 +14,15 @@ module Tori
       #
       # example:
       #   Tori.config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
+      #   # or
+      #   Tori.config.backend = Tori::Backend::S3.new(
+      #     bucket: 'tori_bucket',
+      #     client: Aws::S3::Client.new(
+      #       access_key_id: 'your_access_key',
+      #       secret_access_key: 'your_secret_access_key',
+      #       region: 'your-region-1'
+      #     )
+      #   )
       def initialize(bucket:, client: nil)
         @bucket = bucket
         if client

data/lib/tori/file.rb

@@ -2,7 +2,12 @@ module Tori
   class File
     def initialize(model, from: nil, &block)
       @model = model
-      @from = from
+      if from.respond_to?(:read) and from.respond_to?(:rewind)
+        from.rewind
+        @from = from.read
+      else
+        @from = from
+      end
       @filename_callback = block
     end
 
@@ -16,13 +21,11 @@ module Tori
     alias to_s name
 
     def from?
-      !@from.nil? && @from.respond_to?(:path)
+      !@from.nil?
     end
 
     def write(opts = nil)
-      path = @from.path
-      path = Pathname.new(path) if path.kind_of?(String)
-      Tori.config.backend.write name, path, opts
+      Tori.config.backend.write name, @from, opts
     end
 
     def delete

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_tori_backend_filesystem.rb

@@ -24,6 +24,9 @@ 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 }
+    assert { bin == @filesystem.read("binfile") }
   end
 
   test "#path" do
@@ -42,6 +45,10 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
     @filesystem.write("copyfile", "string")
     assert { "string" == @filesystem.read("copyfile") }
 
+    bin = (0..0xFF).to_a.pack("c*")
+    @filesystem.write("binfile", bin)
+    assert { bin == @filesystem.read("binfile") }
+
     @filesystem.write(Pathname.new("copyfile"), @filesystem.path("testfile"))
     assert { "text" == @filesystem.read("copyfile") }
 

data/test/test_tori_file.rb

@@ -15,7 +15,10 @@ class TestToriFile < Test::Unit::TestCase
   end
 
   class From
-    def path
+    def rewind
+    end
+
+    def read
       __FILE__
     end
   end
@@ -47,6 +50,21 @@ class TestToriFile < Test::Unit::TestCase
     assert { true == File.exist?("test/tmp/copy") }
   end
 
+  test "write with closed file" do
+    tori_file = nil
+    path = nil
+    Tempfile.create("tempfile") do |f|
+      path = f.path
+      f.write("should be match ;)")
+      tori_file = Tori::File.new("tempfile", from: f)
+    end
+    tori_file.write
+    assert { true == File.exist?("test/tmp/tempfile") }
+    assert { false == File.exist?(path) }
+    assert { "should be match ;)" == File.read("test/tmp/tempfile") }
+    assert { "should be match ;)" == tori_file.read }
+  end
+
   test "#method_missing" do
     assert { true == Tori::File.new(nil).respond_to?(:read) }
     assert_raise(NameError) { Tori::File.new(nil).undefined }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core