tori 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8a418f17265ffd2b81e4545a5bd47729af267a
-  data.tar.gz: fbce0ab36e74cd56a2febdfe2fd91bd06bdd4b90
+  metadata.gz: 00e78b51cb71ee2dae463df6a3b2bc3518c9d4b1
+  data.tar.gz: a451f2d4fd7cdc7b4dcf15d4792a8ce36bbaabe7
 SHA512:
-  metadata.gz: 1085709277defe46b902ebbb0a00b660d8bab9f62769cb54dc493bd37ef4732cf664a29160be6ca7b08c03a04a1b1d1643d1c15cd8c8b482c6da17f3c5a8565c
-  data.tar.gz: 8695d363d39f5ff6fd5daed438151525a16ea0dad2e43fa7df10f69a4354ddf17c5b3f4925956338ab752df47614f9fbd475d317a9a90be904d6999dfc010811
+  metadata.gz: 9e0474b601c7e5b5c9ecc9a53b8218eed8e39b8ae768527894f1eed5e28b2e10387dcebccf9a89d11e46fc8d5937495ba63997504648cbcb3d8456319595ea1e
+  data.tar.gz: 8f3dfe3d4309f8528129a341805c881fcfb3d23139ac9357cbaefbc41990ab892f3be9992730125e6ea2b057840b0ff3e58d3a2d4603bafb7b63c61dce3ed717

data/lib/tori/backend/s3.rb

@@ -6,15 +6,34 @@ module Tori
     class S3
       DEFAULT_CONTENT_TYPE = 'text/plain'.freeze
       attr_accessor :bucket
+      attr_reader   :client
+
       # Must be set bucket name.
       #   And it use aws-sdk-core >= 2.0
-      #   ENV["TORI_ACCESS_KEY"] > aws-sdk credentials
+      #   ENV takes precedence over credentials file and instance profile
       #
       # example:
       #   Tori.config.backend = Tori::Backend::S3.new(bucket: 'tori_bucket')
-      def initialize(bucket:)
+      def initialize(bucket:, client: nil)
         @bucket = bucket
-        @client = nil
+        if client
+          unless client.kind_of?(Aws::S3::Client)
+            raise TypeError, "client should be instance of Aws::S3::Client or nil"
+          end
+          @client = client
+        else
+          region = ENV['TORI_AWS_REGION'] || ENV['AWS_REGION'] || Aws.config[:region]
+          @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:            region,
+                      )
+                    else
+                      # Use instance profile or credentials file (~/.aws/credentials)
+                      Aws::S3::Client.new(region: region)
+                    end
+        end
       end
 
       def write(filename, resource, opts = nil)
@@ -90,20 +109,6 @@ module Tori
         signer.presigned_url(method, bucket: @bucket, key: filename)
       end
 
-      def client
-        @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 get_object(key:)
         client.get_object bucket: @bucket, key: key
       end

data/lib/tori/version.rb

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

data/test/test_tori_backend_s3.rb

@@ -30,7 +30,24 @@ class TestToriBackendS3 < Test::Unit::TestCase
 
   test "#initialize" do
     assert_instance_of Tori::Backend::S3, @backend
+    assert { ENV["TORI_AWS_ACCESS_KEY_ID"] == @backend.client.config.access_key_id }
+    assert { ENV["TORI_AWS_SECRET_ACCESS_KEY"] == @backend.client.config.secret_access_key }
+
+    custom_backend = Tori::Backend::S3.new(
+      bucket: ENV["TORI_TEST_BUCKET"],
+      client: Aws::S3::Client.new(access_key_id: 'aaa', secret_access_key: 'bbb'),
+    )
+    assert_instance_of Tori::Backend::S3, custom_backend
+    assert { 'aaa' == custom_backend.client.config.access_key_id }
+    assert { 'bbb' == custom_backend.client.config.secret_access_key }
+
     assert_raise(ArgumentError){ Tori::Backend::S3.new }
+    assert_raise(TypeError) {
+      Tori::Backend::S3.new(
+        bucket: ENV["TORI_TEST_BUCKET"],
+        client: Object.new,
+      )
+    }
   end
 
   test "#respond_to_missing?" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple file uploader