Skip to content

Fix lib/rack-patch.rb for MRI 2.2.0 and Rbx 2.3.0 on Ubuntu #60

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

Merged
merged 1 commit into from
Dec 8, 2014
Merged

Fix lib/rack-patch.rb for MRI 2.2.0 and Rbx 2.3.0 on Ubuntu #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions lib/rack-patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# see https://github.com/rack/rack/pull/659
require 'rack'
require 'lotus/utils'

if Rack.release <= '1.5'
require 'rack/utils'
Expand All @@ -8,11 +9,16 @@
def self.best_q_match(q_value_header, available_mimes)
values = q_values(q_value_header)

value = values.map do |req_mime, quality|
values = values.map do |req_mime, quality|
match = available_mimes.find { |am| Rack::Mime.match?(am, req_mime) }
next unless match
[match, quality]
end.compact.sort_by do |match, quality|
end.compact

# See https://github.com/lotus/controller/issues/59
values = values.reverse if RUBY_VERSION >= '2.2.0' || Lotus::Utils.rubinius?

value = values.sort_by do |match, quality|
(match.split('/', 2).count('*') * -10) + quality
end.last

Expand Down