tori 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b321ceffe6fc92116cf48431777e628523ec762
-  data.tar.gz: 6350f18ad8b0347843613f0697fbdef7b76359a0
+SHA256:
+  metadata.gz: c3f5c0fb1cf2098cfb8ce401f8627fba1b88c25b1a95a14df1dfe00d38296a1e
+  data.tar.gz: d905f6ecfe1a49fd9c648e2aabd3423079af98bcd9e18efd1cabcd6f199b78f2
 SHA512:
-  metadata.gz: 3bc25e66deeff246db55b2ee0922ca9d4d813dfa71b231f50d1dddd1481b60876f0d2a1a0c7ca92ba71b306d1de0240255e22e13895f176d456965d94e99c4f7
-  data.tar.gz: 257800528887cea1d17bfe6630f0ed27a72441dd9c5f6251e15eae3a04360e88f5a368f17264afda466602551cb79f9175ffcb0a0a44c96382ed8eb82e83a37f
+  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.
 

data/lib/tori/backend/filesystem.rb

@@ -1,3 +1,5 @@
+require 'ruby2_keywords'
+
 module Tori
   module Backend
     class FileSystem
@@ -45,19 +47,31 @@ module Tori
       end
       alias exists? exist?
 
-      def read(filename, *args)
-        if args.last.kind_of?(Hash)
-          opt = args.pop
-        else
-          opt = {}
+      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
-        open(filename, {mode: 'rb'}.merge(opt)) do |f|
-          f.read(*args)
+
+        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
-      end
 
-      def open(filename, *rest, &block)
-        ::File.open(path(filename), *rest, &block)
+        def open(filename, **rest, &block)
+          ::File.open(path(filename), **rest, &block)
+        end
       end
 
       def copy_to(filename, tori_file, **opts)

data/lib/tori/backend/s3.rb

@@ -148,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

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.7.2"
+  VERSION = "0.8.0"
 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
 
@@ -98,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

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
 
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -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
@@ -132,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Simple file uploader

data/.travis.yml

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