tori 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e50f43aa37d6ed820e9cc05f6109098afa10a24
-  data.tar.gz: eee5148dcf9c70b91ade06ea3590d4b11aa54c8f
+  metadata.gz: ba8a418f17265ffd2b81e4545a5bd47729af267a
+  data.tar.gz: fbce0ab36e74cd56a2febdfe2fd91bd06bdd4b90
 SHA512:
-  metadata.gz: 62e61605a2a75da736cac9e063463ad95709fe01011677f3910ba371508f674ce4f822c463df7f1f0d4a3acdca446a7a317f31f1be6a1e4aafff92671649d02f
-  data.tar.gz: 5bf1624b4371d24b319a4f7b7ca9897a04d9f89cd37e4c2c08dff6be52fb6400984fe77c33f5a6648ee14c7298042c7231cdd75e60779921a788139724e76acd
+  metadata.gz: 1085709277defe46b902ebbb0a00b660d8bab9f62769cb54dc493bd37ef4732cf664a29160be6ca7b08c03a04a1b1d1643d1c15cd8c8b482c6da17f3c5a8565c
+  data.tar.gz: 8695d363d39f5ff6fd5daed438151525a16ea0dad2e43fa7df10f69a4354ddf17c5b3f4925956338ab752df47614f9fbd475d317a9a90be904d6999dfc010811

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 2.1.6
   - 2.2.2
+notifications:
+  email: false

data/lib/tori/backend/filesystem.rb

@@ -7,7 +7,7 @@ module Tori
         FileUtils.mkdir_p @root.to_s
       end
 
-      def write(filename, resource)
+      def write(filename, resource, opts = nil)
         case resource
         when String
           ::File.open(path(filename), 'w'){ |f| f.write resource }

data/lib/tori/backend/s3.rb

@@ -17,18 +17,32 @@ module Tori
         @client = nil
       end
 
-      def write(filename, resource)
+      def write(filename, resource, opts = nil)
+        opts ||= {}
         case resource
         when String
-          put_object key: filename, body: resource, content_type: DEFAULT_CONTENT_TYPE
+          put_object({
+            key: filename,
+            body: resource,
+            content_type: DEFAULT_CONTENT_TYPE,
+          }.merge(opts))
         when File, Pathname
           path = resource.to_path
           content_type = MIME::Types.type_for(path).first || DEFAULT_CONTENT_TYPE
           ::File.open(path) { |f|
-            put_object key: filename, body: f, content_type: content_type.to_s, content_length: f.size
+            put_object({
+              key: filename,
+              body: f,
+              content_type: content_type.to_s,
+              content_length: f.size,
+            }.merge(opts))
           }
         else
-          put_object key: filename, body: resource
+          put_object({
+            key: filename,
+            body: resource,
+            content_type: DEFAULT_CONTENT_TYPE,
+          }.merge(opts))
         end
       end
 

data/lib/tori/file.rb

@@ -19,10 +19,10 @@ module Tori
       !@from.nil? && @from.respond_to?(:path)
     end
 
-    def write
+    def write(opts = nil)
       path = @from.path
       path = Pathname.new(path) if path.kind_of?(String)
-      Tori.config.backend.write name, path
+      Tori.config.backend.write name, path, opts
     end
 
     def delete

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/test/test_tori_backend_s3.rb

@@ -5,6 +5,14 @@ if ENV["TORI_TEST_BUCKET"]
 
 class TestToriBackendS3 < Test::Unit::TestCase
   BucketNotFoundError = Class.new(StandardError)
+  def request_head(url)
+    uri = URI.parse(url)
+    req = Net::HTTP::Head.new(uri.path)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') { |http|
+      http.request req
+    }
+  end
+
   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?
@@ -31,12 +39,27 @@ class TestToriBackendS3 < Test::Unit::TestCase
     end
   end
 
-  test "#write" do
+  test "#write String" do
+    @backend.write("testfile", "foo", content_type: "image/png")
+    testfile = @backend.get_object(key: "testfile")
+    assert { "image/png" == testfile.content_type }
+    assert { "foo" == testfile[:body].read }
+  end
+
+  test "#write Pathname" do
     assert_nothing_raised { @backend.write("testfile", @testfile_path) }
     testfile = @backend.get_object(key: "testfile")
-    assert { "plain/text" == testfile.content_type }
+    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}
+
+    @backend.write("testfile", @testfile_path, acl: "private")
+    res = request_head(@backend.public_url("testfile"))
+    assert { Net::HTTPForbidden === res}
   end
 
   test "#read" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core