tori 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11c2e0db7bb0f1a6c31deecc5a07f21d38b8f56
-  data.tar.gz: f6b4c1abe7704d7b6e0718993771cb7842ee9c7c
+  metadata.gz: 0d60157537bc5707d71835f133dbc0006b6151d9
+  data.tar.gz: 51cb59357eaf4282e9bb4b8121a2eafb2a54a66c
 SHA512:
-  metadata.gz: 0bc44fe133ca9d2192066f6a01bd2f3f252f5994b48fa08b6614282fd7a96b56fcbab13dbafdb4ad7e05e6e9c281e92de7dc5e5f381bf0c3e874f3c6515972bf
-  data.tar.gz: e051c4febe852bbc5f37f4978ee4cd67db08bbd561575b3affaabdd73d5cf1195c94e9ca4032ec5b3ada5c85551ab7548580db3c622c23bf81c6cbeaf8af230f
+  metadata.gz: 7b17ef8fe35a5237b4c49ddcbe20aa65e5c9d9c26e22800d4dc0b40450b87b964a394c860e52c721ee74218b46f30cdcc61e7175c6f3db01735f70e212c2dd2c
+  data.tar.gz: 095f0fca184b6eabd8f8ded81412c436785febe9d6c26e17669190134c9783f1e9fd9e58e69ad132ed9e9bf82e48b8dfb61d18edfa9b8e902b69bfecda022176

data/README.md

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

@@ -45,14 +45,31 @@ module Tori
       end
       alias exists? exist?
 
-      def read(filename, **args)
-        ::File.read(path(filename), { mode: 'rb' }.merge(args))
+      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
 
       def open(filename, *rest, &block)
         ::File.open(path(filename), *rest, &block)
       end
 
+      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)
         @root.join filename.to_s
       end

data/lib/tori/backend/s3.rb

@@ -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:      backend.bucket,
+          key:         tori_file.name,
+          **opts,
+        )
+      end
+
       def public_url(filename)
         "#{client.config.endpoint}/#{@bucket}/#{filename}"
       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/config.rb

@@ -8,6 +8,8 @@ module Tori
 
     def filename_callback(&block)
       if block_given?
+        warn "DEPRECATED: `#{__method__}' is deprecated method."
+        warn "Please use `tori` method block style in model like `tori :name, { |model| model.id }`."
         @filename_callback = block
       else
         @filename_callback

data/lib/tori/version.rb

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

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_file.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-06-14 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.6.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Simple file uploader