Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

get tests running again #5

Merged
merged 3 commits into from
Dec 4, 2023
Merged

get tests running again #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b6a472
aws gem now has implicit dependency on an XML processor such as nokogiri
jrochkind Dec 4, 2023
951bc5a
response-expires header format match recent AWS ruby SDK with #httpdate
jrochkind Dec 4, 2023
33a66d3
add CHANGELOG
jrochkind Dec 4, 2023
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
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.1.0

### Fixed

- response-expires header format match recent AWS ruby SDK by using #httpdate https://github.com/jrochkind/faster_s3_url/pull/5
1 change: 1 addition & 0 deletions faster_s3_url.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.add_development_dependency "aws-sdk-s3", "~> 1.81"
spec.add_development_dependency "nokogiri" # aws gem now has implicit dependency on an XML processor such as
spec.add_development_dependency "timecop", "< 2"
spec.add_development_dependency "benchmark-ips", "~> 2.8"
#spec.add_development_dependency "kalibera" # for benchmark-ips :bootstrap stats option
Expand Down
15 changes: 7 additions & 8 deletions lib/faster_s3_url/builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,13 @@ def validate_expires_in(expires_in)
# Crazy kind of reverse engineered from aws-sdk-ruby,
# for compatible handling of Expires header.
#
# This honestly seems to violate the HTTP spec, the result will be that for
# an `response-expires` param, subsequent S3 response will include an Expires
# header in ISO8601 instead of HTTP-date format.... but for now we'll make
# our tests pass by behaving equivalently to aws-sdk-s3 anyway? filed
# with aws-sdk-s3: https://github.com/aws/aws-sdk-ruby/issues/2415
# Recent versions of ruby AWS SDK use "httpdate" format here, as a result of
# an issue we filed: https://github.com/aws/aws-sdk-ruby/issues/2415
#
# Switch last line from `.utc.iso8601` to `.httpdate` if you want to be
# more correct than aws-sdk-s3?
# We match what recent AWS SDK does.
#
# Note while the AWS SDK source says "rfc 822", it's ruby #httpdate that matches
# rather than ruby #rfc822 (timezone should be `GMT` to match AWS SDK, not `-0000`)
def convert_for_timestamp_shape(arg)
return nil if arg.nil?

Expand All @@ -286,7 +285,7 @@ def convert_for_timestamp_shape(arg)
else
Time.parse(arg.to_s)
end
time_value.utc.iso8601
time_value.utc.httpdate
end
end
end
Loading