tori 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0860a5b2a95c5bd92c5064c468688493ae765511
-  data.tar.gz: 97a4aced93b66300b731705a45df60fbb1b1be1e
+  metadata.gz: d56e52c07a06315670397f3d6e8a247bdc292e35
+  data.tar.gz: 72d150ad6dec4b370910480c9610d92d04480de3
 SHA512:
-  metadata.gz: f606846b2e54e652f5fbba5143e8823ad798cc20c8870b6cdcaaba1f68b8001d22535d9824d9e2d327d09c1f8a35a20c83c3abd5b5409595b1b105c750b9ddec
-  data.tar.gz: 10bf3e48938ae58055cdf189865502b18a4158c1d53a9059324b64a59a9335ab485e0cd8c772e93436bd47d8e03a25e9823a17913565d46ec644a00ffd980012
+  metadata.gz: 77d2cf552e6a0f85cfdfb684d4a5788026255fffad670a096b4d96790cb7fc3e92332f51990e23b9e369a3d002110b27e0298b78ad9732a0838c396eeb9a0e29
+  data.tar.gz: 0881c4547307abec21c2a6b66cdcacfa08b9c6a951ac3b12348316c0758b5eb8e7bc1b015f2bf3f3c4d388b8243da5ecebe298ee3b1b46143726b6c986da9fdf

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 notifications:
   email: false

data/lib/tori/backend/filesystem.rb

@@ -35,8 +35,8 @@ module Tori
       end
       alias exists? exist?
 
-      def read(filename)
-        ::File.read(path(filename), mode: 'rb')
+      def read(filename, **args)
+        ::File.read(path(filename), { mode: 'rb' }.merge(args))
       end
 
       def open(filename, *rest, &block)
@@ -46,6 +46,10 @@ module Tori
       def path(filename)
         @root.join filename.to_s
       end
+
+      def otherwise(backend)
+        Chain.new(self, backend)
+      end
     end
   end
 end

data/lib/tori/backend/s3.rb

@@ -146,6 +146,10 @@ module Tori
         end
       end
 
+      def otherwise(backend)
+        Chain.new(self, backend)
+      end
+
       def get_object(opts={})
         client.get_object bucket: @bucket, **opts
       end

data/lib/tori/file.rb

@@ -3,22 +3,10 @@ module Tori
     def initialize(model, title: nil, from: nil, to: nil, &block)
       @model = model
       @title = title.kind_of?(String) ? title.to_sym : title
-
-      @from_path = if from.respond_to?(:path)
-        from.path
-      else
-        nil
-      end
-
       @backend = to
-
-      @from = if from.respond_to?(:read) and from.respond_to?(:rewind)
-        from.rewind
-        from.read
-      else
-        from
-      end
       @filename_callback = block
+
+      self.from = from
     end
 
     def name
@@ -28,7 +16,24 @@ module Tori
     end
     alias to_s name
 
-    attr_reader :from
+    def from
+      @from
+    end
+
+    def from=(file)
+      @from_path = if file.respond_to?(:path)
+        file.path
+      else
+        nil
+      end
+      @from = if file.respond_to?(:read) and file.respond_to?(:rewind)
+        file.rewind
+        file.read
+      else
+        file
+      end
+    end
+
     def from?
       !@from.nil?
     end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/test/test_tori_backend_chain.rb

@@ -13,6 +13,12 @@ class TestToriBackendChain < Test::Unit::TestCase
     @backend = Chain.new(@filesystem1, @filesystem2)
   end
 
+  test "#initialize" do
+    assert { Chain === Chain.new }
+    assert { [@filesystem1, @filesystem2] === Chain.new(@filesystem1, @filesystem2).backends }
+    assert { Chain === @filesystem1.otherwise(@filesystem2) }
+  end
+
   test "#backend" do
     assert { @filesystem1 == @backend.backend("testfile-1") }
     assert { @filesystem2 == @backend.backend("testfile-2") }

data/test/test_tori_backend_filesystem.rb

@@ -28,6 +28,8 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
     bin = (0..0xFF).to_a.pack("c*")
     File.open(@filesystem.root.join("binfile"), 'wb'){ |f| f.write bin }
     assert { bin == @filesystem.read("binfile") }
+    assert { Encoding::ASCII_8BIT == @filesystem.read("binfile").encoding }
+    assert { Encoding::UTF_8 == @filesystem.read("binfile", external_encoding: Encoding::UTF_8).encoding }
   end
 
   test "#path" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple file uploader