Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Aws sdk v2 #1730

Closed
wants to merge 27 commits into from
Closed

Aws sdk v2 #1730

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
96c6f3a
Added s3 storage implementation based on the aws-sdk v2.
danielwanja Dec 17, 2014
8c6bf84
Specifying gem spec dependencies to use aws-sdk v2 and v1.
danielwanja Dec 17, 2014
c44e97d
* Fixed delete image bug.
danielwanja Dec 17, 2014
db13166
Refreshing headers in upload_file. This allows s3_header Proc to use …
danielwanja Dec 18, 2014
982b748
* Defaulting s3 region to us-east-1.
danielwanja Dec 19, 2014
a4b243c
Removing use of SlowDown exception which was a v1 concept.
danielwanja Jan 16, 2015
9182e1c
Fixed bug with copy_to_local_file which receives Aws::PageableRespons…
danielwanja Jan 16, 2015
43f2043
Removing SlowDown reference from s3v2 spec as it a v1 concept that's …
danielwanja Jan 16, 2015
1dd8b2c
adapted s3v2 spec to new region default
danielwanja Jan 16, 2015
5d855d0
Fixed issue with the copy_to_local_file method for the S3v2 storage t…
danielwanja Jan 20, 2015
83509a9
Fixed s3 region related specs.
danielwanja Mar 10, 2015
ecb853d
Added s3 storage implementation based on the aws-sdk v2.
danielwanja Dec 17, 2014
7e777de
Specifying gem spec dependencies to use aws-sdk v2 and v1.
danielwanja Dec 17, 2014
fe92fc1
* Fixed delete image bug.
danielwanja Dec 17, 2014
5edd036
Refreshing headers in upload_file. This allows s3_header Proc to use …
danielwanja Dec 18, 2014
503a79b
* Defaulting s3 region to us-east-1.
danielwanja Dec 19, 2014
3e2f339
Removing use of SlowDown exception which was a v1 concept.
danielwanja Jan 16, 2015
a86fe72
Fixed bug with copy_to_local_file which receives Aws::PageableRespons…
danielwanja Jan 16, 2015
0c34c4c
Removing SlowDown reference from s3v2 spec as it a v1 concept that's …
danielwanja Jan 16, 2015
c5408ab
adapted s3v2 spec to new region default
danielwanja Jan 16, 2015
002ab1d
Fixed issue with the copy_to_local_file method for the S3v2 storage t…
danielwanja Jan 20, 2015
c007a21
Fixed s3 region related specs.
danielwanja Mar 10, 2015
c390601
Merge remote-tracking branch 'origin/aws-sdk-v2' into aws-sdk-v2
danielwanja Mar 10, 2015
220c7de
Applied many houndci recommendations:
danielwanja Mar 10, 2015
c774546
Applied many houndci recommendations:
danielwanja Mar 10, 2015
0d719ef
Pending a test that works locally an not on travis-ci (for now). Need…
danielwanja Mar 10, 2015
4f4af35
Remove pry dependency.
danielwanja Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/paperclip/storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require "paperclip/storage/filesystem"
require "paperclip/storage/fog"
require "paperclip/storage/s3"
require "paperclip/storage/s3v2"
1 change: 1 addition & 0 deletions lib/paperclip/storage/s3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ module S3
def self.extended base
begin
require 'aws-sdk'
require 'aws-sdk-v1'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)"
raise e
Expand Down
Loading