tori 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b19023a541895766bcd6cbc231febb4d6a5102b
-  data.tar.gz: ee94e3e57dcee888c4eb09bdaee736e0277054b0
+  metadata.gz: 3e50f43aa37d6ed820e9cc05f6109098afa10a24
+  data.tar.gz: eee5148dcf9c70b91ade06ea3590d4b11aa54c8f
 SHA512:
-  metadata.gz: 810f914e2fb306d90c8cee6f4c15eee2cd263c711b8f6faa584ff2dbd4aeccb3ccf084126f3b0be1ddfa5e6c2c0c01620a46e5d8f5da3a147053b7a49f4ba80c
-  data.tar.gz: 049cd8f285bc2017d10a7aa3f0aaf5120973822cad8de5c780f0fb9cb0935b0890f8435df6fd3e10c047de627b00c6a02a363dc0a81100dd5915f2ab61f87eb6
+  metadata.gz: 62e61605a2a75da736cac9e063463ad95709fe01011677f3910ba371508f674ce4f822c463df7f1f0d4a3acdca446a7a317f31f1be6a1e4aafff92671649d02f
+  data.tar.gz: 5bf1624b4371d24b319a4f7b7ca9897a04d9f89cd37e4c2c08dff6be52fb6400984fe77c33f5a6648ee14c7298042c7231cdd75e60779921a788139724e76acd

data/README.md

@@ -74,6 +74,48 @@ photo.image.exist? #=> exist check
 photo.image.name #=> filename
 ```
 
+# Attach example
+
+Two image file upload to backend example.
+defined method by `tori` method can define a key name for each by block.
+
+```ruby
+class Photo < ActiveRecord::Base
+  tori :original_image do |model|
+    "#{model.class}/original/#{model.original_filename}"
+  end
+
+  tori :striped_image do |model|
+    "#{model.class}/striped/#{model.striped_filename}"
+  end
+end
+
+class PhotoController < ApplicationController
+  def create
+    original = params[:file]
+    Tempfile.open("striped") { |striped|
+      # image processing example
+      MiniMagick::Tool::Convert.new { |c|
+        c.strip
+        c << original.path
+        c << striped.path
+      }
+
+      # create record
+      photo = Photo.create
+
+      # set image file to model
+      photo.original_image = original
+      photo.striped_image = striped
+
+      # write image file to backend
+      photo.original_image.write
+      photo.striped_image.write
+    }
+  end
+```
+
+
 # Custom configure example
 
 ```ruby

data/lib/tori/backend/filesystem.rb

@@ -14,6 +14,7 @@ module Tori
         when Pathname
           # see also https://bugs.ruby-lang.org/issues/11199
           ::File.open(resource) { |src|
+            FileUtils.mkdir_p path(filename).dirname
             ::File.open(path(filename), 'w'){ |dst|
               ::IO.copy_stream src, dst
             }

data/lib/tori/backend/s3.rb

@@ -1,8 +1,10 @@
 require 'aws-sdk-core'
+require 'mime/types'
 
 module Tori
   module Backend
     class S3
+      DEFAULT_CONTENT_TYPE = 'text/plain'.freeze
       attr_accessor :bucket
       # Must be set bucket name.
       #   And it use aws-sdk-core >= 2.0
@@ -17,12 +19,16 @@ module Tori
 
       def write(filename, resource)
         case resource
-        when IO
-          put filename, f
         when String
-          put filename, resource
+          put_object key: filename, body: resource, content_type: DEFAULT_CONTENT_TYPE
+        when File, Pathname
+          path = resource.to_path
+          content_type = MIME::Types.type_for(path).first || DEFAULT_CONTENT_TYPE
+          ::File.open(path) { |f|
+            put_object key: filename, body: f, content_type: content_type.to_s, content_length: f.size
+          }
         else
-          ::File.open(resource.to_path) { |f| put filename, f }
+          put_object key: filename, body: resource
         end
       end
 
@@ -70,20 +76,18 @@ module Tori
         signer.presigned_url(method, bucket: @bucket, key: filename)
       end
 
-      private
-
       def client
         @client ||= if ENV["TORI_AWS_ACCESS_KEY_ID"] && ENV["TORI_AWS_SECRET_ACCESS_KEY"]
-                    Aws::S3::Client.new(
-                      access_key_id: ENV["TORI_AWS_ACCESS_KEY_ID"],
-                      secret_access_key: ENV["TORI_AWS_SECRET_ACCESS_KEY"],
-                      region: ENV["TORI_AWS_REGION"] || ENV['AWS_REGION'] || Aws.config[:region],
-                    )
-                  else
-                    Aws::S3::Client.new(
-                      region: ENV["TORI_AWS_REGION"] || ENV['AWS_REGION'] || Aws.config[:region]
-                    )
-                  end
+                      Aws::S3::Client.new(
+                        access_key_id: ENV["TORI_AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["TORI_AWS_SECRET_ACCESS_KEY"],
+                        region: ENV["TORI_AWS_REGION"] || ENV['AWS_REGION'] || Aws.config[:region],
+                      )
+                    else
+                      Aws::S3::Client.new(
+                        region: ENV["TORI_AWS_REGION"] || ENV['AWS_REGION'] || Aws.config[:region]
+                      )
+                    end
       end
 
       def get_object(key:)
@@ -98,8 +102,8 @@ module Tori
         client.head_bucket bucket: @bucket
       end
 
-      def put_object(key:, body:)
-        client.put_object bucket: @bucket, key: key, body: body
+      def put_object(opts = {})
+        client.put_object({bucket: @bucket}.merge(opts))
       end
 
       def delete_object(key:)

data/lib/tori/define.rb

@@ -1,15 +1,15 @@
 module Tori
   module Define
-    def tori(name)
+    def tori(name, &block)
       name_ivar = "@#{name}".to_sym
 
       define_method(name) do
         ivar = instance_variable_get name_ivar
-        ivar || instance_variable_set(name_ivar, File.new(self))
+        ivar || instance_variable_set(name_ivar, File.new(self, &block))
       end
 
       define_method("#{name}=") do |uploader|
-        file = File.new(self, from: uploader)
+        file = File.new(self, from: uploader, &block)
         instance_variable_set name_ivar, file
       end
     end

data/lib/tori/file.rb

@@ -1,12 +1,17 @@
 module Tori
   class File
-    def initialize(model, from: nil)
+    def initialize(model, from: nil, &block)
       @model = model
       @from = from
+      @filename_callback = block
     end
 
     def name
-      Tori.config.filename_callback.call(@model)
+      if @filename_callback
+        @filename_callback.call(@model)
+      else
+        Tori.config.filename_callback.call(@model)
+      end
     end
     alias to_s name
 

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/test_tori_backend_s3.rb

@@ -33,6 +33,10 @@ class TestToriBackendS3 < Test::Unit::TestCase
 
   test "#write" do
     assert_nothing_raised { @backend.write("testfile", @testfile_path) }
+    testfile = @backend.get_object(key: "testfile")
+    assert { "plain/text" == testfile.content_type }
+    assert { 4 == testfile.content_length }
+    assert { "text" == testfile[:body].read }
   end
 
   test "#read" do

data/test/test_tori_file.rb

@@ -23,10 +23,12 @@ class TestToriFile < Test::Unit::TestCase
   test "#initialize" do
     assert_instance_of Tori::File, Tori::File.new(nil)
     assert_instance_of Tori::File, Tori::File.new(nil, from: nil)
+    assert_instance_of Tori::File, Tori::File.new(nil, from: nil) { }
   end
 
   test "#name" do
     assert { "test" == Tori::File.new("test").name }
+    assert { "String/test/sub" == Tori::File.new("test"){ |m| "#{m.class}/#{m}/sub"}.name }
   end
 
   test "#exist?" do

data/tori.gemspec

@@ -17,8 +17,9 @@ 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 "mime-types"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "aws-sdk-core", ">= 2.0"
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mime-types
+  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
     requirements:
     - - ">="
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Simple file uploader
 email:
 - co000ri@gmail.com