Better feature parsing

Author: sergi

lib/jsftp.js

@@ -32,8 +32,11 @@ var COMMANDS = [
   'chmod', 'size'
 ];
 
+// Regular Expressions
+var RE_PASV = /([-\d]+,[-\d]+,[-\d]+,[-\d]+),([-\d]+),([-\d]+)/;
+var FTP_NEWLINE = /\r\n|\n/;
+
 function getPasvPort(text, cb) {
-  var RE_PASV = /([-\d]+,[-\d]+,[-\d]+,[-\d]+),([-\d]+),([-\d]+)/;
   var match = RE_PASV.exec(text);
   if (!match) {
     return cb(new Error('Bad passive host/port combination'));
@@ -260,10 +263,11 @@ Ftp.prototype.hasFeat = function(feature) {
  * @return {String[]} Array of feature names
  */
 Ftp.prototype._parseFeats = function(features) {
-  // Ignore header and footer
-  return features.split(/\r\n|\n/).slice(1, -1).map(function(feat) {
-    return (/^\s*(\w*)\s*/).exec(feat)[1].trim().toLowerCase();
-  });
+  // Split and ignore header and footer
+  var featureLines = features.split(FTP_NEWLINE).slice(1, -1);
+  return featureLines
+    .map(function(feat) { return feat.trim().toLowerCase(); })
+    .filter(function(feat) { return !!feat; });
 };
 
 // Below this point all the methods are action helpers for FTP that compose
@@ -273,8 +277,9 @@ Ftp.prototype.getFeatures = function(callback) {
   this.raw.feat(function(err, response) {
     self.features = err ? [] : self._parseFeats(response.text);
     self.raw.syst(function(err, res) {
-      if (!err && res.code === 215)
+      if (!err && res.code === 215) {
         self.system = res.text.toLowerCase();
+      }
 
       callback(null, self.features);
     });