Skip to content

Fix path/name quotation #2

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

Merged
Fatme merged 2 commits into from
Jul 9, 2015
Merged

Fix path/name quotation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dc527e
Bump nodeunit dependency version
Jun 30, 2015
f879ed0
Fix path/name quotation
Jun 30, 2015
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
8 changes: 6 additions & 2 deletions lib/pbxProject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ var util = require('util'),
pbxFile = require('./pbxFile'),
fs = require('fs'),
parser = require('./parser/pbxproj'),
COMMENT_KEY = /_comment$/
COMMENT_KEY = /_comment$/,
NO_SPECIAL_SYMBOLS = /^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/;

function pbxProject(filename) {
if (!(this instanceof pbxProject))
Expand Down Expand Up @@ -717,8 +718,11 @@ function pbxFileReferenceObj(file) {
obj.path = obj.path.replace(/\"/g, "\\\"");
}

if(!file.basename.match(/^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/)) {
if(!file.basename.match(NO_SPECIAL_SYMBOLS)) {
obj.name = "\"" + obj.name + "\"";
}

if(!file.path.match(NO_SPECIAL_SYMBOLS)) {
obj.path = "\"" + obj.path + "\"";
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"node-uuid":"1.3.3"
},
"devDependencies": {
"nodeunit":"0.6.4"
"nodeunit":"0.9.0"
},
"scripts": {
"test": "node_modules/.bin/nodeunit test/parser test"
Expand Down
100 changes: 100 additions & 0 deletions test/pbxProject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,103 @@ exports['hasFile'] = {
test.done()
}
}

exports['addToPbxFileReferenceSection'] = {
'should not quote name when no special characters present in basename': function (test) {
var newProj = new pbx('.');
newProj.hash = jsonProject,
file = {
uuid: newProj.generateUuid(),
fileRef: newProj.generateUuid(),
isa: 'PBXFileReference',
explicitFileType: 'wrapper.application',
includeInIndex: 0,
basename: "SomeFile.m",
path: "SomePath.m",
sourceTree: 'BUILT_PRODUCTS_DIR'
},
fileRefSection = newProj.pbxFileReferenceSection();

newProj.addToPbxFileReferenceSection(file);
test.equal(fileRefSection[file.fileRef].name, "SomeFile.m");
test.done();
},
'should quote name when special characters present in basename': function (test) {
var newProj = new pbx('.');
newProj.hash = jsonProject,
file = {
uuid: newProj.generateUuid(),
fileRef: newProj.generateUuid(),
isa: 'PBXFileReference',
explicitFileType: 'wrapper.application',
includeInIndex: 0,
basename: "Some File.m",
path: "SomePath.m",
sourceTree: 'BUILT_PRODUCTS_DIR'
},
fileRefSection = newProj.pbxFileReferenceSection();

newProj.addToPbxFileReferenceSection(file);
test.equal(fileRefSection[file.fileRef].name, '"Some File.m"');
test.done();
},
'should not quote path when no special characters present in path': function (test) {
var newProj = new pbx('.');
newProj.hash = jsonProject,
file = {
uuid: newProj.generateUuid(),
fileRef: newProj.generateUuid(),
isa: 'PBXFileReference',
explicitFileType: 'wrapper.application',
includeInIndex: 0,
basename: "SomeFile.m",
path: "SomePath.m",
sourceTree: 'BUILT_PRODUCTS_DIR'
},
fileRefSection = newProj.pbxFileReferenceSection();

newProj.addToPbxFileReferenceSection(file);
test.equal(fileRefSection[file.fileRef].path, "SomePath.m");
test.done();
},
'should quote path when special characters present in path': function (test) {
var newProj = new pbx('.');
newProj.hash = jsonProject,
file = {
uuid: newProj.generateUuid(),
fileRef: newProj.generateUuid(),
isa: 'PBXFileReference',
explicitFileType: 'wrapper.application',
includeInIndex: 0,
basename: "SomeFile.m",
path: "SomeFolder/Some Path.m",
sourceTree: 'BUILT_PRODUCTS_DIR'
},
fileRefSection = newProj.pbxFileReferenceSection();

newProj.addToPbxFileReferenceSection(file);
test.equal(fileRefSection[file.fileRef].path, '"SomeFolder/Some Path.m"');
test.done();
},
'should quote path and name when special characters present in path and basename': function (test) {
var newProj = new pbx('.');
newProj.hash = jsonProject,
file = {
uuid: newProj.generateUuid(),
fileRef: newProj.generateUuid(),
isa: 'PBXFileReference',
explicitFileType: 'wrapper.application',
includeInIndex: 0,
basename: "Some File.m",
path: "SomeFolder/Some Path.m",
sourceTree: 'BUILT_PRODUCTS_DIR'
},
fileRefSection = newProj.pbxFileReferenceSection();

newProj.addToPbxFileReferenceSection(file);
test.equal(fileRefSection[file.fileRef].name, '"Some File.m"');
test.equal(fileRefSection[file.fileRef].path, '"SomeFolder/Some Path.m"');
test.done();
}
}