mingle-storage 0.0.12 → 0.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d6e30df3b5b0da6c830b87632bcb0e15280c822d
4
- data.tar.gz: 30af0ca528c96ed55aa1ae6a0709f5c9cbbfd55c
3
+ metadata.gz: d0f5c1a6490805c1d46aa244bea09839689e5b17
4
+ data.tar.gz: ef239446fa00f2a0130667baba8e015d98c3bcd4
5
5
  SHA512:
6
- metadata.gz: c7e04277e1f9697532bf2b675201cd3f48f78482053d9c3c70a7c1dbc001a6c925cb958132b7e59c724e4f502d5a8e89fe4906b4f342922937e2a071b2acdc91
7
- data.tar.gz: 2ff1b92c67d4c1e46f2c877c03882d7873369d2e29e0cd54dae537e6340741613637aa51ceeb74a2d4c5a9746ea5a6771b172d2fa0db6b321d0444dc6471d47f
6
+ metadata.gz: be939eea8f100403f2fe3d287f620e37c33b598c62957e5341cd4c9011b95b79042aa1f451a53e7096f936d1c751343bf49202f929fbcc2bd9055d0ca615a2cb
7
+ data.tar.gz: bfb1b834b17b24cf7872ced73149cb14c04e7c137ec455d6e8021f8778daa46f30dba466d8fc837c760b8b73ee55acc0680cfa2a7bac70e55958f10fb2babaa2
@@ -166,9 +166,11 @@ module Storage
166
166
  end
167
167
 
168
168
  def url_for(path, opts={})
169
- object(path).url_for(:read,
170
- :expires => opts[:expires_in] || @url_expires,
171
- :response_content_type => derive_content_type(path)).to_s
169
+ url_opts = {
170
+ :expires => opts.delete(:expires_in) || @url_expires,
171
+ :response_content_type => derive_content_type(path)
172
+ }.merge(opts)
173
+ object(path).url_for(:read, url_opts).to_s
172
174
  end
173
175
 
174
176
  def public_url(path, opts={})
data/lib/storage.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'rubygems'
2
- require 'aws-sdk'
2
+ require 'aws-sdk-v1'
3
3
  require 'storage/filesystem_store.rb'
4
4
  require 'storage/s3_store.rb'
5
5
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mingle-storage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.12
4
+ version: 0.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - ThoughtWorks Studios
@@ -11,19 +11,19 @@ cert_chain: []
11
11
  date: 2015-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: aws-sdk
15
- version_requirements: !ruby/object:Gem::Requirement
14
+ requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
16
  - - '>='
18
17
  - !ruby/object:Gem::Version
19
18
  version: '0'
20
- requirement: !ruby/object:Gem::Requirement
19
+ name: aws-sdk-v1
20
+ prerelease: false
21
+ type: :runtime
22
+ version_requirements: !ruby/object:Gem::Requirement
21
23
  requirements:
22
24
  - - '>='
23
25
  - !ruby/object:Gem::Version
24
26
  version: '0'
25
- prerelease: false
26
- type: :runtime
27
27
  description: Mingle storage API to support filesystem and AWS S3 backed storage
28
28
  email: mingle-dev@thoughtworks.com
29
29
  executables: []
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
53
53
  version: '0'
54
54
  requirements: []
55
55
  rubyforge_project:
56
- rubygems_version: 2.1.9
56
+ rubygems_version: 2.4.8
57
57
  signing_key:
58
58
  specification_version: 4
59
59
  summary: Mingle storage API to support filesystem and AWS S3 backed storage