Skip to content
This repository has been archived by the owner on May 16, 2021. It is now read-only.

Change LinkHeaders to use ",\n" as delimiter in Link HTTP header #193

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/sinatra/link_header.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def link(*urls)
link = (response["Link"] ||= "")

urls.map do |url|
link << "\n" unless link.empty?
link << ",\n" unless link.empty?
link << (http_pattern % url)
html_pattern % url
end.join "\n"
Expand All @@ -117,7 +117,7 @@ def link(*urls)
def link_headers
yield if block_given?
return "" unless response.include? "Link"
response["Link"].lines.map do |line|
response["Link"].split(",\n").map do |line|
url, *opts = line.split(';').map(&:strip)
"<link href=\"#{url[1..-2]}\" #{opts.join " "} />"
end.join "\n"
Expand Down
2 changes: 1 addition & 1 deletion spec/link_header_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
it "takes an options hash" do
get '/'
elements = ["<something>", "foo=\"bar\"", "rel=\"from-filter\""]
headers['Link'].lines.first.strip.split('; ').sort.should == elements
headers['Link'].split(",\n").first.strip.split('; ').sort.should == elements
end
end

Expand Down