tori 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d60157537bc5707d71835f133dbc0006b6151d9
-  data.tar.gz: 51cb59357eaf4282e9bb4b8121a2eafb2a54a66c
+  metadata.gz: b322ca18b61fe86fd91aac2183884729ebf001dd
+  data.tar.gz: be953afd00ea6dc0e9987380839e4a11fc42335c
 SHA512:
-  metadata.gz: 7b17ef8fe35a5237b4c49ddcbe20aa65e5c9d9c26e22800d4dc0b40450b87b964a394c860e52c721ee74218b46f30cdcc61e7175c6f3db01735f70e212c2dd2c
-  data.tar.gz: 095f0fca184b6eabd8f8ded81412c436785febe9d6c26e17669190134c9783f1e9fd9e58e69ad132ed9e9bf82e48b8dfb61d18edfa9b8e902b69bfecda022176
+  metadata.gz: feaae7d54e87b8cabd463c08f1e1a54ceaf44a983be230cfefa3af84a0a5694256343b396da19e8cc2f9293471bc8545881297d6a5f27b28ebc49eea3d4171e2
+  data.tar.gz: 048ebbd96232aa853aebcbbd7178668546aaa856bb5ea5e6e54e66e90e9d57d9e14b0976a97d74137d19680eb7dc786cd4cc0c61dfd2aa702a5b8116cbe7db0e

data/lib/tori/backend/s3.rb

@@ -128,7 +128,7 @@ module Tori
       def copy_to(filename, tori_file, **opts)
         copy_object(
           copy_source: "#{bucket}/#{filename}",
-          bucket:      backend.bucket,
+          bucket:      bucket,
           key:         tori_file.name,
           **opts,
         )

data/lib/tori/config.rb

@@ -8,8 +8,6 @@ module Tori
 
     def filename_callback(&block)
       if block_given?
-        warn "DEPRECATED: `#{__method__}' is deprecated method."
-        warn "Please use `tori` method block style in model like `tori :name, { |model| model.id }`."
         @filename_callback = block
       else
         @filename_callback

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/aws_s3_stub.rb

@@ -0,0 +1,10 @@
+Aws.config[:s3] = {
+  stub_responses: {
+    head_bucket: {},
+    get_object: {
+      content_type: "text/plain",
+      body: "foo",
+      content_length: 3,
+    }
+  }
+}

data/test/test_tori_backend_s3.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 require 'tori/backend/s3'
-
-if ENV["TORI_TEST_BUCKET"]
+require_relative 'aws_s3_stub'
 
 class TestToriBackendS3 < Test::Unit::TestCase
   BucketNotFoundError = Class.new(StandardError)
+  TORI_TEST_BUCKET = 'tori-testing-bucket'
   def request_head(url)
     uri = URI.parse(url)
     req = Net::HTTP::Head.new(uri.path)
@@ -14,7 +14,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
   end
 
   setup do
-    @backend = Tori::Backend::S3.new(bucket: ENV["TORI_TEST_BUCKET"])
+    @backend = Tori::Backend::S3.new(bucket: TORI_TEST_BUCKET, client: Aws::S3::Client.new)
     fail BucketNotFoundError, "S3 test need make s3 bucket '#{@backend.bucket}'" unless @backend.exists?
 
     @testfile_path = Pathname.new("test/tmp/testfile")
@@ -28,16 +28,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
   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
+    assert { 'image/jpeg' == Tori::Backend::S3.type_for("test.jpeg") }
   end
 
   test "#initialize" do
@@ -46,7 +37,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert { ENV["TORI_AWS_SECRET_ACCESS_KEY"] == @backend.client.config.secret_access_key }
 
     custom_backend = Tori::Backend::S3.new(
-      bucket: ENV["TORI_TEST_BUCKET"],
+      bucket: TORI_TEST_BUCKET,
       client: Aws::S3::Client.new(access_key_id: 'aaa', secret_access_key: 'bbb'),
     )
     assert_instance_of Tori::Backend::S3, custom_backend
@@ -56,7 +47,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert_raise(ArgumentError){ Tori::Backend::S3.new }
     assert_raise(TypeError) {
       Tori::Backend::S3.new(
-        bucket: ENV["TORI_TEST_BUCKET"],
+        bucket: TORI_TEST_BUCKET,
         client: Object.new,
       )
     }
@@ -69,9 +60,9 @@ class TestToriBackendS3 < Test::Unit::TestCase
   end
 
   test "#write String" do
-    @backend.write("testfile", "foo", content_type: "image/png")
+    @backend.write("testfile", "foo", content_type: "text/plain")
     testfile = @backend.get_object(key: "testfile")
-    assert { "image/png" == testfile.content_type }
+    assert { "text/plain" == testfile.content_type }
     assert { "foo" == testfile[:body].read }
   end
 
@@ -79,21 +70,15 @@ class TestToriBackendS3 < Test::Unit::TestCase
     assert_nothing_raised { @backend.write("testfile", @testfile_path) }
     testfile = @backend.get_object(key: "testfile")
     assert { "text/plain" == testfile.content_type }
-    assert { 4 == testfile.content_length }
-    assert { "text" == testfile[:body].read }
-
-    @backend.write("testfile", @testfile_path, acl: "public-read-write")
-    res = request_head(@backend.public_url("testfile"))
-    assert { Net::HTTPOK === res}
+    assert { 3 == testfile.content_length }
+    assert { "foo" == testfile[:body].read }
 
-    @backend.write("testfile", @testfile_path, acl: "private")
-    res = request_head(@backend.public_url("testfile"))
-    assert { Net::HTTPForbidden === res}
+    assert_nothing_raised { @backend.write("testfile", @testfile_path, acl: "public-read-write") }
+    assert_nothing_raised { @backend.write("testfile", @testfile_path, acl: "private") }
   end
 
   test "#read" do
-    assert_equal "text", @backend.read("testfile")
-    assert_raise(Aws::S3::Errors::NoSuchKey) { @backend.read("testfile", key: "nothing") }
+    assert_equal "foo", @backend.read("testfile")
   end
 
   test "#exists?" do
@@ -103,11 +88,10 @@ class TestToriBackendS3 < Test::Unit::TestCase
 
   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 %r!https?://s3!, @backend.public_url("testfile")
     assert_match @backend.bucket, @backend.public_url("testfile")
     assert_match "testfile", @backend.public_url("testfile")
   end
@@ -116,7 +100,7 @@ class TestToriBackendS3 < Test::Unit::TestCase
     path = nil
     @backend.open("testfile") do |f|
       assert_instance_of File, f
-      assert { "text" == f.read }
+      assert { "foo" == f.read }
       path = f.path
     end
     assert { false == File.exist?(path) }
@@ -128,9 +112,15 @@ class TestToriBackendS3 < Test::Unit::TestCase
     @backend.write("path/to/file", @testfile_path)
     @backend.open("path/to/file") do |f|
       assert_instance_of File, f
-      assert { "text" == f.read }
+      assert { "foo" == f.read }
     end
   end
-end
 
+  test "#copy_to" do
+    o = Object.new
+    file = Tori::File.new(o) do |model|
+      model.object_id.to_s
+    end
+    @backend.copy_to("copy_to_file", file)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -103,6 +103,7 @@ files:
 - lib/tori/file.rb
 - lib/tori/rails.rb
 - lib/tori/version.rb
+- test/aws_s3_stub.rb
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_chain.rb
@@ -137,6 +138,7 @@ signing_key:
 specification_version: 4
 summary: Simple file uploader
 test_files:
+- test/aws_s3_stub.rb
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_chain.rb