tori 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef22b0bed2a470cd73649e4b670b4367f62bf54b
-  data.tar.gz: 5c2091a805f0523332f1899311b152895d0480a0
+  metadata.gz: 0860a5b2a95c5bd92c5064c468688493ae765511
+  data.tar.gz: 97a4aced93b66300b731705a45df60fbb1b1be1e
 SHA512:
-  metadata.gz: d1aaf455fec43764adeb11cce85fe032e86497233fa7bbbced114960a39c8ba559732d7328e74248270c3af4600f8ccddf47e3d2b32a32b3391d4c2c49a053a4
-  data.tar.gz: 1e8a4198727bed9e08ba4e32c2a7081fbf72df7563590e59c91cfd6a74bb4ad3122bee46584c6c09e8778d49a5ffa4d0b5c3fe2360529e04798fc053aea7bf9b
+  metadata.gz: f606846b2e54e652f5fbba5143e8823ad798cc20c8870b6cdcaaba1f68b8001d22535d9824d9e2d327d09c1f8a35a20c83c3abd5b5409595b1b105c750b9ddec
+  data.tar.gz: 10bf3e48938ae58055cdf189865502b18a4158c1d53a9059324b64a59a9335ab485e0cd8c772e93436bd47d8e03a25e9823a17913565d46ec644a00ffd980012

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.6
-  - 2.2.2
+  - 2.1
+  - 2.2
 notifications:
   email: false

data/lib/tori/backend/chain.rb

@@ -19,6 +19,8 @@ module Tori
       class ExistError < StandardError
       end
 
+      attr_accessor :backends
+
       def initialize(*backends)
         @backends = backends
       end

data/lib/tori/backend/s3.rb

@@ -97,19 +97,19 @@ module Tori
       end
       alias exists? exist?
 
-      def read(filename)
-        body(filename).read
+      def read(filename, **opts)
+        body(filename, **opts).read
       end
 
-      def get(filename)
-        get_object(key: filename)
+      def body(filename, **opts)
+        get(filename, **opts)[:body]
       end
 
-      def body(filename)
-        get(filename)[:body]
+      def get(filename, **opts)
+        get_object(key: filename, **opts)
       end
 
-      def put(filename, body, opts={})
+      def put(filename, body, **opts)
         put_object key: filename, body: body, **opts
       end
 

data/lib/tori/file.rb

@@ -28,6 +28,7 @@ module Tori
     end
     alias to_s name
 
+    attr_reader :from
     def from?
       !@from.nil?
     end
@@ -53,6 +54,10 @@ module Tori
       @backend || Tori.config.backend
     end
 
+    def backend=(new_backend)
+      @backend = new_backend
+    end
+
     private
 
     def respond_to_missing?(sym, include_private)

data/lib/tori/version.rb

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

data/test/test_tori_backend_s3.rb

@@ -93,6 +93,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
 
   test "#read" do
     assert_equal "text", @backend.read("testfile")
+    assert_raise(Aws::S3::Errors::NoSuchKey) { @backend.read("testfile", key: "nothing") }
   end
 
   test "#exists?" do

data/test/test_tori_file.rb

@@ -42,6 +42,10 @@ class TestToriFile < Test::Unit::TestCase
     assert { false == Tori::File.new("nothing_file").exist? }
   end
 
+  test "#from" do
+    assert { __FILE__ == Tori::File.new(__FILE__, from: From.new).from }
+  end
+
   test "#from?" do
     assert { false == Tori::File.new(__FILE__).from? }
     assert { true == Tori::File.new(__FILE__, from: From.new).from? }
@@ -53,6 +57,17 @@ class TestToriFile < Test::Unit::TestCase
     assert { true == File.exist?("test/tmp/copy") }
   end
 
+  test "backend" do
+    assert { Tori.config.backend == Tori::File.new(nil).backend }
+  end
+
+  test "backend=" do
+    o = Object.new
+    t = Tori::File.new(nil)
+    assert { o == (t.backend = (o)) }
+    assert { o == t.backend }
+  end
+
   test "write with closed file" do
     tori_file = nil
     path = nil

metadata

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