tori 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b89b585791768dfdcae240e4f4901c8f047983e
-  data.tar.gz: d7dd7fae6890630c058c31a80d8318bd7fe66b3f
+  metadata.gz: 59a3b8e9df440e4db765dc69951b55887020ef62
+  data.tar.gz: 0bd333e1b30fc39dec35d15978474617c375f920
 SHA512:
-  metadata.gz: af4ec806666e726efcd93367ad5a566621d7018eebce285f74d37c0807371df9b9301e78f8c30bd477307c0ce0c11998eaa345cba13e7f290d06692b4a596d90
-  data.tar.gz: c7864d0df3928c94ff43df756c822df1c424d4b76effbc68ef73d688c4ccd946c9ce4f1b4d2041c054f2291f2addab37e2a024c03c2df95dc0b0485cdad21027
+  metadata.gz: b536f7ab3b27b688618990d810dfc75a8c06e6f4bb4e4fabc5f6f60c04c60503926f5b834027a6d0bbe35e95a506ee946008fc38b5a45a1ddfb272a2f87cdc95
+  data.tar.gz: 54772f385b31c5d82878758951746738cc94b84d7df984f29179f0c8b3f8ac3edc26ba32045fc688eabf1a1d0a3b7658f0debb90e68290d6593c7c906b9b3166

data/README.md

@@ -24,6 +24,14 @@ app/models/photo.rb
 ```ruby
 class Photo < ActiveRecord::Base
   tori :image
+
+  after_save do
+    image.write if image.from?
+  end
+
+  after_destroy do
+    image.delete
+  end
 end
 ```
 
@@ -61,7 +69,7 @@ You can read file.
 ```ruby
 photo.image.read #=> image bin
 photo.image.exist? #=> exist check
-photo.image.to_s #=> filename
+photo.image.name #=> filename
 ```
 
 # Custom configure example
@@ -69,7 +77,7 @@ photo.image.to_s #=> filename
 ```ruby
 # Save to S3 bucket.
 require 'tori/backend/s3'
-Tori.config.backend = Tori::Backend::S3.new('tori_bucket')
+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|
@@ -82,7 +90,3 @@ end
 [https://github.com/ksss/tori/blob/master/lib/tori.rb](https://github.com/ksss/tori/blob/master/lib/tori.rb)
 
 You can change configure any time.
-
-# future TODO
-
-- support background S3 Storage

data/lib/tori/backend/filesystem.rb

@@ -7,8 +7,13 @@ module Tori
         FileUtils.mkdir_p @root.to_s
       end
 
-      def copy(form_path, to_filename)
-        IO.copy_stream form_path.to_s, path(to_filename)
+      def write(filename, resource)
+        case resource
+        when String
+          ::File.open(path(filename), 'w'){ |f| f.write resource }
+        else
+          ::IO.copy_stream resource, path(filename)
+        end
       end
 
       def delete(filename)

data/lib/tori/backend/s3.rb

@@ -1,46 +1,89 @@
-require 'aws-sdk'
+require 'aws-sdk-core'
 
 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()
+      attr_accessor :bucket, :client
+      # Must be set bucket name.
+      #   And it use aws-sdk-core >= 2.0
+      #   ENV["TORI_ACCESS_KEY"] > aws-sdk credentials
       #
       # 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]
+      #   Tori.config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
+      def initialize(bucket:)
+        @bucket = bucket
+        @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
       end
 
-      def copy(form_path, filename)
-        object(filename).write(file: form_path)
+      def write(filename, resource)
+        case resource
+        when IO
+          put filename, f
+        when String
+          put filename, resource
+        else
+          ::File.open(resource.to_path) { |f| put filename, f }
+        end
       end
 
       def delete(filename)
-        object(filename).delete
+        @client.delete_object(
+          bucket: @bucket,
+          key: filename
+        )
       end
 
-      def exist?(filename)
-        object(filename).exists?
+      def exist?(filename = nil)
+        head filename
+      rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
+        false
+      else
+        true
       end
       alias exists? exist?
 
       def read(filename)
-        object(filename).read
+        @client.get_object(
+          bucket: @bucket,
+          key: filename
+        )[:body].read
       end
 
-      def url(filename)
-        object(filename).url_for(:read)
+      def public_url(filename, params={})
+        "#{@client.config.endpoint}/#{@bucket}/#{filename}"
       end
 
-      def object(filename)
-        @bucket.objects[filename]
+      def url_for(filename, method)
+        signer = Aws::S3::Presigner.new(client: @client)
+        signer.presigned_url(method, bucket: @bucket, key: filename)
+      end
+
+      private
+
+      def put(filename, body)
+        @client.put_object(
+          bucket: @bucket,
+          key: filename,
+          body: body
+        )
+      end
+
+      def head(filename = nil)
+        if filename
+          @client.head_object bucket: @bucket, key: filename
+        else
+          @client.head_bucket bucket: @bucket
+        end
       end
     end
   end

data/lib/tori/define.rb

@@ -5,7 +5,7 @@ module Tori
 
       define_method(name) do
         ivar = instance_variable_get name_ivar
-        instance_variable_set name_ivar, ivar || File.new(self)
+        ivar || instance_variable_set(name_ivar, File.new(self))
       end
 
       define_method("#{name}=") do |uploader|

data/lib/tori/file.rb

@@ -10,14 +10,14 @@ module Tori
     end
     alias to_s name
 
-    def copy?
-      !@model.nil? && !@from.nil? && @from.respond_to?(:path) && 0 < name.length
-    rescue NameError => e
-      false
+    def from?
+      !@from.nil? && @from.respond_to?(:path)
     end
 
-    def copy
-      Tori.config.backend.copy @from.path, name if copy?
+    def write
+      path = @from.path
+      path = Pathname.new(path) if path.kind_of?(String)
+      Tori.config.backend.write name, path
     end
 
     def delete
@@ -28,11 +28,11 @@ module Tori
       Tori.config.backend.respond_to?(sym, include_private)
     end
 
-    def method_missing(sym)
+    def method_missing(sym, *args)
       if respond_to_missing?(sym, false)
-        Tori.config.backend.__send__ sym, name
+        Tori.config.backend.__send__ sym, name, *args
       else
-        fail NameError, "undefined local variable or method `#{sym}' for #{Tori.config.backend.inspect}"
+        fail NameError, "undefined method `#{sym}' for #{Tori.config.backend.inspect}"
       end
     end
   end

data/lib/tori/rails.rb

@@ -1,29 +1,2 @@
 require 'tori'
-
-module Tori
-  module ActiveRecord
-    include Define
-
-    # Filename hash usgin `id` attribute by default.
-    # And you can change this attribute, But it's should be record unique.
-    #
-    # @example:
-    # class Photo < ActiveRecord::Base
-    #   tori :image
-    # end
-    def tori(name)
-      super
-
-      after_save do
-        file = __send__ name
-        file.copy
-      end
-
-      after_destroy do
-        file = __send__ name
-        file.delete
-      end
-    end
-  end
-end
-::ActiveRecord::Base.extend(Tori::ActiveRecord)
+::ActiveRecord::Base.extend(Tori::Define)

data/lib/tori/version.rb

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

data/lib/tori.rb

@@ -19,10 +19,10 @@ module Tori
         config.backend = Tori::Backend::FileSystem.new(Pathname("tmp/tori"))
 
         # You can also use S3 backend.
-        # It take 'aws-sdk' gem.
+        # It take 'aws-sdk-core' gem.
         # S3 example
         #   require 'tori/backend/s3'
-        #   config.backend = Tori::Backend::S3.new('tori_bucket')
+        #   config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
 
         # Filename hashing method
         #   It's call when decide filename hash.

data/test/test_tori_backend_filesystem.rb

@@ -1,15 +1,10 @@
 require 'test_helper'
 
 class TestToriBackendFileSystem < Test::Unit::TestCase
-  class Uploader
-    def path
-      "test/tmp/uploader"
-    end
-  end
-
   setup do
     path = Pathname("test/tmp/tori/store")
     @filesystem = Tori::Backend::FileSystem.new(path)
+    File.open(@filesystem.root.join("testfile"), 'w+'){ |f| f.write('text') }
   end
 
   teardown do
@@ -27,9 +22,24 @@ class TestToriBackendFileSystem < Test::Unit::TestCase
   end
 
   test "#read" do
-    FileUtils.touch @filesystem.root.join("readfile")
-    assert { "" == @filesystem.read("readfile") }
-    File.unlink @filesystem.root.join("readfile")
+    assert { "text" == @filesystem.read("testfile") }
     assert_raise(Errno::ENOENT){ @filesystem.read("nothing_file") }
   end
+
+  test "#path" do
+    assert { Pathname.new("test/tmp/tori/store/testfile") == @filesystem.path("testfile") }
+  end
+
+  test "#write" do
+    @filesystem.write("copyfile", @filesystem.path("testfile"))
+    assert { "text" == @filesystem.read("copyfile") }
+
+    File.open(@filesystem.path("testfile")) do |f|
+      @filesystem.write("copyfile", f)
+    end
+    assert { "text" == @filesystem.read("copyfile") }
+
+    @filesystem.write("copyfile", "string")
+    assert { "string" == @filesystem.read("copyfile") }
+  end
 end

data/test/test_tori_backend_s3.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+require 'tori/backend/s3'
+
+if ENV["TORI_TEST_BUCKET"]
+
+class TestToriBackendS3 < Test::Unit::TestCase
+  BucketNotFoundError = Class.new(StandardError)
+  setup do
+    @backend = Tori::Backend::S3.new(bucket: ENV["TORI_TEST_BUCKET"])
+    fail BucketNotFoundError, "S3 test need make s3 bucket '#{@backend.bucket}'" unless @backend.exists?
+
+    @testfile_path = Pathname.new("test/tmp/testfile")
+    FileUtils.mkdir_p "test/tmp"
+    File.open(@testfile_path.to_s, 'w+'){ |f| f.write('text') }
+    @backend.write("testfile", @testfile_path)
+  end
+
+  teardown do
+    FileUtils.rm_rf("test/tmp")
+    @backend.delete("testfile")
+  end
+
+  test "#initialize" do
+    assert_instance_of Tori::Backend::S3, @backend
+    assert_raise(ArgumentError){ Tori::Backend::S3.new }
+  end
+
+  test "#respond_to_missing?" do
+    %i(exists? read delete).each do |m|
+      assert { true == @backend.respond_to?(m) }
+    end
+  end
+
+  test "#write" do
+    assert_nothing_raised { @backend.write("testfile", @testfile_path) }
+  end
+
+  test "#read" do
+    assert { "test" == @backend.read("testfile") }
+  end
+
+  test "#exists?" do
+    assert_nothing_raised { @backend.exists?("nothingfile") }
+    assert { true == @backend.exists?("testfile") }
+  end
+
+  test "#delete" do
+    assert_nothing_raised { @backend.delete("testfile") }
+    assert { false == @backend.exists?("testfile") }
+  end
+
+  test "#public_url" do
+    assert_match %r!https?://s3-!, @backend.public_url("testfile")
+    assert_match @backend.bucket, @backend.public_url("testfile")
+    assert_match "testfile", @backend.public_url("testfile")
+  end
+end
+
+end

data/test/test_tori_define.rb

@@ -15,7 +15,9 @@ class TestToriDefine < Test::Unit::TestCase
   end
 
   test "defined methods" do
-    assert_instance_of Uploader, Dammy.new.test_image = Uploader.new
-    assert_instance_of Tori::File, Dammy.new.test_image
+    dammy = Dammy.new
+    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
   end
 end

data/test/test_tori_file.rb

@@ -34,14 +34,14 @@ class TestToriDefine < Test::Unit::TestCase
     assert { false == Tori::File.new("nothing_file").exist? }
   end
 
-  test "#copy?" do
-    assert { false == Tori::File.new(__FILE__).copy? }
-    assert { true == Tori::File.new(__FILE__, from: From.new).copy? }
+  test "#from?" do
+    assert { false == Tori::File.new(__FILE__).from? }
+    assert { true == Tori::File.new(__FILE__, from: From.new).from? }
   end
 
-  test "copy" do
+  test "write" do
     assert { false == File.exist?("test/tmp/copy") }
-    Tori::File.new("copy", from: From.new).copy
+    Tori::File.new("copy", from: From.new).write
     assert { true == File.exist?("test/tmp/copy") }
   end
 

data/tori.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "aws-sdk-core", ">= 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Simple file uploader
 email:
 - co000ri@gmail.com
@@ -75,6 +89,7 @@ files:
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
+- test/test_tori_backend_s3.rb
 - test/test_tori_config.rb
 - test/test_tori_define.rb
 - test/test_tori_file.rb
@@ -107,6 +122,7 @@ test_files:
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
+- test/test_tori_backend_s3.rb
 - test/test_tori_config.rb
 - test/test_tori_define.rb
 - test/test_tori_file.rb