Merge pull request #13 from jdeerhake/master

mediaTypePriority not sorting correctly
jshttp · Jan 24, 2014 · cbb1985 · cbb1985
2 parents 8ed7607 + c1ed406
commit cbb1985
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/mediaType.js b/lib/mediaType.js
@@ -43,9 +43,9 @@ function parseMediaType(s) {
 }
 
 function getMediaTypePriority(type, accepted) {
-  return (accepted.filter(function(a) {
+  return (accepted.map(function(a) {
     return specify(type, a);
-  }).sort(function (a, b) {
+  }).filter(Boolean).sort(function (a, b) {
     // revsort
     return a.s > b.s ? -1 : 1;
   })[0] || {q:0}).q;

diff --git a/test/mediaType.js b/test/mediaType.js
@@ -67,6 +67,10 @@
       accept: 'text/*, text/html;q=0.5',
       provided: ['text/html', 'text/plain'],
       selected: ['text/plain', 'text/html']
+    }, {
+      accept: 'application/json, */*; q=0.01',
+      provided: ['text/html', 'application/json'],
+      selected: ['application/json', 'text/html']
     }
   ];