Merge pull request #67 from cloudant/12645-merge_latest_1.1.x

3 files changed, 16 insertions, 7 deletions

diff --git a/couchjs/js/mimeparse.js b/couchjs/js/mimeparse.js
index 3642a194..42b600fa 100644
--- a/couchjs/js/mimeparse.js
+++ b/couchjs/js/mimeparse.js
@@ -97,7 +97,7 @@ var Mimeparse = (function() {
         if ((type == targetType || type == "*" || targetType == "*") &&
           (subtype == targetSubtype || subtype == "*" || targetSubtype == "*")) {
           var matchCount = 0;
-          for (param in targetParams) {
+          for (var param in targetParams) {
             if (param != 'q' && params[param] && params[param] == targetParams[param]) {
               matchCount += 1;
             }
diff --git a/couchjs/js/render.js b/couchjs/js/render.js
index d207db41..93ff6332 100644
--- a/couchjs/js/render.js
+++ b/couchjs/js/render.js
@@ -220,10 +220,10 @@ var Render = (function() {
       resetList();
       Mime.resetProvides();
       var resp = fun.apply(ddoc, args) || {};
+      resp = maybeWrapResponse(resp);
 
       // handle list() style API
       if (chunks.length && chunks.length > 0) {
-        resp = maybeWrapResponse(resp);
         resp.headers = resp.headers || {};
         for(var header in startResp) {
           resp.headers[header] = startResp[header]
@@ -233,8 +233,12 @@ var Render = (function() {
       }
 
       if (Mime.providesUsed) {
-        resp = Mime.runProvides(args[1], ddoc);
-        resp = applyContentType(maybeWrapResponse(resp), Mime.responseContentType);
+        var provided_resp = Mime.runProvides(args[1], ddoc) || {};
+        provided_resp = maybeWrapResponse(provided_resp);
+        resp.body = (resp.body || "") + chunks.join("");
+        resp.body += provided_resp.body || "";
+        resp = applyContentType(resp, Mime.responseContentType);
+        resetList();
       }
 
       var type = typeOf(resp);
diff --git a/couchjs/js/util.js b/couchjs/js/util.js
index e4386701..d498ee64 100644
--- a/couchjs/js/util.js
+++ b/couchjs/js/util.js
@@ -46,7 +46,7 @@ var resolveModule = function(names, mod, root) {
   } else if (root) {
     mod = {current : root};
   }
-  if (!mod.current[n]) {
+  if (mod.current[n] === undefined) {
     throw ["error", "invalid_require_path", 'Object has no property "'+n+'". '+JSON.stringify(mod.current)];
   }
   return resolveModule(names, {
@@ -63,6 +63,11 @@ var Couch = {
   },
   compileFunction : function(source, ddoc) {    
     if (!source) throw(["error","not_found","missing function"]);
+    // Some newer SpiderMonkey's appear to not like evaluating
+    // an anonymous function at global scope. Simple fix just
+    // wraps the source with parens so the function object is
+    // returned correctly.
+    source = "(" + source + ")";
     try {
       if (sandbox) {
         if (ddoc) {
@@ -91,9 +96,9 @@ var Couch = {
           }
           sandbox.require = require;
         }
-        var functionObject = evalcx(source, sandbox);
+        var functionObject = evalcx("(" + source + ")", sandbox);
       } else {
-        var functionObject = eval(source);
+        var functionObject = eval("(" + source + ")");
       }
     } catch (err) {
       throw(["error", "compilation_error", err.toSource() + " (" + source + ")"]);