Remove extra conditions

Author: blakeembrey

index.js

@@ -38,23 +38,17 @@ function rangeParser (size, str, options) {
   // split the range string
   var arr = str.slice(index + 1).split(',')
   var ranges = []
+  var code = -1
 
   // add ranges type
   ranges.type = str.slice(0, index)
 
-  // check if there are multiple ranges
-  var isMultiple = arr.length > 1
-  var status = -2 // -2: all ranges invalid, -1: at least one valid but unsatisfiable
-
   // parse all ranges
   for (var i = 0; i < arr.length; i++) {
     var indexOf = arr[i].indexOf('-')
     if (indexOf === -1) {
-      // ignore empty/whitespace-only ranges if there are other valid ranges
-      if (arr.length > 1 && arr[i].trim() === '') {
-        continue
-      }
-      return -2
+      code = -2
+      continue
     }
 
     var startStr = arr[i].slice(0, indexOf).trim()
@@ -77,15 +71,10 @@ function rangeParser (size, str, options) {
 
     // invalid format range
     if (isNaN(start) || isNaN(end)) {
-      if (!isMultiple) {
-        return -2
-      }
+      code = -2
       continue
     }
 
-    // unsatisifiable
-    status = -1
-
     // skip unsatisfiable ranges
     if (start > end || start < 0) {
       continue
@@ -99,7 +88,7 @@ function rangeParser (size, str, options) {
   }
 
   if (ranges.length < 1) {
-    return status
+    return code
   }
 
   return options && options.combine

test/range-parser.js

@@ -15,7 +15,6 @@ describe('parseRange(len, str)', function () {
   it('should return -2 for range missing dash', function () {
     assert.strictEqual(parse(200, 'bytes=100200'), -2)
     assert.strictEqual(parse(200, 'bytes=,100200'), -2)
-    assert.strictEqual(parse(200, 'bytes=100-200,100200'), -2)
   })
 
   it('should return -2 for invalid str', function () {
@@ -77,8 +76,8 @@ describe('parseRange(len, str)', function () {
   })
 
   it('should return -1 when invalid format mixed with unsatisfiable ranges', function () {
-    assert.strictEqual(parse(200, 'bytes=500-600,x-'), -1)
-    assert.strictEqual(parse(200, 'bytes=x-,500-600'), -1)
+    assert.strictEqual(parse(200, 'bytes=500-600,900-'), -1)
+    assert.strictEqual(parse(200, 'bytes=900-,500-600'), -1)
   })
 
   it('should parse str', function () {