From fd0664502d8748e866850c0aec8ae32a9549f51e Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Tue, 21 Jan 2014 14:16:33 +1100
Subject: [PATCH] Implementing object mapping when querying to transform types

---
 src/db.js            | 43 ++++++++++++++++++++++++++++++++++---------
 tests/specs/query.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/db.js b/src/db.js
index 9a250e7..1ced6af 100644
--- a/src/db.js
+++ b/src/db.js
@@ -13,6 +13,10 @@
         throw 'IndexedDB required';
     }
 
+    var defaultMapper = function (value) {
+        return value;
+    };
+
     var CallbackList = function () {
         var state,
             list = [];
@@ -307,7 +311,7 @@
         var that = this;
         var modifyObj = false;
 
-        var runQuery = function ( type, args , cursorType , direction, limitRange, filters ) {
+        var runQuery = function ( type, args , cursorType , direction, limitRange, filters , mapper ) {
             var transaction = db.transaction( table, modifyObj ? transactionModes.readwrite : transactionModes.readonly ),
                 store = transaction.objectStore( table ),
                 index = indexName ? store.index( indexName ) : store,
@@ -362,7 +366,7 @@
 
                         if (matchFilter) {
                             counter++;
-                            results.push( result );
+                            results.push( mapper(result) );
                             // if we're doing a modify, run it now
                             if(modifyObj) {
                                 result = modifyRecord(result);
@@ -391,10 +395,11 @@
                 cursorType = 'openCursor',
                 filters = [],
                 limitRange = null,
+                mapper = defaultMapper,
                 unique = false;
 
             var execute = function () {
-                return runQuery( type , args , cursorType , unique ? direction + 'unique' : direction, limitRange, filters );
+                return runQuery( type , args , cursorType , unique ? direction + 'unique' : direction, limitRange, filters , mapper );
             };
 
             var limit = function () {
@@ -422,7 +427,8 @@
                     desc: desc,
                     execute: execute,
                     filter: filter,
-                    distinct: distinct
+                    distinct: distinct,
+                    map: map
                 };
             };
             var filter = function ( ) {
@@ -435,7 +441,8 @@
                     desc: desc,
                     distinct: distinct,
                     modify: modify,
-                    limit: limit
+                    limit: limit,
+                    map: map
                 };
             };
             var desc = function () {
@@ -446,7 +453,8 @@
                     execute: execute,
                     filter: filter,
                     distinct: distinct,
-                    modify: modify
+                    modify: modify,
+                    map: map
                 };
             };
             var distinct = function () {
@@ -457,7 +465,8 @@
                     execute: execute,
                     filter: filter,
                     desc: desc,
-                    modify: modify
+                    modify: modify,
+                    map: map
                 };
             };
             var modify = function(update) {
@@ -466,6 +475,21 @@
                     execute: execute
                 };
             };
+            var map = function (fn) {
+                mapper = fn;
+
+                return {
+                    execute: execute,
+                    count: count,
+                    keys: keys,
+                    filter: filter,
+                    desc: desc,
+                    distinct: distinct,
+                    modify: modify,
+                    limit: limit,
+                    map: map
+                };
+            };
 
             return {
                 execute: execute,
@@ -475,7 +499,8 @@
                 desc: desc,
                 distinct: distinct,
                 modify: modify,
-                limit: limit
+                limit: limit,
+                map: map
             };
         };
         
@@ -531,7 +556,7 @@
     var dbCache = {};
 
     var db = {
-        version: '0.8.0',
+        version: '0.9.0',
         open: function ( options ) {
             var request;
 
diff --git a/tests/specs/query.js b/tests/specs/query.js
index bd58469..bd90328 100644
--- a/tests/specs/query.js
+++ b/tests/specs/query.js
@@ -793,6 +793,35 @@
 
         });
 
+        describe( 'query mapping' , function () {
+            it( 'should allow you to transform the object being returned' , function () {
+                var done;
+
+                runs(function () {
+                    var spec = this;
+
+                    spec.server.test
+                        .query( 'age' )
+                        .lowerBound(30)
+                        .map(function (value) { 
+                            return {
+                                fullName: value.firstName + ' ' + value.lastName,
+                                raw: value
+                            };
+                        })
+                        .execute()
+                        .done( function ( data ) {
+                            expect(data[0].fullName).toEqual(data[0].raw.firstName + ' ' + data[0].raw.lastName);
+                            done = true;
+                        });
+                });
+
+                waitsFor(function () {
+                    return done;
+                } , 1000 , 'timeout in atomic modify query' );
+            });
+        });
+
         describe( 'atomic updates' , function () {
             it( 'should modify only data returned by query' , function () {
                 var done;