Граф коммитов

118 Коммитов

Автор SHA1 Сообщение Дата
Eileen M. Uchitelle f48d29bf94 Merge pull request #8 from github/fix-aws-s3-for-rails4-1
Fix AWS S3 Gem for Rails 4.1
2017-06-06 13:25:39 -04:00
eileencodes 79c9083537 Fix aws-s3 for Rails 4.1
In Rails 4.1 `cattr_` methods were moved to the module (see
`rails/rails@7dfbd91`).

This means that the methods that create the writers and readers will
fail when they get a "symbol" called `{:instance_writer => false}`.

So when the AWS S3 gem is loaded you see this when trying to run tests:

```
/gems/aws-s3-0.6.3/lib/aws/s3/extensions.rb:223: `@@{' is not allowed as
a class variable name
```

The change here was taken from an unmerged PR on the original fork
`marcel/aws#94`.

Longer term we should consider switching from this gem to either
Shopify's fork or to the AWS supported S3 gem. For now this will get
Rails 4.1 development moving along.
2017-06-06 11:51:11 -04:00
Patrick Toomey 7221224c8b Merge pull request #5 from github/remerge-upstream
Remerge upstream
2014-05-06 09:49:03 -05:00
Patrick Toomey ca6d7b7cf8 merge upstream master 2014-05-05 14:27:03 -05:00
Patrick Toomey 9f4b198a51 Merge pull request #4 from github/remove-deprecated-digest
Remove deprecated Digest::Digest
2014-05-05 08:45:40 -05:00
Patrick Toomey 3cb1c75c53 Remove deprecated Digest::Digest 2014-05-02 16:14:23 -05:00
Marcel Molina c4a99b3461 Merge pull request #93 from pelargir/openssl-digest
OpenSSL::Digest::Digest is deprecated; use OpenSSL::Digest instead
2014-02-21 11:12:25 -08:00
Matthew ac0329e49c Backwards compatibility for OpenSSL::Digest 2014-02-20 21:38:32 -05:00
Marcel Molina f27a15581b Merge pull request #60 from yuki24/change_readme_format
Renamed README to README.rdoc for much better readability on GitHub
2014-02-19 15:24:01 -08:00
Marcel Molina 14bd83cf41 Merge pull request #92 from khwang1/master
fix the bug in setting http connection's use_ssl option to false.
2014-02-19 15:17:07 -08:00
Matthew 798b4de9d5 OpenSSL::Digest::Digest is deprecated; use OpenSSL::Digest instead 2014-02-18 12:05:05 -05:00
Alex Stupakov and Karen Wang 1129f68754 fix the bug in setting http connection's use_ssl option to false. 2014-01-17 11:09:15 -08:00
Marcel Molina 22bc35e2f8 Merge pull request #76 from orenhe/upstream_tolerate_reset_by_peer
Retry if connection was reset by peer (ECONNRESET)
2013-06-17 19:45:24 -07:00
Marcel Molina 9d3c030896 Merge pull request #72 from jordimassaguerpla/master
add license information to the gemspec
2013-06-17 19:44:33 -07:00
Marcel Molina 776ba745e7 Merge pull request #80 from github/url_for-with-parameters
escaping improvements
2013-06-17 19:43:47 -07:00
Oren Held b4d9de1a61 Retry if connection was reset by peer (ECONNRESET)
This error tends to happen here and there, and deserves similar retry treatment as other Net:HTTP errors.
2013-03-28 10:26:45 +02:00
Jordi Massaguer Pla 970ae341c2 add license information to the gemspec
This way it can be queried using the rubygems.org API
2013-01-27 21:02:05 +01:00
technoweenie 2dcee48fc6 escape ; in query values too 2013-01-04 15:39:05 -07:00
technoweenie 7a18d8b81e #url_for supports :query for custom query params
AWS::S3::S3Object#url(:query => {})
AWS::S3::S3Object.url_for(name, bucket, :query => {})
AWS::S3::S3Object.path!(bucket, name, :query => {})
2013-01-04 15:18:26 -07:00
technoweenie c6b35e9300 escape & and = in query values
needed for response-content-disposition
2013-01-04 15:11:19 -07:00
technoweenie 3cab307bd7 dont create a new array 2013-01-04 13:37:28 -07:00
technoweenie 8709786920 ruby 1.9 fixes 2013-01-04 13:35:06 -07:00
technoweenie d181ad61c9 only one form of memoization is needed 2013-01-04 11:58:27 -07:00
technoweenie a2ee819756 parameters used for special s3 rest resources don't have a value 2013-01-04 11:57:20 -07:00
technoweenie b7cf10e02b memoize these class methods.
no reason to regenerate these arrays multiple times per use
2013-01-04 11:56:55 -07:00
technoweenie c55f73dae8 Merge branch 'simpler' into url-with-response-headers 2013-01-04 11:33:30 -07:00
technoweenie 9b556eac46 escape header values 2013-01-04 11:11:22 -07:00
technoweenie 412110ac73 remove const_missing 2013-01-04 10:58:24 -07:00
Andrea Ercolino a708afdc83 removed obsolete escape and unescape methods 2012-11-07 20:10:05 +01:00
Andrea Ercolino 420f90b910 limited autoescaping elimination to url_for 2012-11-07 16:10:17 +01:00
Andrea Ercolino d0b938e92a fixed bugs and even made simpler 2012-11-07 15:28:10 +01:00
Andrea Ercolino e555fd9c5f reduced number of changes needed for supporting response headers and fixed a bug that caused non response headers query string parameters to be ignored when issueing a non-authenticated request 2012-11-07 12:07:56 +01:00
Andrea Ercolino 53b337a43f added support for setting response headers within GET requests 2012-11-06 18:58:06 +01:00
Yuki Nishijima b312e8e79c changed filename from just a text file to rdoc 2012-06-15 17:08:46 +09:00
Marcel Molina 0572f4bd0e Don't include beta version number. 2012-05-29 14:31:05 -07:00
Marcel Molina 4ae4a9ce12 Bump version. 2012-05-29 14:27:45 -07:00
Marcel Molina 2fe1aae8e2 Updated email address in remote acl test. 2012-05-29 12:44:40 -07:00
Marcel Molina dfc9e627dc Fix tap test. 2012-05-29 12:43:44 -07:00
Marcel Molina 9a32b451fa Merge pull request #48 from scottjacobsen/master
Fixed a few typos.
2012-05-29 11:57:24 -07:00
Marcel Molina 34db3c0bc7 Merge pull request #51 from designwaves/master
Fixed the deprecation of Object#returning for Object#tap on Connection.url_for
2012-05-29 11:56:57 -07:00
Marcel Molina f669784420 Merge pull request #42 from the-guitarman/master
SyntaxError - invalid multibyte escape: /[\x80-\xFF]/
2012-05-29 11:51:02 -07:00
designwaves adfc3c9821 Updated Extensions to have string#tap and added test case
Signed-off-by: designwaves <brian.bokor@designwaves.com>
2012-01-16 22:00:21 -05:00
designwaves 2b2c9800d7 Fixed deprecated returning to use tap instead on the Connection.url_for
Signed-off-by: designwaves <brian.bokor@designwaves.com>
2012-01-16 17:30:29 -05:00
Marcel Molina 5e6f375d38 Merge pull request #50 from rafBM/master
Typo in README
2012-01-11 22:08:41 -08:00
Rafaël Blais Masson 50eb7de92c Typo 2011-12-25 23:54:37 -05:00
Scott Jacobsen 159984e956 Fix typos 2011-12-02 11:49:56 -07:00
Marcel Molina 1ec3ff9d39 Merge pull request #44 from mcary/use-copy-options
Merge in options passed to S3Object.copy.
2011-11-09 12:43:04 -08:00
Marcel M. Cary bd25b25c5a 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.
2011-11-08 19:45:45 -08:00
Sebastian 998841d782 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) 2011-10-25 17:40:31 +02:00
Marcel Molina 5cd500f6db Put Version back into beta mode. 2009-04-28 15:10:09 -07:00