tori 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0767923af262a5dce13b472e5634d2a9d0bfffde
-  data.tar.gz: dc11c7a9aa7c1c6404f87423971b273aaf22df8b
+  metadata.gz: 7b89b585791768dfdcae240e4f4901c8f047983e
+  data.tar.gz: d7dd7fae6890630c058c31a80d8318bd7fe66b3f
 SHA512:
-  metadata.gz: bc9a89e774b0e2749a2f285895f40800dbbd89f7a193a6ff96838e2ec791d639ba3a8cee45b0cf1ee8fa3903cb28bcef8d16acbf344da1559a4fea4001e55c5e
-  data.tar.gz: 1b206a55b212aa7a415f9feb696eb1c5d79cf8cbd72777e25cbb309f81cdb6eef240512e92864593b8b307e040a638efebc95f89ebd7c377038ad2b1aeb062bd
+  metadata.gz: af4ec806666e726efcd93367ad5a566621d7018eebce285f74d37c0807371df9b9301e78f8c30bd477307c0ce0c11998eaa345cba13e7f290d06692b4a596d90
+  data.tar.gz: c7864d0df3928c94ff43df756c822df1c424d4b76effbc68ef73d688c4ccd946c9ce4f1b4d2041c054f2291f2addab37e2a024c03c2df95dc0b0485cdad21027

data/README.md

@@ -56,7 +56,28 @@ app/views/photos/new.html.slim
   = f.button 'Upload'
 ```
 
-# default configure
+You can read file.
+
+```ruby
+photo.image.read #=> image bin
+photo.image.exist? #=> exist check
+photo.image.to_s #=> filename
+```
+
+# Custom configure example
+
+```ruby
+# Save to S3 bucket.
+require 'tori/backend/s3'
+Tori.config.backend = Tori::Backend::S3.new('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
+```
+
+# 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

@@ -4,23 +4,28 @@ module Tori
       attr_accessor :root
       def initialize(root)
         @root = root
-        FileUtils.mkdir_p(@root.to_s)
+        FileUtils.mkdir_p @root.to_s
       end
 
       def copy(form_path, to_filename)
-        IO.copy_stream(form_path.to_s, @root.join(to_filename.to_s))
+        IO.copy_stream form_path.to_s, path(to_filename)
       end
 
       def delete(filename)
-        ::File.unlink @root.join(filename.to_s)
+        ::File.unlink path(filename)
       end
 
       def exist?(filename)
-        ::File.exist? @root.join(filename.to_s)
+        ::File.exist? path(filename)
       end
+      alias exists? exist?
 
       def read(filename)
-        ::File.read @root.join(filename.to_s)
+        ::File.read path(filename)
+      end
+
+      def path(filename)
+        @root.join filename.to_s
       end
     end
   end

data/lib/tori/backend/s3.rb

@@ -0,0 +1,47 @@
+require 'aws-sdk'
+
+module Tori
+  module Backend
+    class S3
+      # You must be set bucket name.
+      #   And you can configurate to S3
+      #   But, you can also configurate by AWS.config()
+      #
+      # example:
+      #   Tori.config.backend = Tori::Backend::S3.new(
+      #     bucket: 'photos',
+      #     region: '...',
+      #     s3_encryption_key: '...'
+      #   )
+      def initialize(bucket:, **s3_config)
+        s3 = AWS::S3.new(s3_config)
+        @bucket = s3.buckets[bucket]
+      end
+
+      def copy(form_path, filename)
+        object(filename).write(file: form_path)
+      end
+
+      def delete(filename)
+        object(filename).delete
+      end
+
+      def exist?(filename)
+        object(filename).exists?
+      end
+      alias exists? exist?
+
+      def read(filename)
+        object(filename).read
+      end
+
+      def url(filename)
+        object(filename).url_for(:read)
+      end
+
+      def object(filename)
+        @bucket.objects[filename]
+      end
+    end
+  end
+end

data/lib/tori/config.rb

@@ -1,9 +1,17 @@
 module Tori
   class Config
-    attr_accessor :backend, :filename_callback
+    attr_accessor :backend
     def initialize
       @backend = nil
       @filename_callback = nil
     end
+
+    def filename_callback(&block)
+      if block_given?
+        @filename_callback = block
+      else
+        @filename_callback
+      end
+    end
   end
 end

data/lib/tori/define.rb

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

data/lib/tori/file.rb

@@ -1,28 +1,39 @@
 module Tori
   class File
-    attr_accessor :from
-
-    def initialize(model, from = nil)
+    def initialize(model, from: nil)
       @model = model
       @from = from
     end
 
-    def to_s
+    def name
       Tori.config.filename_callback.call(@model)
     end
-
-    def exist?
-      Tori.config.backend.exist?(to_s)
-    end
+    alias to_s name
 
     def copy?
-      !@model.nil? && !@from.nil? && @from.respond_to?(:path) && 0 < to_s.length
+      !@model.nil? && !@from.nil? && @from.respond_to?(:path) && 0 < name.length
     rescue NameError => e
       false
     end
 
-    def read
-      Tori.config.backend.read(to_s)
+    def copy
+      Tori.config.backend.copy @from.path, name if copy?
+    end
+
+    def delete
+      Tori.config.backend.delete name if exist?
+    end
+
+    def respond_to_missing?(sym, include_private)
+      Tori.config.backend.respond_to?(sym, include_private)
+    end
+
+    def method_missing(sym)
+      if respond_to_missing?(sym, false)
+        Tori.config.backend.__send__ sym, name
+      else
+        fail NameError, "undefined local variable or method `#{sym}' for #{Tori.config.backend.inspect}"
+      end
     end
   end
 end

data/lib/tori/rails.rb

@@ -16,12 +16,12 @@ module Tori
 
       after_save do
         file = __send__ name
-        Tori.config.backend.copy(file.from.path, file.to_s) if file.from && file.copy?
+        file.copy
       end
 
       after_destroy do
         file = __send__ name
-        Tori.config.backend.delete(file.to_s) if file.exist?
+        file.delete
       end
     end
   end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tori.rb

@@ -18,10 +18,15 @@ module Tori
         # Configure for file store backend instance.
         config.backend = Tori::Backend::FileSystem.new(Pathname("tmp/tori"))
 
+        # You can also use S3 backend.
+        # It take 'aws-sdk' gem.
+        # S3 example
+        #   require 'tori/backend/s3'
+        #   config.backend = Tori::Backend::S3.new('tori_bucket')
+
         # Filename hashing method
         #   It's call when decide filename hash.
-        #   `filename_callback` must be have `call` method.
-        config.filename_callback = ->(model) do
+        config.filename_callback do |model|
           Digest::SHA1.hexdigest "#{model.class.name}/#{model.id}"
         end
       end

data/test/test_tori_config.rb

@@ -4,9 +4,5 @@ class TestToriConfig < Test::Unit::TestCase
   test "#initialize" do
     i = Tori::Config.new
     assert_instance_of Tori::Config, i
-    assert_respond_to i, :backend
-    assert_respond_to i, :backend=
-    assert_respond_to i, :filename_callback
-    assert_respond_to i, :filename_callback=
   end
 end

data/test/{test_tori_method_definition.rb → test_tori_define.rb}

@@ -6,8 +6,16 @@ class TestToriDefine < Test::Unit::TestCase
     tori :test_image
   end
 
+  class Uploader
+  end
+
   test "#tori" do
     assert_respond_to Dammy.new, :test_image
     assert_respond_to Dammy.new, :test_image=
   end
+
+  test "defined methods" do
+    assert_instance_of Uploader, Dammy.new.test_image = Uploader.new
+    assert_instance_of Tori::File, Dammy.new.test_image
+  end
 end

data/test/test_tori_file.rb

@@ -3,38 +3,50 @@ require 'test_helper'
 class TestToriDefine < Test::Unit::TestCase
   setup do
     @orig = Tori.config.filename_callback
-    Tori.config.filename_callback = ->(model){
+    Tori.config.filename_callback do |model|
       model
-    }
+    end
     Tori.config.backend = Tori::Backend::FileSystem.new Pathname("test").join("tmp")
   end
 
   teardown do
-    Tori.config.filename_callback = @orig
+    Tori.config.filename_callback &@orig
     FileUtils.rm_rf("test/tmp")
   end
 
-  class Dammy
+  class From
     def path
-      "path"
+      __FILE__
     end
   end
 
   test "#initialize" do
-    assert_instance_of Tori::File, Tori::File.new(nil, nil)
+    assert_instance_of Tori::File, Tori::File.new(nil)
+    assert_instance_of Tori::File, Tori::File.new(nil, from: nil)
   end
 
-  test "#to_s" do
-    assert { "test" == Tori::File.new("test", nil).to_s }
+  test "#name" do
+    assert { "test" == Tori::File.new("test").name }
   end
 
   test "#exist?" do
-    assert { true == Tori::File.new(__FILE__, nil).exist? }
-    assert { false == Tori::File.new("nothing_file", nil).exist? }
+    assert { true == Tori::File.new(__FILE__).exist? }
+    assert { false == Tori::File.new("nothing_file").exist? }
   end
 
   test "#copy?" do
-    assert { false == Tori::File.new(__FILE__, nil).copy? }
-    assert { true == Tori::File.new(__FILE__, Dammy.new).copy? }
+    assert { false == Tori::File.new(__FILE__).copy? }
+    assert { true == Tori::File.new(__FILE__, from: From.new).copy? }
+  end
+
+  test "copy" do
+    assert { false == File.exist?("test/tmp/copy") }
+    Tori::File.new("copy", from: From.new).copy
+    assert { true == File.exist?("test/tmp/copy") }
+  end
+
+  test "#method_missing" do
+    assert { true == Tori::File.new(nil).respond_to?(:read) }
+    assert_raise(NameError) { Tori::File.new(nil).undefined }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - lib/tori.rb
 - lib/tori/backend/filesystem.rb
+- lib/tori/backend/s3.rb
 - lib/tori/config.rb
 - lib/tori/define.rb
 - lib/tori/file.rb
@@ -75,8 +76,8 @@ files:
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_config.rb
+- test/test_tori_define.rb
 - test/test_tori_file.rb
-- test/test_tori_method_definition.rb
 - tori.gemspec
 homepage: https://github.com/ksss/tori
 licenses:
@@ -107,5 +108,5 @@ test_files:
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_config.rb
+- test/test_tori_define.rb
 - test/test_tori_file.rb
-- test/test_tori_method_definition.rb