Merge pull request cscheid#18 from s-u/patch-1

Carlos Scheidegger · Carlos Scheidegger · commit bdd7448d3b1b · 2014-03-26T12:50:10.000-04:00
don't break on vectors with other attributes like 'class'
diff --git a/src/robj.js b/src/robj.js
@@ -55,14 +55,20 @@ Rserve.Robj = {
             if (_.isUndefined(this.attributes)) {
                 return values;
             } else {
-                if(this.attributes.value[0].name!="names")
-                    throw "expected names here";
-                var keys   = this.attributes.value[0].value.value;
-                var result = {};
-                _.each(keys, function(key, i) {
-                    result[key] = values[i];
-                });
-                return result;
+		// FIXME: there is no reason why names should be the first or only
+		//        attribute, so the code should really look
+		//        for "names" and not cry if it doesn't exist
+                if (this.attributes.value[0].name == "names") {
+                    var keys   = this.attributes.value[0].value.value;
+                    var result = {};
+                    _.each(keys, function(key, i) {
+			result[key] = values[i];
+                    });
+                    return result;
+		}
+		// FIXME: how can we pass other important attributes
+		//        like "class" ?
+		return values;
             }
         }
     }),
@@ -78,6 +84,11 @@ Rserve.Robj = {
             if (_.isUndefined(this.attributes)) {
                 return values;
             } else {
+		// FIXME: lang doens't have "names" attribute since
+		//        names are sent as tags (langs are pairlists)
+		//        so this seems superfluous (it is dangerous
+		//        if lang ever had attributes since there is
+		//        no reason to fail in that case)
                 if(this.attributes.value[0].name!="names")
                     throw "expected names here";
                 var keys   = this.attributes.value[0].value.value;
