paperclip-aws-core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180ec89f920857b42bb2aab37586b8951b784fa5
-  data.tar.gz: a2bbe814737e19faf96d9138c0b64f80dcc2b42e
+  metadata.gz: 0a8121fc4a9d181c3d36d4ea42140543dea072ca
+  data.tar.gz: 647c97fade4b0a2b2db78282bf43428aa373db9c
 SHA512:
-  metadata.gz: 305efe864e9f1deac0991c2f14a7e30e23c16109ef1777c6ef367c7dab5fe9df389adf8ae3f4e374755f6f1ca9c5a1446c88f87fc62ffa04f2acd725ded04ec7
-  data.tar.gz: 10eebe3e5e675f39d783e34648bc04af7435dc4889455b6513db4bafebc5f5f1fe54fb7bdc1ef4a95855fda4e2ec0f97c95501c28879049acb0316034c9160d1
+  metadata.gz: 7b7754c4b4c90145a702073ab376938a4c2a498790fe0a97c050e533a2b8ad7350493c08b61738732bc372ad9c2f148fe3d6d0873a96562041656b15c42ee8b0
+  data.tar.gz: e9f4d687f3932ccf31c38a92d8012a75e276c046fb926ac10a6ef3733fac7a71a6ebaa66b3917e514d60cb3f0699369070e300ca62b79efe9b3e25a41519ad81

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

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

data/lib/paperclip/aws/core.rb

@@ -14,15 +14,16 @@ module Paperclip
 
         base.instance_eval do
           @s3_options     = @options[:s3_options]     || {}
-        
-          @s3_endpoint    = @options[:s3_endpoint]
-          
+
+          @s3_endpoint    = @options[:s3_endpoint].starts_with?('http') ? @options[:s3_endpoint] : "https://#{@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]    ||
@@ -71,7 +72,7 @@ module Paperclip
       def s3_host_name
         host_name = @options[:s3_host_name] ||  "s3.amazonaws.com"
         # host_name = host_name.call(self) if host_name.is_a?(Proc)
-        # 
+        #
         # host_name || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
       end
 
@@ -102,9 +103,9 @@ 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
+        instances[options] ||= s3_endpoint.present? ? ::Aws::S3::Client.new(endpoint: s3_endpoint) : ::Aws.s3
       end
-      
+
       def s3_endpoint
         @s3_endpoint
       end
@@ -139,14 +140,14 @@ module Paperclip
             log("saving #{path(style)}")
 
             write_options = {
-              bucket: bucket_name, 
-              key: path(style), 
-              acl: 'public-read', 
-              body: File.read(file.path), 
+              bucket: bucket_name,
+              key: path(style),
+              acl: 'public-read',
+              body: File.read(file.path),
               content_type: file.content_type
             }
 
-            
+
             s3_interface.put_object(write_options)
           rescue => e
             log("Error: #{e.inspect}")
@@ -174,13 +175,13 @@ module Paperclip
         @queued_for_delete = []
       end
 
-      
+
       def copy_to_local_file(style, local_dest_path)
-      
+
         log("copying #{path(style)} to local file #{local_dest_path}")
         local_file = ::File.open(local_dest_path, 'wb')
         file = s3_interface.get_object(bucket: bucket_name, key: path(style))
-        file.body.pos = 0 
+        file.body.pos = 0
         local_file.write(file.body.read)
         local_file.close
       rescue AWS::Errors::Base => e

data/paperclip-aws-core.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
-  spec.add_dependency "aws-sdk-core"
+
+  spec.add_dependency "aws-sdk-core", '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws-core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Bill Centinaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement