(#37 / daleharvey/pouchdb#1264) closures in temp views

index.js

@@ -156,7 +156,7 @@ function MapReduce(db) {
 
   function viewQuery(fun, options) {
     /*jshint evil: true */
-
+    var origMap;
     if (!options.skip) {
       options.skip = 0;
     }
@@ -213,10 +213,18 @@ function MapReduce(db) {
       }
       results.push(viewRow);
     }
-    // ugly way to make sure references to 'emit' in map/reduce bind to the
-    // above emit
-
-    eval('fun.map = ' + fun.map.toString() + ';');
+    if (typeof fun.map === "function" && fun.map.length === 2) {
+      //save a reference to it
+      origMap = fun.map;
+      fun.map = function (doc) {
+        //call it with the emit as the second argument
+        return origMap(doc, emit);
+      };
+    } else {
+      // ugly way to make sure references to 'emit' in map/reduce bind to the
+      // above emit
+      eval('fun.map = ' + fun.map.toString() + ';');
+    }
     if (fun.reduce) {
       if (builtInReduce[fun.reduce]) {
         fun.reduce = builtInReduce[fun.reduce];

test/test.js

@@ -58,8 +58,37 @@ function tests(dbName) {
         });
       });
     });
-
-    it("Test passing just a function", function () {
+    if (dbName.slice(0, 4) !== "http") {
+      it("with a closure", function () {
+        return pouchPromise(dbName).then(function (db) {
+          var bulk = denodify(db.bulkDocs);
+          return bulk({docs: [
+            {foo: 'bar'},
+            { _id: 'volatile', foo: 'baz' }
+          ]}).then(function () {
+            var queryFun = (function (test) {
+              return function (doc, emit) {
+                if (doc._id === test) {
+                  emit(doc.foo);
+                }
+              };
+            }('volatile'));
+            return db.query(queryFun, {reduce: false});
+          });
+        }).should.become({ 
+          total_rows: 1,
+          offset: 0,
+          rows: [
+            {
+              id: 'volatile',
+              key: 'baz',
+              value: undefined
+            }
+          ]
+        });
+      });
+    }
+    it("Test passing just a function", function (done) {
       return pouchPromise(dbName).then(function (db) {
         var bulk = denodify(db.bulkDocs);
         var get = denodify(db.get);