Skip to content

Use indexOf and substr instead of split on '=' #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmnetus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use indexOf and substr instead of split on '=' #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0053d94
Use indexOf and substr instead of split on '='
jmnetus Jan 30, 2014
0f278f7
Added a test for '=' in value
jmnetus Jan 30, 2014
91d426f
Additional tests for blank/no value on line
jmnetus Jan 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/shellVarParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ var shellVarParser = {
var lines = content.split('\n');

_(lines).each(function(line){
var keyValueArray = line.split('=');
var key = keyValueArray[0].trim();
var value = keyValueArray[1].trim();
var splitIdx = line.indexOf('=');
// handle a line without '='
if (splitIdx < 0) {
splitIdx = line.length;
}
var key = line.substr(0, splitIdx).trim();
var value = line.substr(splitIdx + 1).trim();

// handle quotes for strings
if (value.charAt(0) === '"' && value.charAt(value.length-1) == '"') {
Expand Down
12 changes: 12 additions & 0 deletions test/shellVarParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,17 @@ describe('shellVarParser', function() {
it('does not expand newlines if single-quoted', function() {
parsed("DONT_EXPAND_NEWLINES_SINGLE_QUOTED='dontexpand\\nnewlines'").DONT_EXPAND_NEWLINES_SINGLE_QUOTED.should.eql("dontexpand\\nnewlines");
});

it('allows equals in the value', function() {
parsed("EQUALS_IN_VALUE=this!=that,me == myself").EQUALS_IN_VALUE.should.equal("this!=that,me == myself");
});

it('does not break on a key with blank value', function() {
parsed("BLANK_VALUE=").BLANK_VALUE.should.eql("");
});

it('does not break on a key with missing value', function() {
parsed("NO_VALUE").NO_VALUE.should.eql("");
});
});
});