Skip to content

Commit

Permalink
Allows the use of single ticks and empty strings in key and value gen…
Browse files Browse the repository at this point in the history
…eration.
  • Loading branch information
tvernon committed Mar 11, 2013
1 parent 10bfd87 commit d45aa6c
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 2 deletions.
28 changes: 26 additions & 2 deletions lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,44 @@
exports.split = function (str) {
var results = [];
var word = '';
var validWord
for (var i = 0; i < str.length;) {
if (/\s/.test(str[i])) {
//Skips spaces.
while (i < str.length && /\s/.test(str[i])) {
i++;
}
results.push(word);
word = '';
validWord = false;
continue;
}

if (str[i] === '"') {
i++;
while (i < str.length) {
if (str[i] === '"') {
validWord = true;
break;
}

if (str[i] === '\\') {
i++;
word += str[i++];
continue;
}

word += str[i++];
}
i++;
continue;
}

if (str[i] === '\'') {
i++;
while (i < str.length) {
if (str[i] === '\'') {
validWord = true;
break;
}

Expand All @@ -37,10 +61,10 @@ exports.split = function (str) {
word += str[i++];
continue;
}

validWord = true;
word += str[i++];
}
if (word.length > 0) {
if (validWord) {
results.push(word);
}
return results;
Expand Down
42 changes: 42 additions & 0 deletions test/test-util.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
var myUtil = require('../lib/util');

module.exports = {
setUp: function (callback) {
callback();
},
testStandard: function (test) {
var result = myUtil.split("set key value");
test.ok(arraysEqual(result, ['set', 'key', 'value']));
test.done();
},
testEmptyQuotes: function (test) {
var result = myUtil.split("get \"\"");
test.ok(arraysEqual(result, ['get', ""]));
test.done();
},
testQuotedKey: function (test) {
var result = myUtil.split("set \"key\" value");
test.ok(arraysEqual(result, ['set', 'key', 'value']));
test.done();
},
testBackslashIgnoresNextCharacter: function (test) {
var result = myUtil.split("set \"key\\ name\" value");
test.ok(arraysEqual(result, ['set', 'key name', 'value']));
test.done();
},
testHandlesSingleTicks: function (test) {
var result = myUtil.split("set \'keyname\' value");
test.ok(arraysEqual(result, ['set', 'keyname', 'value']));
test.done();
},
testIgnoresUnterminatedStrings : function (test) {
var result = myUtil.split("set \"keyname value");
test.ok(arraysEqual(result, ['set']));
test.done();
}

};

function arraysEqual(a1,a2) {
return JSON.stringify(a1)==JSON.stringify(a2);
}

0 comments on commit d45aa6c

Please sign in to comment.