Reimplement quality sorting in mime_array

meh · meh · commit ce38d6c42b4d · 2012-02-13T18:42:45.000+01:00
diff --git a/lib/grape/middleware/formatter.rb b/lib/grape/middleware/formatter.rb
@@ -63,7 +63,7 @@ def format_from_header
       def mime_array
         accept = headers['accept'] or return []
 
-        accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+))).map {|(mime)|
+        accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+)(?:(?:;[^,]*?)?;\s*q=([\d.]+))?)).sort_by { |_, q| -q.to_f }.map {|mime, _|
           mime.sub(%r(vnd\.[^+]+\+), '')
         }
       end

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def format_from_header`
`63`	`63`	`def mime_array`
`64`	`64`	`accept = headers['accept'] or return []`
`65`	`65`
`66`		`- accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+))).map {\|(mime)\|`
	`66`	`+ accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+)(?:(?:;[^,]?)?;\sq=([\d.]+))?)).sort_by { \|_, q\| -q.to_f }.map {\|mime, _\|`
`67`	`67`	`mime.sub(%r(vnd\.[^+]+\+), '')`
`68`	`68`	`}`
`69`	`69`	`end`