fix (pbxFile): Fixed minor issues in pbxFile. Streamlined file quoting style via quote normaliser function.

Author: sidneys

lib/pbxFile.js

@@ -34,7 +34,7 @@ var FILETYPE_BY_EXTENSION = {
         'archive.ar': 'Frameworks',
         'compiled.mach-o.dylib': 'Frameworks',
         'wrapper.framework': 'Frameworks',
-        'sourcecode.c.h': 'Sources',
+        'sourcecode.c.h': 'Resources',
         'sourcecode.c.objc': 'Sources',
         'sourcecode.swift': 'Sources'
     },
@@ -58,38 +58,44 @@ var FILETYPE_BY_EXTENSION = {
     };
 
 
+function unquoted(text){
+    return text.replace (/(^")|("$)/g, '')
+}
+
 function detectType(filePath) {
-    var extension = path.extname(filePath),
-        type = FILETYPE_BY_EXTENSION[extension];
+    var extension = path.extname(filePath).substring(1),
+        filetype = FILETYPE_BY_EXTENSION[unquoted(extension)];
 
-    if (!type) {
+    if (!filetype) {
         return DEFAULT_FILETYPE;
     }
 
-    return type;
+    return filetype;
 }
 
 function defaultExtension(fileRef) {
-    var filetype = fileRef.explicitFileType.replace(/^"|"$/g, '');
+    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType;
 
     for(var extension in FILETYPE_BY_EXTENSION) {
-        if(FILETYPE_BY_EXTENSION.hasOwnProperty(extension) ) {
-             if(FILETYPE_BY_EXTENSION[extension] === filetype )
+        if(FILETYPE_BY_EXTENSION.hasOwnProperty(unquoted(extension)) ) {
+             if(FILETYPE_BY_EXTENSION[unquoted(extension)] === filetype )
                  return extension;
         }
     }
 }
 
 function defaultEncoding(fileRef) {
-    var encoding = ENCODING_BY_FILETYPE[fileRef.lastKnownFileType];
+    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
+        encoding = ENCODING_BY_FILETYPE[unquoted(filetype)];
 
     if (encoding) {
         return encoding;
     }
 }
 
-function defaultGroup(fileRef) {
-    var groupName = GROUP_BY_FILETYPE[fileRef.lastKnownFileType];
+function detectGroup(fileRef) {
+    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
+        groupName = GROUP_BY_FILETYPE[unquoted(filetype)];
 
     if (!groupName) {
         return DEFAULT_GROUP;
@@ -98,28 +104,36 @@ function defaultGroup(fileRef) {
     return groupName;
 }
 
-function defaultSourcetree(fileRef) {
-    var sourcetree = SOURCETREE_BY_FILETYPE[fileRef.lastKnownFileType];
-
-    if (fileRef.customFramework) {
-        return filePath;
-    }
+function detectSourcetree(fileRef) {
+    
+    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
+        sourcetree = SOURCETREE_BY_FILETYPE[unquoted(filetype)];
 
     if (fileRef.explicitFileType) {
         return DEFAULT_PRODUCT_SOURCETREE;
     }
+    
+    if (fileRef.customFramework) {
+        return DEFAULT_SOURCETREE;
+    }
+    
+    if (!sourcetree) {
+        return DEFAULT_SOURCETREE;
+    }
 
     return sourcetree;
 }
 
 function defaultPath(fileRef, filePath) {
-    var defaultPath = PATH_BY_FILETYPE[fileRef.lastKnownFileType];
+    var filetype = fileRef.lastKnownFileType || fileRef.explicitFileType,
+        defaultPath = PATH_BY_FILETYPE[unquoted(filetype)];
 
     if (fileRef.customFramework) {
         return filePath;
     }
+    
     if (defaultPath) {
-        return path.join(defaultPath, filePath);
+        return path.join(defaultPath, path.basename(filePath));
     }
 
     return filePath;
@@ -137,9 +151,11 @@ function defaultGroup(fileRef) {
 
 function pbxFile(filepath, opt) {
     var opt = opt || {};
+    
+    self = this;
 
     this.lastKnownFileType = opt.lastKnownFileType || detectType(filepath);
-    this.group = defaultGroup(this);
+    this.group = detectGroup(self);
 
     // for custom frameworks
     if (opt.customFramework == true) {
@@ -149,7 +165,7 @@ function pbxFile(filepath, opt) {
 
     this.basename = path.basename(filepath);
     this.path = defaultPath(this, filepath);
-    this.defaultEncoding = opt.defaultEncoding || defaultEncoding(this);
+    this.fileEncoding = this.defaultEncoding = opt.defaultEncoding || defaultEncoding(self);
 
 
     // When referencing products / build output files
@@ -162,7 +178,8 @@ function pbxFile(filepath, opt) {
         delete this.defaultEncoding;
     }
 
-    this.sourceTree = opt.sourceTree || defaultSourcetree(this);
+    this.sourceTree = opt.sourceTree || detectSourcetree(self);
+    this.includeInIndex = 0;
 
     if (opt.weak && opt.weak === true)
         this.settings = { ATTRIBUTES: ['Weak'] };