tori 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b7fb38fdb55e8c050508df44902f0eba8e395c
-  data.tar.gz: 454e9d1433db7d637d01dc29595a69cf53668095
+  metadata.gz: 804032544a779fc9014553a31b0ea5c2314a3db1
+  data.tar.gz: 487ba2e0af21edf8bf41b4163301f66049d27768
 SHA512:
-  metadata.gz: 355e802d40cd93d147c573656f5ef4fba70b396eeb4db1927eabd0cdf7776505546252a2d97673a3a1cdc4b0e203ad86d9903c6339079765f0e61e1c37aa1a6e
-  data.tar.gz: 4962d066361815dd3aa739af5e1b87cb7ec196c699f2a6944e18e4f0614aaf3a3d1ad8e5dce43a0890e508697def5fb711562a0cc67c6b5b7d0f8d65e07ea772
+  metadata.gz: 7027bb399d67358423ce0feb6655843f27381773afa1f500f1e35f1cec75fc8f2435b3e211f591e98f50bed23b144dbb31718444321c17f81cb0a64f9f266361
+  data.tar.gz: 2d47426d4c1afb1b07458ff8ed442031995fda718ba1659723cc6ed630ce64b1a7adfc61fa56f94fae3ee261c265b126241a0578cb9dbb7c7efa7a1aa74eabff

data/README.md

@@ -88,6 +88,11 @@ class Photo < ActiveRecord::Base
   tori :striped_image do |model|
     "#{model.class}/striped/#{model.striped_filename}"
   end
+
+  # customize backend each by `tori` method.
+  tori :custom, to: Tori::Backend::FileSystem.new(Pathname("custom")) do |model|
+    "#{__tori__}/#{id}"
+  end
 end
 
 class PhotoController < ApplicationController

data/lib/tori/backend/s3.rb

@@ -8,6 +8,12 @@ module Tori
       attr_accessor :bucket
       attr_reader   :client
 
+      class << self
+        def type_for(path)
+          (MIME::Types.type_for(path).first || DEFAULT_CONTENT_TYPE).to_s
+        end
+      end
+
       # Must be set bucket name.
       #   And it use aws-sdk-core >= 2.0
       #   ENV takes precedence over credentials file and instance profile
@@ -47,6 +53,10 @@ module Tori
 
       def write(filename, resource, opts = nil)
         opts ||= {}
+        if from_path = opts.delete(:from_path)
+          opts[:content_type] = self.class.type_for(from_path)
+        end
+
         case resource
         when String
           put_object({
@@ -56,7 +66,7 @@ module Tori
           }.merge(opts))
         when File, Pathname
           path = resource.to_path
-          content_type = MIME::Types.type_for(path).first || DEFAULT_CONTENT_TYPE
+          content_type = self.class.type_for(path)
           ::File.open(path) { |f|
             put_object({
               key: filename,
@@ -91,10 +101,12 @@ module Tori
         body(filename).read
       end
 
+      def get(filename)
+        get_object(key: filename)
+      end
+
       def body(filename)
-        get_object(
-          key: filename
-        )[:body]
+        get(filename)[:body]
       end
 
       def put(filename, body, opts={})

data/lib/tori/define.rb

@@ -1,15 +1,15 @@
 module Tori
   module Define
-    def tori(name, &block)
+    def tori(name, to: nil, &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, title: name, &block))
+        ivar || instance_variable_set(name_ivar, File.new(self, title: name, to: to, &block))
       end
 
       define_method("#{name}=") do |uploader|
-        file = File.new(self, title: name, from: uploader, &block)
+        file = File.new(self, title: name, from: uploader, to: to, &block)
         instance_variable_set name_ivar, file
       end
     end

data/lib/tori/file.rb

@@ -1,24 +1,28 @@
 module Tori
   class File
-    def initialize(model, title: nil, from: nil, &block)
+    def initialize(model, title: nil, from: nil, to: nil, &block)
       @model = model
       @title = title.kind_of?(String) ? title.to_sym : title
-      if from.respond_to?(:read) and from.respond_to?(:rewind)
+
+      @from_path = if from.respond_to?(:path)
+        from.path
+      else
+        nil
+      end
+
+      @backend = to
+
+      @from = if from.respond_to?(:read) and from.respond_to?(:rewind)
         from.rewind
-        @from = from.read
+        from.read
       else
-        @from = from
+        from
       end
       @filename_callback = block
     end
 
     def name
       context = Context.new(@title)
-      filename_callback = if @filename_callback
-        @filename_callback
-      else
-        Tori.config.filename_callback
-      end
       context.define_singleton_method(:__filename_callback__, filename_callback)
       context.__filename_callback__(@model)
     end
@@ -29,24 +33,35 @@ module Tori
     end
 
     def read
-      Tori.config.backend.read name
+      backend.read name
     end
 
     def write(opts = nil)
-      Tori.config.backend.write name, @from, opts
+      opts ||= {}
+      backend.write name, @from, opts.merge(from_path: @from_path)
     end
 
     def delete
-      Tori.config.backend.delete name if exist?
+      backend.delete name if exist?
+    end
+
+    def filename_callback
+      @filename_callback || Tori.config.filename_callback
     end
 
+    def backend
+      @backend || Tori.config.backend
+    end
+
+    private
+
     def respond_to_missing?(sym, include_private)
-      Tori.config.backend.respond_to?(sym, include_private)
+      backend.respond_to?(sym, include_private)
     end
 
     def method_missing(sym, *args)
       if respond_to_missing?(sym, false)
-        Tori.config.backend.__send__ sym, name, *args
+        backend.__send__ sym, name, *args
       else
         fail NameError, "undefined method `#{sym}' for #{Tori.config.backend.inspect}"
       end

data/lib/tori/version.rb

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

data/test/test_tori_backend_s3.rb

@@ -28,6 +28,19 @@ class TestToriBackendS3 < Test::Unit::TestCase
     @backend.delete("testfile")
   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
+  end
+
   test "#initialize" do
     assert_instance_of Tori::Backend::S3, @backend
     assert { ENV["TORI_AWS_ACCESS_KEY_ID"] == @backend.client.config.access_key_id }

data/test/test_tori_define.rb

@@ -1,6 +1,12 @@
 require 'test_helper'
 
 class TestToriDefine < Test::Unit::TestCase
+  class CustomBackend
+    def read(filename)
+      "read:#{filename}"
+    end
+  end
+
   class Dammy
     extend Tori::Define
     tori :test_image
@@ -8,6 +14,9 @@ class TestToriDefine < Test::Unit::TestCase
     tori :def_image do |model|
       "foo/#{__tori__}/bar/#{bird}"
     end
+    tori :custom, to: CustomBackend.new do |model|
+      "#{__tori__}/baz"
+    end
   end
 
   class Uploader
@@ -18,6 +27,8 @@ class TestToriDefine < Test::Unit::TestCase
     assert_respond_to Dammy.new, :test_image=
     assert_respond_to Dammy.new, :def_image
     assert_respond_to Dammy.new, :def_image=
+    assert_respond_to Dammy.new, :custom
+    assert_respond_to Dammy.new, :custom=
   end
 
   test "defined methods" do
@@ -25,11 +36,20 @@ class TestToriDefine < Test::Unit::TestCase
     assert_instance_of Tori::File, dammy.test_image
     assert_instance_of Uploader, dammy.test_image = Uploader.new
     assert_instance_of Tori::File, dammy.test_image
+    assert_instance_of Tori::Backend::FileSystem, dammy.test_image.backend
+    assert_instance_of CustomBackend, dammy.custom.backend
+  end
+
+  test "defined method" do
+    dammy = Dammy.new
+    assert { false == dammy.def_image.exist? }
+    assert { "read:custom/baz" == dammy.custom.read }
   end
 
   test "define name" do
     dammy = Dammy.new
     assert_instance_of Tori::File, dammy.def_image
     assert { "foo/def_image/bar/piyo" == dammy.def_image.name }
+    assert { "custom/baz" == dammy.custom.name }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple file uploader