paperclip-aws-core 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718454772184aea711b5a7921937f21355f73e43
-  data.tar.gz: f5737e886600db7abab0d67ee8941ddabca856eb
+  metadata.gz: 180ec89f920857b42bb2aab37586b8951b784fa5
+  data.tar.gz: a2bbe814737e19faf96d9138c0b64f80dcc2b42e
 SHA512:
-  metadata.gz: 77089decbafe4ecc06106fb2570345098d1d2ff243efba08dda907ff25fbdb025997049c97f77758261f1457eb534bff03a47c4525f44b901f1363caf811018d
-  data.tar.gz: 9097e9ea7bf8104dd66e6b5ef7aede105b4b0e59944ee20d48b4c07bcc47ce60d52fce663ce2f169644ba50522d6c72ed1c7791dceee25d49f8ef06f40b35760
+  metadata.gz: 305efe864e9f1deac0991c2f14a7e30e23c16109ef1777c6ef367c7dab5fe9df389adf8ae3f4e374755f6f1ca9c5a1446c88f87fc62ffa04f2acd725ded04ec7
+  data.tar.gz: 10eebe3e5e675f39d783e34648bc04af7435dc4889455b6513db4bafebc5f5f1fe54fb7bdc1ef4a95855fda4e2ec0f97c95501c28879049acb0316034c9160d1

data/lib/paperclip/aws/core.rb

@@ -16,7 +16,14 @@ module Paperclip
           @s3_options     = @options[:s3_options]     || {}
         
           @s3_endpoint    = @options[:s3_endpoint]
-
+          
+          if @options[:credentials].present?
+            credentials = @options[:credentials].symbolize_keys
+            ::Aws::config[:credentials] = ::Aws::Credentials.new(credentials[:access_key_id], credentials[:secret_access_key])
+            ::Aws.config[:region] = credentials[:region]
+          end
+            
+          @aws_credentials = @options[:credentials]   || {}
 
           @s3_protocol    = @options[:s3_protocol]    ||
             Proc.new do |style, attachment|
@@ -95,7 +102,7 @@ module Paperclip
 
       def obtain_s3_instance_for(options)
         instances = (Thread.current[:paperclip_s3_instances] ||= {})
-        instances[options] ||= s3_endpoint.present? ? ::Aws::S3.new(endpoint: s3_endpoint) : ::Aws::S3.new(endpoint: s3_endpoint)
+        instances[options] ||= s3_endpoint.present? ? ::Aws::S3.new(endpoint: s3_endpoint) : ::Aws.s3
       end
       
       def s3_endpoint

data/lib/paperclip/aws/core/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Aws
     module Core
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws-core
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Bill Centinaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core