Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r916079 - in /couchdb/branches/0.11.x: ./
 etc/default/couchdb
 share/server/loop.js share/server/render.js share/server/util.js
 share/www/script/test/design_docs.js
Date: Thu, 25 Feb 2010 01:22:10 -0000
To: commits@couchdb.apache.org
From: jchris@apache.org
Message-Id: <20100225012210.B0AF4238899B@eris.apache.org>

Author: jchris
Date: Thu Feb 25 01:22:10 2010
New Revision: 916079

URL: http://svn.apache.org/viewvc?rev=916079&view=rev
Log:
backport 916076 to 0.11.x (commonjs require for show list etc)

Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.11.x/share/server/loop.js
    couchdb/branches/0.11.x/share/server/render.js
    couchdb/branches/0.11.x/share/server/util.js
    couchdb/branches/0.11.x/share/www/script/test/design_docs.js

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 01:22:10 2010
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915529,915827
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915529,915827,916076

Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 01:22:10 2010
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915529,915827
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915529,915827,916076
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.11.x/share/server/loop.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/server/loop.js?rev=916079&r1=916078&r2=916079&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/server/loop.js (original)
+++ couchdb/branches/0.11.x/share/server/loop.js Thu Feb 25 01:22:10 2010
@@ -74,7 +74,7 @@
             if (i+1 == funPath.length) {
               fun = point[funPath[i]]
               if (typeof fun != "function") {
-                fun = Couch.compileFunction(fun);
+                fun = Couch.compileFunction(fun, ddoc);
                 // cache the compiled fun on the ddoc
                 point[funPath[i]] = fun
               };

Modified: couchdb/branches/0.11.x/share/server/render.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/server/render.js?rev=916079&r1=916078&r2=916079&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/server/render.js (original)
+++ couchdb/branches/0.11.x/share/server/render.js Thu Feb 25 01:22:10 2010
@@ -210,6 +210,11 @@
     return s;
   };
 
+  function isDocRequestPath(info) {
+    var path = info.path;
+    return path.length > 5;
+  };
+
   function runShow(fun, ddoc, args) {
     try {
       resetList();
@@ -239,7 +244,7 @@
         throw(["error", "render_error", "undefined response from show function"]);      
       }
     } catch(e) {
-      if(args[0] === null) {
+      if (args[0] === null && isDocRequestPath(args[1])) {
         throw(["error", "not_found", "document not found"]);
       } else {
         renderError(e, fun.toSource());

Modified: couchdb/branches/0.11.x/share/server/util.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/server/util.js?rev=916079&r1=916078&r2=916079&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/server/util.js (original)
+++ couchdb/branches/0.11.x/share/server/util.js Thu Feb 25 01:22:10 2010
@@ -10,15 +10,66 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+var resolveModule = function(names, parent, current) {
+  if (names.length == 0) {
+    if (typeof current != "string") {
+      throw ["error","invalid_require_path",
+        'Must require a JavaScript string, not: '+(typeof current)];
+    }
+    return [current, parent];
+  }
+  // we need to traverse the path
+  var n = names.shift();
+  if (n == '..') {
+    if (!(parent && parent.parent)) {
+      throw ["error", "invalid_require_path", 'Object has no parent '+JSON.stringify(current)];
+    }
+    return resolveModule(names, parent.parent.parent, parent.parent);
+  } else if (n == '.') {
+    if (!parent) {
+      throw ["error", "invalid_require_path", 'Object has no parent '+JSON.stringify(current)];
+    }
+    return resolveModule(names, parent.parent, parent);
+  }
+  if (!current[n]) {
+    throw ["error", "invalid_require_path", 'Object has no property "'+n+'". '+JSON.stringify(current)];
+  }
+  var p = current
+  current = current[n];
+  current.parent = p;
+  return resolveModule(names, p, current)
+}
+
 var Couch = {
   // moving this away from global so we can move to json2.js later
   toJSON : function (val) {
     return JSON.stringify(val);
   },
-  compileFunction : function(source) {
+  compileFunction : function(source, ddoc) {    
     if (!source) throw(["error","not_found","missing function"]);
     try {
-      var functionObject = sandbox ? evalcx(source, sandbox) : eval(source);
+      if (sandbox) {
+        if (ddoc) {
+          var require = function(name, parent) {
+            var exports = {};
+            var resolved = resolveModule(name.split('/'), parent, ddoc);
+            var source = resolved[0]; 
+            parent = resolved[1];
+            var s = "function (exports, require) { " + source + " }";
+            try {
+              var func = sandbox ? evalcx(s, sandbox) : eval(s);
+              func.apply(sandbox, [exports, function(name) {return require(name, parent, source)}]);
+            } catch(e) { 
+              throw ["error","compilation_error","Module require('"+name+"') raised error "+e.toSource()]; 
+            }
+            return exports;
+          }
+          sandbox.require = require;
+        }
+        var functionObject = evalcx(source, sandbox);
+      } else {
+        var functionObject = eval(source);
+      }
     } catch (err) {
       throw(["error", "compilation_error", err.toSource() + " (" + source + ")"]);
     };

Modified: couchdb/branches/0.11.x/share/www/script/test/design_docs.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/test/design_docs.js?rev=916079&r1=916078&r2=916079&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/test/design_docs.js (original)
+++ couchdb/branches/0.11.x/share/www/script/test/design_docs.js Thu Feb 25 01:22:10 2010
@@ -38,6 +38,13 @@
   var designDoc = {
     _id:"_design/test", // turn off couch.js id escaping?
     language: "javascript",
+    whatever : {
+      stringzone : "exports.string = 'plankton';",
+      commonjs : {
+        whynot : "exports.test = require('../stringzone')",
+        upper : "exports.testing = require('./whynot').test.string.toUpperCase()"
+      }
+    },
     views: {
       all_docs_twice: {map: "function(doc) { emit(doc.integer, null); emit(doc.integer, null) }"},
       no_docs: {map: "function(doc) {}"},
@@ -50,9 +57,11 @@
                 reduce:"function (keys, values) { return \"" + makebigstring(16) + "\"; };"}
     },
     shows: {
-      simple: "function() {return 'ok'};"
+      simple: "function() {return 'ok'};",
+      requirey : "function() { var lib = require('whatever/commonjs/upper'); return lib.testing; };"
     }
-  }
+  }; 
+
   var xhr = CouchDB.request("PUT", "/test_suite_db_a/_design/test", {body: JSON.stringify(designDoc)});
   var resp = JSON.parse(xhr.responseText);
   
@@ -74,6 +83,11 @@
   T(xhr.status == 200);
   TEquals("ok", xhr.responseText, 'query server used wrong ddoc');
 
+  // test commonjs require
+  var xhr = CouchDB.request("GET", "/test_suite_db/_design/test/_show/requirey");
+  T(xhr.status == 200);
+  TEquals("PLANKTON", xhr.responseText);
+
   // test that we get design doc info back
   var dinfo = db.designInfo("_design/test");
   TEquals("test", dinfo.name);