Merge pull request #154 from samthor/position-parsing-name

rename parsePositionValue => consumePositionValue for consistency

Author: samthor

src/parsing/css-position-value-parsing.js

@@ -14,7 +14,7 @@
 
 (function(internal) {
 
-  function parsePositionValue(str) {
+  function consumePositionValue(str) {
     var params = internal.parsing.consumeRepeated(
         internal.parsing.consumeLengthValue,
         null, // separator not required due to use of consumeTrimmed.
@@ -23,8 +23,9 @@
       return null;
     }
     var lengths = params[0];
-    return [new CSSPositionValue(lengths[0], lengths[1]), params[1]];
+    var remaining = params[1];
+    return [new CSSPositionValue(lengths[0], lengths[1]), remaining];
   }
 
-  internal.parsing.parsePositionValue = parsePositionValue;
+  internal.parsing.consumePositionValue = consumePositionValue;
 })(typedOM.internal);

test/js/css-position-value.js

@@ -29,30 +29,30 @@ suite('CSSPositionValue', function() {
 
   test('Parsing works for simple values', function() {
     var input = '5px 3px';
-    var result = typedOM.internal.parsing.parsePositionValue(input);
+    var result = typedOM.internal.parsing.consumePositionValue(input);
     assert.strictEqual(result[0].constructor, CSSPositionValue);
     assert.strictEqual(result[0].cssText, input);
   });
 
   test('Parsing works when using calc values', function() {
     var input = 'calc(-2% + 6em) calc(3vmin - 9pc)';
-    var result = typedOM.internal.parsing.parsePositionValue(input);
+    var result = typedOM.internal.parsing.consumePositionValue(input);
     assert.strictEqual(result[0].constructor, CSSPositionValue);
     assert.strictEqual(result[0].cssText, input);
   });
 
   test('Parsing works when using mixed value types', function() {
     var input = '99.2px calc(3vmin - 9pc)';
-    var result = typedOM.internal.parsing.parsePositionValue(input);
+    var result = typedOM.internal.parsing.consumePositionValue(input);
     assert.strictEqual(result[0].constructor, CSSPositionValue);
     assert.strictEqual(result[0].cssText, input);
   });
 
   test('Invalid input to parsing returns null (and does not throw)', function() {
-    assert.isNull(typedOM.internal.parsing.parsePositionValue(''));
-    assert.isNull(typedOM.internal.parsing.parsePositionValue('bananas'));
-    assert.isNull(typedOM.internal.parsing.parsePositionValue('5px'));
-    assert.isNull(typedOM.internal.parsing.parsePositionValue('6px 3'));
-    assert.isNull(typedOM.internal.parsing.parsePositionValue('calc(3px - 3em 6px'));
+    assert.isNull(typedOM.internal.parsing.consumePositionValue(''));
+    assert.isNull(typedOM.internal.parsing.consumePositionValue('bananas'));
+    assert.isNull(typedOM.internal.parsing.consumePositionValue('5px'));
+    assert.isNull(typedOM.internal.parsing.consumePositionValue('6px 3'));
+    assert.isNull(typedOM.internal.parsing.consumePositionValue('calc(3px - 3em 6px'));
   });
 });