Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: dbourguignon/aws-s3
base: master
...
head fork: cmaion/aws-s3
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Jul 02, 2011
@cmaion cmaion Fix deprecation warning about Object#returning
The method 'returning' has been deprecated in Rails 3 in favor of Ruby
1.9's new 'tap' method.  Fixing this gem prevents deprecation warnings
when running under Rails 3.

Conflicts:

	lib/aws/s3/object.rb
eabcb07
Commits on Oct 21, 2011
@lukfugl lukfugl fix canonicalized request in authentication
see

http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?RESTAuthentication.html#ConstructingTheCanonicalizedResourceElement

the calculation of the canonicalized resource was not quite right. the
problems were:

 * only one significant parameter (the first) was included
 * values of significant parameters were excluded
 * not all significant parameters were considered
7daf78e
@lukfugl lukfugl allow request parameters to S3Object.url_for
see

http://docs.amazonwebservices.com/AmazonS3/latest/API/index.html?RESTObjectGET.html

the response-content-type, response-content-language, response-expires,
response-cache-control, response-content-disposition, and
response-content-encoding request parameters can be supplied to control
the response headers of an S3 GET request. allow providing these to
S3Object.url_for and have them included in the URL. bring along the
other recognized parameters as well, while we're at it.

also, make sure these parameters make it into the canonicalized request
for authentication
f1a4192
@lukfugl lukfugl munge Rakefile to allow making instructure-forked gem cadcb72
@lukfugl lukfugl don't cut off options between url_for and building canonical request 9cd3c71
Commits on Oct 25, 2011
Sebastian encoding added, because of an error while running rails tests within …
…netbeans: /home/guitarman/sites/r_evolution/fleximage/ruby/1.9.1/gems/aws-s3-0.6.2/lib/aws/s3/extensions.rb:84: invalid multibyte escape: /[\x80-\xFF]/ (SyntaxError)
998841d
Commits on Nov 09, 2011
Marcel M. Cary Use the options passed to S3Object.copy, supporting reduced redundancy
I need to enable reduced redundancy on some existing S3 objects.
The typical way to do this is copy the object within S3, supplying the
new storage-class (reduced redundancy) as an option to the copy.
However, aws-s3 is ignoring the copy options, instead only using the
default_options to specify the copy-source.

Update the copy method to merge the copy-source options with the passed
options, so that storage-class can be specified.
bd25b25
@marcel marcel Merge pull request #44 from mcary/use-copy-options
Merge in options passed to S3Object.copy.
1ec3ff9
Commits on Dec 02, 2011
Scott Jacobsen Fix typos 159984e
Commits on Dec 26, 2011
@rafBM rafBM Typo 50eb7de
Commits on Dec 31, 2011
@cmaion cmaion Escape question marks 7fdfebe
@cmaion cmaion Revert "Escape question marks"
This reverts commit 7fdfebe.
03a48e7
@cmaion cmaion Unescape escaped quotation marks in file names d2fbf2e
Commits on Jan 12, 2012
@marcel marcel Merge pull request #50 from rafBM/master
Typo in README
5e6f375
Commits on Jan 16, 2012
@bokor bokor Fixed deprecated returning to use tap instead on the Connection.url_for
Signed-off-by: designwaves <brian.bokor@designwaves.com>
2b2c980
Commits on Jan 17, 2012
@bokor bokor Updated Extensions to have string#tap and added test case
Signed-off-by: designwaves <brian.bokor@designwaves.com>
adfc3c9
Commits on May 29, 2012
@marcel marcel Merge pull request #42 from the-guitarman/master
SyntaxError - invalid multibyte escape: /[\x80-\xFF]/
f669784
@marcel marcel Merge pull request #51 from designwaves/master
Fixed the deprecation of Object#returning for Object#tap on Connection.url_for
34db3c0
@marcel marcel Merge pull request #48 from scottjacobsen/master
Fixed a few typos.
9a32b45
Marcel Molina Fix tap test. dfc9e62
Marcel Molina Updated email address in remote acl test. 2fe1aae
Marcel Molina Bump version. 4ae4a9c
Marcel Molina Don't include beta version number. 0572f4b
Commits on Jul 13, 2012
@cmaion cmaion Merge branch 'master' of github.com:marcel/aws-s3
Conflicts:
	lib/aws/s3/object.rb
f748f25
Commits on Jul 30, 2012
@cmaion cmaion Merge branch 'master' of github.com:lukfugl/aws-s3
Conflicts:
	lib/aws/s3/connection.rb
69df3e9
Commits on Jul 31, 2012
@cmaion cmaion Oops c1d8a84
Commits on Oct 09, 2012
@cmaion cmaion Escape ' characters in path cc27c2f
Something went wrong with that request. Please try again.