tori 0.6.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e11c2e0db7bb0f1a6c31deecc5a07f21d38b8f56
-  data.tar.gz: f6b4c1abe7704d7b6e0718993771cb7842ee9c7c
+SHA256:
+  metadata.gz: c3f5c0fb1cf2098cfb8ce401f8627fba1b88c25b1a95a14df1dfe00d38296a1e
+  data.tar.gz: d905f6ecfe1a49fd9c648e2aabd3423079af98bcd9e18efd1cabcd6f199b78f2
 SHA512:
-  metadata.gz: 0bc44fe133ca9d2192066f6a01bd2f3f252f5994b48fa08b6614282fd7a96b56fcbab13dbafdb4ad7e05e6e9c281e92de7dc5e5f381bf0c3e874f3c6515972bf
-  data.tar.gz: e051c4febe852bbc5f37f4978ee4cd67db08bbd561575b3affaabdd73d5cf1195c94e9ca4032ec5b3ada5c85551ab7548580db3c622c23bf81c6cbeaf8af230f
+  metadata.gz: 81fef0f07412e79e59a691b520de8dace5a50d1a1870a4a134fe4fa10f9ce6188544abf7e898eb206a7cfd106e2e3630bc97d15f13c86c3eabc65e06c2b75543
+  data.tar.gz: 6ae9bef76edb139011bb8214b6b047e1934799f37afc078e62a0cad146e9a9216371500612839e941779c5bf0f10a6de9c5e1d02454af4079b4bc70978421cdd

data/.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
+          - '2.4'
+          - '2.3'
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake test

data/README.md

@@ -1,13 +1,13 @@
 Tori
 ===
 
-[![Build Status](https://travis-ci.org/ksss/tori.svg?branch=master)](https://travis-ci.org/ksss/tori)
+[![test](https://github.com/ksss/tori/actions/workflows/test.yml/badge.svg)](https://github.com/ksss/tori/actions/workflows/test.yml)
 
 "(\\( ⁰⊖⁰)/)"
 
 Tori is a very very simple file uploader.
 
-Tori dose nothing.
+Tori does nothing.
 
 Only file upload to backend store.
 
@@ -121,29 +121,6 @@ class PhotoController < ApplicationController
 end
 ```
 
-# Custom configure example
-
-```ruby
-# Save to S3 bucket.
-require 'tori/backend/s3'
-Tori.config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
-
-# Filename decided by model.class.name,id and hidden words.
-Tori.config.filename_callback do |model|
-  "#{model.class.name}/#{Digest::SHA1.hexdigest "#{ENV["TORI_MAGICKWORD"]}/#{model.id}"}"
-end
-
-# You can change any way define filename.
-Tori.config.filename_callback do |model|
-  # `__tori__` method is meta name of defined by `tori` method.
-  "#{model.class.name}/#{__tori__}/#{model.title}"
-  # class Photo
-  #   tori :orig #=> "Photo/orig/cool-shot.png"
-  #   tori :strip #=> "Photo/strip/cool-shot.png"
-  # end
-end
-```
-
 # Default configure
 
 [https://github.com/ksss/tori/blob/master/lib/tori.rb](https://github.com/ksss/tori/blob/master/lib/tori.rb)

data/lib/tori/backend/filesystem.rb

@@ -1,3 +1,5 @@
+require 'ruby2_keywords'
+
 module Tori
   module Backend
     class FileSystem
@@ -45,12 +47,41 @@ module Tori
       end
       alias exists? exist?
 
-      def read(filename, **args)
-        ::File.read(path(filename), { mode: 'rb' }.merge(args))
+      if RUBY_VERSION < '2.7'
+        ruby2_keywords def read(filename, *args)
+          if args.last.kind_of?(Hash)
+            opt = args.pop
+          else
+            opt = {}
+          end
+          open(filename, {mode: 'rb'}.merge(opt)) do |f|
+            f.read(*args)
+          end
+        end
+
+        ruby2_keywords def open(filename, *rest, &block)
+          ::File.open(path(filename), *rest, &block)
+        end
+      else
+        def read(filename, len=nil, **args)
+          open(filename, **{mode: 'rb'}.merge(args)) do |f|
+            f.read(len)
+          end
+        end
+
+        def open(filename, **rest, &block)
+          ::File.open(path(filename), **rest, &block)
+        end
       end
 
-      def open(filename, *rest, &block)
-        ::File.open(path(filename), *rest, &block)
+      def copy_to(filename, tori_file, **opts)
+        FileUtils.mkdir_p tori_file.path.dirname
+
+        ::File.open(path(filename)) do |from|
+          ::File.open(tori_file.path, 'w+') do |to|
+            IO.copy_stream(from, to)
+          end
+        end
       end
 
       def path(filename)

data/lib/tori/backend/s3.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk-core'
+require 'aws-sdk-s3'
 require 'mime/types'
 
 module Tori
@@ -57,6 +57,10 @@ module Tori
           opts[:content_type] = self.class.type_for(from_path)
         end
 
+        if resource.nil? && opts[:body]
+          resource = opts[:body]
+        end
+
         case resource
         when String
           put_object({
@@ -121,6 +125,15 @@ module Tori
         end
       end
 
+      def copy_to(filename, tori_file, **opts)
+        copy_object(
+          copy_source: "#{bucket}/#{filename}",
+          bucket:      bucket,
+          key:         tori_file.name,
+          **opts,
+        )
+      end
+
       def public_url(filename)
         "#{client.config.endpoint}/#{@bucket}/#{filename}"
       end
@@ -135,12 +148,12 @@ module Tori
         tmpdir = opts.delete(:tmpdir)
 
         if block_given?
-          Tempfile.create(names, tmpdir, opts) do |f|
+          Tempfile.create(names, tmpdir, **opts) do |f|
             get_object(key: filename, response_target: f.path)
             yield f
           end
         else
-          f = Tempfile.open(names, tmpdir, opts)
+          f = Tempfile.open(names, tmpdir, **opts)
           get_object(key: filename, response_target: f.path)
           f
         end
@@ -169,6 +182,10 @@ module Tori
       def delete_object(opts={})
         client.delete_object bucket: @bucket, **opts
       end
+
+      def copy_object(opts = {})
+        client.copy_object bucket: @bucket, **opts
+      end
     end
   end
 end

data/lib/tori/file.rb

@@ -1,3 +1,5 @@
+require 'ruby2_keywords'
+
 module Tori
   class File
     def initialize(model, title: nil, from: nil, to: nil, &block)
@@ -65,12 +67,24 @@ module Tori
       backend.respond_to?(sym, include_private)
     end
 
-    def method_missing(sym, *args, &block)
-      if respond_to_missing?(sym, false)
-        backend.__send__ sym, name, *args, &block
-      else
-        raise NameError, "undefined method `#{sym}' for #{backend}"
+    if RUBY_VERSION < "2.7"
+      ruby2_keywords def method_missing(sym, *args, &block)
+        if respond_to_missing?(sym, false)
+          backend.__send__ sym, name, *args, &block
+        else
+          raise NameError, "undefined method `#{sym}' for #{backend}"
+        end
       end
+    else
+      eval <<~'RUBY'
+        def method_missing(sym, ...)
+          if respond_to_missing?(sym, false)
+            backend.__send__(sym, name, ...)
+          else
+            raise NameError, "undefined method `#{sym}' for #{backend}"
+          end
+        end
+      RUBY
     end
   end
 end

data/lib/tori/version.rb

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

data/test/aws_s3_stub.rb

@@ -0,0 +1,10 @@
+Aws.config[:s3] = {
+  stub_responses: {
+    head_bucket: {},
+    get_object: {
+      content_type: "text/plain",
+      body: "foo",
+      content_length: 3,
+    }
+  }
+}

data/test/test_tori_backend_filesystem.rb

@@ -34,6 +34,7 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
     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 { "\xE3".b == @filesystem.read("utf8file", 1) }
 
     assert { Encoding::ASCII_8BIT == @filesystem.read("binfile").encoding }
     assert { Encoding::UTF_8 == @filesystem.read("binfile", external_encoding: Encoding::UTF_8).encoding }

data/test/test_tori_backend_s3.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 require 'tori/backend/s3'
-
-if ENV["TORI_TEST_BUCKET"]
+require_relative 'aws_s3_stub'
 
 class TestToriBackendS3 < Test::Unit::TestCase
   BucketNotFoundError = Class.new(StandardError)
+  TORI_TEST_BUCKET = 'tori-testing-bucket'
   def request_head(url)
     uri = URI.parse(url)
     req = Net::HTTP::Head.new(uri.path)
@@ -14,7 +14,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
   end
 
   setup do
-    @backend = Tori::Backend::S3.new(bucket: ENV["TORI_TEST_BUCKET"])
+    @backend = Tori::Backend::S3.new(bucket: TORI_TEST_BUCKET, client: Aws::S3::Client.new)
     fail BucketNotFoundError, "S3 test need make s3 bucket '#{@backend.bucket}'" unless @backend.exists?
 
     @testfile_path = Pathname.new("test/tmp/testfile")
@@ -28,16 +28,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
   end
 
   test "auto content_type" do
-    Tempfile.create(["test", ".jpeg"]) do |f|
-      file = Tori::File.new(:dummy, from: f, to: @backend){ |model| "test-key" }
-      begin
-        file.write
-        content_type = file.get.content_type
-        assert { 'image/jpeg' == content_type }
-      ensure
-        file.delete
-      end
-    end
+    assert { 'image/jpeg' == Tori::Backend::S3.type_for("test.jpeg") }
   end
 
   test "#initialize" do
@@ -46,7 +37,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert { ENV["TORI_AWS_SECRET_ACCESS_KEY"] == @backend.client.config.secret_access_key }
 
     custom_backend = Tori::Backend::S3.new(
-      bucket: ENV["TORI_TEST_BUCKET"],
+      bucket: TORI_TEST_BUCKET,
       client: Aws::S3::Client.new(access_key_id: 'aaa', secret_access_key: 'bbb'),
     )
     assert_instance_of Tori::Backend::S3, custom_backend
@@ -56,7 +47,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert_raise(ArgumentError){ Tori::Backend::S3.new }
     assert_raise(TypeError) {
       Tori::Backend::S3.new(
-        bucket: ENV["TORI_TEST_BUCKET"],
+        bucket: TORI_TEST_BUCKET,
         client: Object.new,
       )
     }
@@ -69,9 +60,9 @@ class TestToriBackendS3 < Test::Unit::TestCase
   end
 
   test "#write String" do
-    @backend.write("testfile", "foo", content_type: "image/png")
+    @backend.write("testfile", "foo", content_type: "text/plain")
     testfile = @backend.get_object(key: "testfile")
-    assert { "image/png" == testfile.content_type }
+    assert { "text/plain" == testfile.content_type }
     assert { "foo" == testfile[:body].read }
   end
 
@@ -79,21 +70,15 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert_nothing_raised { @backend.write("testfile", @testfile_path) }
     testfile = @backend.get_object(key: "testfile")
     assert { "text/plain" == testfile.content_type }
-    assert { 4 == testfile.content_length }
-    assert { "text" == testfile[:body].read }
-
-    @backend.write("testfile", @testfile_path, acl: "public-read-write")
-    res = request_head(@backend.public_url("testfile"))
-    assert { Net::HTTPOK === res}
+    assert { 3 == testfile.content_length }
+    assert { "foo" == testfile[:body].read }
 
-    @backend.write("testfile", @testfile_path, acl: "private")
-    res = request_head(@backend.public_url("testfile"))
-    assert { Net::HTTPForbidden === res}
+    assert_nothing_raised { @backend.write("testfile", @testfile_path, acl: "public-read-write") }
+    assert_nothing_raised { @backend.write("testfile", @testfile_path, acl: "private") }
   end
 
   test "#read" do
-    assert_equal "text", @backend.read("testfile")
-    assert_raise(Aws::S3::Errors::NoSuchKey) { @backend.read("testfile", key: "nothing") }
+    assert_equal "foo", @backend.read("testfile")
   end
 
   test "#exists?" do
@@ -103,11 +88,10 @@ class TestToriBackendS3 < Test::Unit::TestCase
 
   test "#delete" do
     assert_nothing_raised { @backend.delete("testfile") }
-    assert { false == @backend.exists?("testfile") }
   end
 
   test "#public_url" do
-    assert_match %r!https?://s3-!, @backend.public_url("testfile")
+    assert_match %r!https?://s3!, @backend.public_url("testfile")
     assert_match @backend.bucket, @backend.public_url("testfile")
     assert_match "testfile", @backend.public_url("testfile")
   end
@@ -116,7 +100,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     path = nil
     @backend.open("testfile") do |f|
       assert_instance_of File, f
-      assert { "text" == f.read }
+      assert { "foo" == f.read }
       path = f.path
     end
     assert { false == File.exist?(path) }
@@ -128,9 +112,15 @@ class TestToriBackendS3 < Test::Unit::TestCase
     @backend.write("path/to/file", @testfile_path)
     @backend.open("path/to/file") do |f|
       assert_instance_of File, f
-      assert { "text" == f.read }
+      assert { "foo" == f.read }
     end
   end
-end
 
+  test "#copy_to" do
+    o = Object.new
+    file = Tori::File.new(o) do |model|
+      model.object_id.to_s
+    end
+    @backend.copy_to("copy_to_file", file)
+  end
 end

data/test/test_tori_file.rb

@@ -10,7 +10,7 @@ class TestToriFile < Test::Unit::TestCase
   end
 
   teardown do
-    Tori.config.filename_callback &@orig
+    Tori.config.filename_callback(&@orig)
     FileUtils.rm_rf("test/tmp")
   end
 
@@ -18,7 +18,7 @@ class TestToriFile < Test::Unit::TestCase
     def rewind
     end
 
-    def read
+    def read(*)
       __FILE__
     end
   end
@@ -57,6 +57,14 @@ class TestToriFile < Test::Unit::TestCase
     assert { true == File.exist?("test/tmp/copy") }
   end
 
+  test "write with body" do
+    assert { false == File.exist?("test/tmp/copy") }
+    Tori::File.new("copy").write(
+      body: From.new,
+    )
+    assert { true == File.exist?("test/tmp/copy") }
+  end
+
   test "backend" do
     assert { Tori.config.backend == Tori::File.new(nil).backend }
   end
@@ -90,12 +98,12 @@ class TestToriFile < Test::Unit::TestCase
     end
     assert { "test/" == Tori::File.new("test").name }
     assert { "test/tori" == Tori::File.new("test", title: "tori").name }
-    Tori.config.filename_callback &before
+    Tori.config.filename_callback(&before)
   end
 
   test "#method_missing" do
     assert { true == Tori::File.new(nil).respond_to?(:read) }
     assert_raise(NameError) { Tori::File.new(nil).undefined }
-    assert { [true, Encoding.find('utf-8'), 'test/tmp'] == Tori::File.new(nil).open('rb', external_encoding: 'utf-8'){ |f| [f.binmode?, f.external_encoding, f.path] } }
+    assert { [true, Encoding.find('utf-8'), 'test/tmp'] == Tori::File.new(nil).open(mode: 'rb', external_encoding: 'utf-8'){ |f| [f.binmode?, f.external_encoding, f.path] } }
   end
 end

data/tori.gemspec

@@ -17,8 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "aws-sdk-core"
+  spec.add_runtime_dependency "aws-sdk-s3"
   spec.add_runtime_dependency "mime-types"
+  spec.add_runtime_dependency 'rexml'
+  spec.add_runtime_dependency 'ruby2_keywords'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.8.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,6 +131,7 @@ files:
 - lib/tori/file.rb
 - lib/tori/rails.rb
 - lib/tori/version.rb
+- test/aws_s3_stub.rb
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_chain.rb
@@ -131,12 +160,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Simple file uploader
 test_files:
+- test/aws_s3_stub.rb
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_chain.rb

data/.travis.yml

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