tori 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804032544a779fc9014553a31b0ea5c2314a3db1
-  data.tar.gz: 487ba2e0af21edf8bf41b4163301f66049d27768
+  metadata.gz: da06eed7aefecd6c1a93ecc13aa940c11ebdc1b6
+  data.tar.gz: 095deaa57d6d8ac0f6f91fde433dcb8f37112443
 SHA512:
-  metadata.gz: 7027bb399d67358423ce0feb6655843f27381773afa1f500f1e35f1cec75fc8f2435b3e211f591e98f50bed23b144dbb31718444321c17f81cb0a64f9f266361
-  data.tar.gz: 2d47426d4c1afb1b07458ff8ed442031995fda718ba1659723cc6ed630ce64b1a7adfc61fa56f94fae3ee261c265b126241a0578cb9dbb7c7efa7a1aa74eabff
+  metadata.gz: ba156535d1288ff070d8211ae5caf6d8cd0760fecf3382ed2e49f3839865d9341ab913693b3d2c066a8a1f036b6f81bfc185efc45ce27a1dba03348b82760882
+  data.tar.gz: f23d6e28c92d609875dc3fa99d36cacd5edc9bde2254b4e0b9d00a225ba92abe6ff7bc9391f52e9f06ebe55f5eecc6533d807a22e451963401c55b5315d439f5

data/README.md

@@ -118,6 +118,7 @@ class PhotoController < ApplicationController
       photo.striped_image.write
     }
   end
+end
 ```
 
 # Custom configure example

data/lib/tori/backend/chain.rb

@@ -0,0 +1,52 @@
+module Tori
+  module Backend
+    # Chain based on `exist?` method
+    # @example
+    #   class Book < ActiveRecord::Base
+    #     include Tori::Backend # short cut
+    #
+    #     # If exist "lib/pdf" load this,
+    #     # But nothing, Load from S3 "book" bucket.
+    #     chain_backend = Chain.new(
+    #       FileSystem.new(Pathname("lib/pdf")),
+    #       S3.new(bucket: "book"),
+    #     )
+    #     tori :pdf, chain_backend do |model|
+    #       "book/#{__tori__}/#{model.id}"
+    #     end
+    #   end
+    class Chain
+      class ExistError < StandardError
+      end
+
+      def initialize(*backends)
+        @backends = backends
+      end
+
+      def backend(filename)
+        @backends.each do |b|
+          if b.exist?(filename)
+            return b
+          end
+        end
+        raise ExistError, "exist(#{filename}) backend not found"
+      end
+
+      def exist?(filename)
+        backend(filename)
+      rescue ExistError
+        false
+      else
+        true
+      end
+
+      def read(filename)
+        backend(filename).read(filename)
+      end
+
+      def open(filename, &block)
+        backend(filename).open(filename, &block)
+      end
+    end
+  end
+end

data/lib/tori/backend/filesystem.rb

@@ -39,6 +39,10 @@ module Tori
         ::File.read(path(filename), mode: 'rb')
       end
 
+      def open(filename, *rest, &block)
+        ::File.open(path(filename), *rest, &block)
+      end
+
       def path(filename)
         @root.join filename.to_s
       end

data/lib/tori/backend/s3.rb

@@ -130,6 +130,26 @@ module Tori
         signer.presigned_url(method, bucket: @bucket, key: filename)
       end
 
+      def open(filename)
+        ext = ::File.extname(filename)
+        body = body(filename)
+
+        if block_given?
+          Tempfile.create([filename, ext]) do |f|
+            f.write body
+            f.fsync
+            f.rewind
+            yield f
+          end
+        else
+          f = Tempfile.open([filename, ext])
+          f.write body
+          f.fsync
+          f.rewind
+          f
+        end
+      end
+
       def get_object(opts={})
         client.get_object bucket: @bucket, **opts
       end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/tori.rb

@@ -1,9 +1,3 @@
-require 'tori/backend/filesystem'
-require 'tori/config'
-require 'tori/context'
-require 'tori/define'
-require 'tori/file'
-require 'tori/version'
 require 'pathname'
 require 'digest/sha1'
 require "fileutils"
@@ -34,3 +28,11 @@ module Tori
     end
   end
 end
+
+require 'tori/backend/filesystem'
+require 'tori/backend/chain'
+require 'tori/config'
+require 'tori/context'
+require 'tori/define'
+require 'tori/file'
+require 'tori/version'

data/test/test_tori_backend_chain.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class TestToriBackendChain < Test::Unit::TestCase
+  include Tori::Backend
+
+  setup do
+    @filesystem1 = FileSystem.new(Pathname("test/tmp/tori/store1"))
+    File.open(@filesystem1.root.join("testfile-1"), 'w+'){ |f| f.write("text-1") }
+
+    @filesystem2 = FileSystem.new(Pathname("test/tmp/tori/store2"))
+    File.open(@filesystem2.root.join("testfile-2"), 'w+'){ |f| f.write("text-2") }
+
+    @backend = Chain.new(@filesystem1, @filesystem2)
+  end
+
+  test "#backend" do
+    assert { @filesystem1 == @backend.backend("testfile-1") }
+    assert { @filesystem2 == @backend.backend("testfile-2") }
+    assert_raise(Chain::ExistError) { @backend.backend("testfile-3") }
+  end
+
+  test "#exist?" do
+    assert { true == @backend.exist?("testfile-1") }
+    assert { true == @backend.exist?("testfile-2") }
+    assert { false == @backend.exist?("testfile-3") }
+  end
+
+  test "read" do
+    assert { "text-1" == @backend.read("testfile-1") }
+    assert { "text-2" == @backend.read("testfile-2") }
+    assert_raise(Chain::ExistError) { @backend.read("testfile-3") }
+  end
+
+  test "open" do
+    @backend.open("testfile-1") do |f|
+      assert { "text-1" == f.read }
+      assert { "test/tmp/tori/store1/testfile-1" == f.path }
+    end
+    @backend.open("testfile-2") do |f|
+      assert { "text-2" == f.read }
+      assert { "test/tmp/tori/store2/testfile-2" == f.path }
+    end
+    assert_raise(Chain::ExistError) { @backend.read("testfile-3") }
+  end
+end

data/test/test_tori_backend_filesystem.rb

@@ -18,6 +18,7 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
 
   test "#exist?" do
     assert { true == @filesystem.exist?(".") }
+    assert { true == @filesystem.exist?("testfile") }
     assert { false == @filesystem.exist?("nothing_file") }
   end
 
@@ -55,4 +56,13 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
     @filesystem.write(Pathname.new("copyfile"), "string")
     assert { "string" == @filesystem.read("copyfile") }
   end
+
+  test "#open" do
+    @filesystem.open("testfile") do |f|
+      assert_instance_of File, f
+    end
+    f = @filesystem.open("testfile")
+    assert_instance_of File, f
+    f.close
+  end
 end

data/test/test_tori_backend_s3.rb

@@ -111,6 +111,18 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert_match @backend.bucket, @backend.public_url("testfile")
     assert_match "testfile", @backend.public_url("testfile")
   end
+
+  test "#open" do
+    path = nil
+    @backend.open("testfile") do |f|
+      assert_instance_of File, f
+      path = f.path
+    end
+    assert { false == File.exist?(path) }
+    f = @backend.open("testfile")
+    assert_instance_of Tempfile, f
+    f.close!
+  end
 end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -94,6 +94,7 @@ files:
 - README.md
 - Rakefile
 - lib/tori.rb
+- lib/tori/backend/chain.rb
 - lib/tori/backend/filesystem.rb
 - lib/tori/backend/s3.rb
 - lib/tori/config.rb
@@ -104,6 +105,7 @@ files:
 - lib/tori/version.rb
 - test/test_helper.rb
 - test/test_tori.rb
+- test/test_tori_backend_chain.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_backend_s3.rb
 - test/test_tori_config.rb
@@ -137,6 +139,7 @@ summary: Simple file uploader
 test_files:
 - test/test_helper.rb
 - test/test_tori.rb
+- test/test_tori_backend_chain.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_backend_s3.rb
 - test/test_tori_config.rb