mingle-storage 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e30df3b5b0da6c830b87632bcb0e15280c822d
-  data.tar.gz: 30af0ca528c96ed55aa1ae6a0709f5c9cbbfd55c
+  metadata.gz: d0f5c1a6490805c1d46aa244bea09839689e5b17
+  data.tar.gz: ef239446fa00f2a0130667baba8e015d98c3bcd4
 SHA512:
-  metadata.gz: c7e04277e1f9697532bf2b675201cd3f48f78482053d9c3c70a7c1dbc001a6c925cb958132b7e59c724e4f502d5a8e89fe4906b4f342922937e2a071b2acdc91
-  data.tar.gz: 2ff1b92c67d4c1e46f2c877c03882d7873369d2e29e0cd54dae537e6340741613637aa51ceeb74a2d4c5a9746ea5a6771b172d2fa0db6b321d0444dc6471d47f
+  metadata.gz: be939eea8f100403f2fe3d287f620e37c33b598c62957e5341cd4c9011b95b79042aa1f451a53e7096f936d1c751343bf49202f929fbcc2bd9055d0ca615a2cb
+  data.tar.gz: bfb1b834b17b24cf7872ced73149cb14c04e7c137ec455d6e8021f8778daa46f30dba466d8fc837c760b8b73ee55acc0680cfa2a7bac70e55958f10fb2babaa2

data/lib/storage/s3_store.rb

@@ -166,9 +166,11 @@ module Storage
     end
 
     def url_for(path, opts={})
-      object(path).url_for(:read,
-                           :expires => opts[:expires_in] || @url_expires,
-                           :response_content_type => derive_content_type(path)).to_s
+      url_opts = {
+        :expires => opts.delete(:expires_in) || @url_expires,
+        :response_content_type => derive_content_type(path)
+      }.merge(opts)
+      object(path).url_for(:read, url_opts).to_s
     end
 
     def public_url(path, opts={})

data/lib/storage.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'aws-sdk'
+require 'aws-sdk-v1'
 require 'storage/filesystem_store.rb'
 require 'storage/s3_store.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingle-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - ThoughtWorks Studios
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  name: aws-sdk-v1
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 description: Mingle storage API to support filesystem and AWS S3 backed storage
 email: mingle-dev@thoughtworks.com
 executables: []
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Mingle storage API to support filesystem and AWS S3 backed storage