tori 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9e73b59d43f6d816af38e163263f8ad366b29f
-  data.tar.gz: 61c1bfa6790ebf0b8f5e9ee6aa967c2a56d4150f
+  metadata.gz: 008108fbf732144ba0e7b7d840daf1b5ceeaf776
+  data.tar.gz: ab5268fcb9f9e216eef8347d5b0b32f2684f6a82
 SHA512:
-  metadata.gz: 62cf0872b2c0798d92a223c45badb6a7665bbddf923af5b42ef3e24588a081632b4e26805cbfde96092899c3fb8ea4730288a6e28fb68dccfd66c4d7c90f17e9
-  data.tar.gz: c95fe43b976782cc20085f1ef00a562bd3b3eba620d6c13ecc66c6c19909dcbb1680f4962f4b1444dbbb0d26e930aae77211ce3944be51ff97e84d2f1142392b
+  metadata.gz: 25ddda231a1ee85f8353d65f214a5ae6fbb0f6cf547615c907cd05caf4dbb47b9263ac77550496e7c0d9fe6c4b96f5c5548e0a548fef375503ab6db7eb53f781
+  data.tar.gz: ab35a2002c3203fdfa3dd5ca32e93c7dbdd3d8238dcefccadb9a540f33865274bf2b7a7a74e1a4420ff07dbcb98f572363b9d79212949caf508121fa0bed7d61

data/README.md

@@ -115,7 +115,6 @@ class PhotoController < ApplicationController
   end
 ```
 
-
 # Custom configure example
 
 ```ruby
@@ -127,6 +126,16 @@ Tori.config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
 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

data/lib/tori/backend/s3.rb

@@ -97,8 +97,8 @@ module Tori
         )[:body]
       end
 
-      def put(filename, body)
-        put_object key: filename, body: body
+      def put(filename, body, opts={})
+        put_object key: filename, body: body, **opts
       end
 
       def head(filename = nil)
@@ -118,24 +118,24 @@ module Tori
         signer.presigned_url(method, bucket: @bucket, key: filename)
       end
 
-      def get_object(key:)
-        client.get_object bucket: @bucket, key: key
+      def get_object(opts={})
+        client.get_object bucket: @bucket, **opts
       end
 
-      def head_object(key:)
-        client.head_object bucket: @bucket, key: key
+      def head_object(opts={})
+        client.head_object bucket: @bucket, **opts
       end
 
-      def head_bucket
-        client.head_bucket bucket: @bucket
+      def head_bucket(opts={})
+        client.head_bucket bucket: @bucket, **opts
       end
 
       def put_object(opts = {})
-        client.put_object({bucket: @bucket}.merge(opts))
+        client.put_object bucket: @bucket, **opts
       end
 
-      def delete_object(key:)
-        client.delete_object bucket: @bucket, key: key
+      def delete_object(opts={})
+        client.delete_object bucket: @bucket, **opts
       end
     end
   end

data/lib/tori/context.rb

@@ -0,0 +1,11 @@
+module Tori
+  class Context
+    def initialize(name)
+      @name = name
+    end
+
+    def __tori__
+      @name
+    end
+  end
+end

data/lib/tori/define.rb

@@ -5,11 +5,11 @@ module Tori
 
       define_method(name) do
         ivar = instance_variable_get name_ivar
-        ivar || instance_variable_set(name_ivar, File.new(self, &block))
+        ivar || instance_variable_set(name_ivar, File.new(self, title: name, &block))
       end
 
       define_method("#{name}=") do |uploader|
-        file = File.new(self, from: uploader, &block)
+        file = File.new(self, title: name, from: uploader, &block)
         instance_variable_set name_ivar, file
       end
     end

data/lib/tori/file.rb

@@ -1,7 +1,8 @@
 module Tori
   class File
-    def initialize(model, from: nil, &block)
+    def initialize(model, title: nil, from: nil, &block)
       @model = model
+      @title = title
       if from.respond_to?(:read) and from.respond_to?(:rewind)
         from.rewind
         @from = from.read
@@ -12,10 +13,13 @@ module Tori
     end
 
     def name
+      context = Context.new(@title)
       if @filename_callback
-        @filename_callback.call(@model)
+        context.define_singleton_method(:__bind__, @filename_callback)
+        context.__bind__(@model)
       else
-        Tori.config.filename_callback.call(@model)
+        context.define_singleton_method(:__bind__, Tori.config.filename_callback)
+        context.__bind__(@model)
       end
     end
     alias to_s name

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/tori.rb

@@ -1,5 +1,6 @@
 require 'tori/backend/filesystem'
 require 'tori/config'
+require 'tori/context'
 require 'tori/define'
 require 'tori/file'
 require 'tori/version'

data/test/test_tori_define.rb

@@ -4,6 +4,10 @@ class TestToriDefine < Test::Unit::TestCase
   class Dammy
     extend Tori::Define
     tori :test_image
+    bird = "piyo"
+    tori :def_image do |model|
+      "foo/#{__tori__}/bar/#{bird}"
+    end
   end
 
   class Uploader
@@ -12,6 +16,8 @@ class TestToriDefine < Test::Unit::TestCase
   test "#tori" do
     assert_respond_to Dammy.new, :test_image
     assert_respond_to Dammy.new, :test_image=
+    assert_respond_to Dammy.new, :def_image
+    assert_respond_to Dammy.new, :def_image=
   end
 
   test "defined methods" do
@@ -20,4 +26,10 @@ class TestToriDefine < Test::Unit::TestCase
     assert_instance_of Uploader, dammy.test_image = Uploader.new
     assert_instance_of Tori::File, dammy.test_image
   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 }
+  end
 end

data/test/test_tori_file.rb

@@ -26,7 +26,10 @@ 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, title: nil)
     assert_instance_of Tori::File, Tori::File.new(nil, from: nil) { }
+    assert_raise(ArgumentError) { Tori::File.new }
+    assert_raise(ArgumentError) { Tori::File.new(nil, nothing: nil) }
   end
 
   test "#name" do
@@ -65,6 +68,16 @@ class TestToriFile < Test::Unit::TestCase
     assert { "should be match ;)" == tori_file.read }
   end
 
+  test "with title" do
+    before = Tori.config.filename_callback
+    Tori.config.filename_callback do |model|
+      "#{model}/#{__tori__}"
+    end
+    assert { "test/" == Tori::File.new("test").name }
+    assert { "test/tori" == Tori::File.new("test", title: "tori").name }
+    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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -97,6 +97,7 @@ files:
 - lib/tori/backend/filesystem.rb
 - lib/tori/backend/s3.rb
 - lib/tori/config.rb
+- lib/tori/context.rb
 - lib/tori/define.rb
 - lib/tori/file.rb
 - lib/tori/rails.rb
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Simple file uploader