Fixed bugs and added full support for ADFBc REST query syntax

Fixed bugs and added full support for ADFBc REST query syntax
Updated version to 1.2.1

Author: kentarokinebuchi

Gruntfile.js

@@ -236,7 +236,11 @@ module.exports = function (grunt) {
           {expand: true,
            cwd: '<%= paths.ext_lib %>',
            src: ['*.js'],
-           dest: '<%= paths.dist_debug %>'}
+           dest: '<%= paths.dist_debug %>'},
+         {expand: true,
+           cwd: 'node_modules/sql-where-parser',
+           src: ['sql-where-parser.min.js'],
+           dest: '<%= paths.dist_debug %>/impl'}
         ]
       },
       config_coverage: {

JSDOC.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.2.0 #
+# offline-persistence-toolkit 1.2.1 #
 
 ## Introduction ##
 

README.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.2.0 #
+# offline-persistence-toolkit 1.2.1 #
 
 offline-persistence-toolkit is a client-side JavaScript library that provides caching and offline support at the HTTP request layer. This support is transparent to the user and is done through the Fetch API and an XHR adapter. HTTP requests made while the client device is offline are captured for replay when connection to the server is restored. Additional capabilities include a persistent storage layer, synchronization manager, binary data support and various configuration APIs for customizing the default behavior. This framework can be used in both ServiceWorker and non-ServiceWorker contexts within web and hybrid mobile apps.
 
@@ -58,16 +58,16 @@ If your app uses [RequireJS](http://www.requirejs.org/ "RequireJS"), update the
 ```javascript
   requirejs.config({
     paths: {
-      'persist' : 'js/libs/persist/v1.2.0/min'
+      'persist' : 'js/libs/persist/v1.2.1/min'
 
       // Other path mappings here
  }
 ```
-For Oracle JET apps, also open `appDir/src/js/main-release-paths.json` and add the `'persist' : 'js/libs/persist/v1.2.0/min'` entry to the list of paths.
+For Oracle JET apps, also open `appDir/src/js/main-release-paths.json` and add the `'persist' : 'js/libs/persist/v1.2.1/min'` entry to the list of paths.
 
 You can choose the name of the paths prefix. That is, you can use a different value to the ‘persist’ value shown in the examples.
 
-It is recommended to add the version number as a convention in your application build step such as `'persist' : 'js/libs/persist/v1.2.0/min'`.
+It is recommended to add the version number as a convention in your application build step such as `'persist' : 'js/libs/persist/v1.2.1/min'`.
 
 Versions of the toolkit are also available on CDN under the latest JET release. e.g. 
 
@@ -91,7 +91,7 @@ And again, if you are using RequireJS, you will need to map paths for these pack
     paths: {
       'pouchdb': 'js/libs/pouchdb-6.3.4',
       'pouchfind': 'js/libs/pouchdb.find',
-      'persist' : 'js/libs/persist/v1.2.0/min'
+      'persist' : 'js/libs/persist/v1.2.1/min'
 
       // Other path mappings here
  }

USAGE.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.2.0 #
+# offline-persistence-toolkit 1.2.1 #
 
 # Introduction #
 

docs/index.html

@@ -43,7 +43,7 @@ <h3> </h3>
 
 
     <section>
-        <article><h1>offline-persistence-toolkit 1.2.0</h1><h2>Introduction</h2><p>This document provides a reference to the offline-persistence-toolkit's JavaScript API. Links to JSDoc for each class can be found to the right.</p>
+        <article><h1>offline-persistence-toolkit 1.2.1</h1><h2>Introduction</h2><p>This document provides a reference to the offline-persistence-toolkit's JavaScript API. Links to JSDoc for each class can be found to the right.</p>
 <p>The toolkit's <a href="https://github.com/oracle/offline-persistence-toolkit/" title="README">README</a> file provides an overview of the toolkit’s capabilities. Having read that document, you can find more information about how to implement a range of common and advanced use cases with the toolkit in the
 <a href="https://github.com/oracle/offline-persistence-toolkit/blob/master/USAGE.md" title="Usage guide">Usage guide</a>.</p>
 <h2>License</h2><p>Copyright (c) 2017 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.</p></article>

docs/oracleRestJsonShredding.html

@@ -211,6 +211,9 @@ <h5>Parameters:</h5>
 
 
 <span class="param-type">string</span>
+|
+
+<span class="param-type">Array</span>
 
 
 
@@ -220,7 +223,7 @@ <h5>Parameters:</h5>
 
 
 
-            <td class="description last">The id field in the JSON data</td>
+            <td class="description last">The id field or array of fields in the JSON data</td>
         </tr>
 
 
@@ -369,7 +372,7 @@ <h4 class="name" id=".getUnshredder"><span class="type-signature">(static) </spa
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="oracleRestJsonShredding.js.html">oracleRestJsonShredding.js</a>, <a href="oracleRestJsonShredding.js.html#line77">line 77</a>
+        <a href="oracleRestJsonShredding.js.html">oracleRestJsonShredding.js</a>, <a href="oracleRestJsonShredding.js.html#line92">line 92</a>
     </li></ul></dd>
 
 

docs/oracleRestJsonShredding.js.html

@@ -48,7 +48,7 @@ <h1 class="page-title">Source: oracleRestJsonShredding.js</h1>
    * @memberof oracleRestJsonShredding
    * @static
    * @param {string} storeName Name of the Persistent Store into which the shredded data should be stored
-   * @param {string} idAttr The id field in the JSON data
+   * @param {string|Array} idAttr The id field or array of fields in the JSON data
    * @return {Function} shredder The shredder function takes a Response object as
    * parameter and returns a Promise which resolves to an array of objects which have the following
    * structure:
@@ -79,11 +79,26 @@ <h1 class="page-title">Source: oracleRestJsonShredding.js</h1>
             var payloadJson = JSON.parse(payload);
             if (payloadJson.items != null) {
               idArray = payloadJson.items.map(function (jsonEntry) {
+                if (idAttr instanceof Array) {
+                  var key = [];
+                  idAttr.forEach(function(keyAttr) {
+                    key.push(jsonEntry[keyAttr])
+                  });
+                  return key;
+                }
                 return jsonEntry[idAttr];
               });
               dataArray = payloadJson.items;
             } else {
-              idArray[0] = payloadJson[idAttr];
+              if (idAttr instanceof Array) {
+                var key = [];
+                idAttr.forEach(function(keyAttr) {
+                  key.push(payloadJson[keyAttr])
+                });
+                idArray[0] = key;
+              } else {
+                idArray[0] = payloadJson[idAttr];
+              }
               dataArray[0] = payloadJson;
               resourceType = 'single';
             }

docs/queryHandlers.html

@@ -461,7 +461,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="queryHandlers.js.html">queryHandlers.js</a>, <a href="queryHandlers.js.html#line258">line 258</a>
+        <a href="queryHandlers.js.html">queryHandlers.js</a>, <a href="queryHandlers.js.html#line327">line 327</a>
     </li></ul></dd>
 
 

docs/queryHandlers.js.html

@@ -31,8 +31,8 @@ <h1 class="page-title">Source: queryHandlers.js</h1>
  * All rights reserved.
  */
 
-define(['./persistenceManager', './persistenceStoreManager', './persistenceUtils', './impl/logger'],
-  function (persistenceManager, persistenceStoreManager, persistenceUtils, logger) {
+define(['./persistenceManager', './persistenceStoreManager', './persistenceUtils', './impl/logger', './impl/sql-where-parser.min'],
+  function (persistenceManager, persistenceStoreManager, persistenceUtils, logger, sqlWhereParser) {
     'use strict';
 
     /**
@@ -170,7 +170,9 @@ <h1 class="page-title">Source: queryHandlers.js</h1>
           return persistenceManager.getCache().match(request, {ignoreSearch: true}).then(function (response) {
             if (response) {
               var hasMore = false;
+              var totalResults = 0;
               if (results) {
+                totalResults = results.length;
                 if (offset
                   &amp;&amp; offset > 0) {
                   if (offset &lt; results.length)
@@ -219,6 +221,7 @@ <h1 class="page-title">Source: queryHandlers.js</h1>
                             payloadJson.offset = parseInt(offset, 10);
                           }
                           payloadJson.hasMore = hasMore;
+                          payloadJson.totalResults = totalResults;
                         }
                         return persistenceUtils.setResponsePayload(response, payloadJson);
                       } catch (err) {
@@ -263,23 +266,89 @@ <h1 class="page-title">Source: queryHandlers.js</h1>
       var findQuery = {};
 
       if (value) {
+        var parser = new sqlWhereParser();
         var queryExpArray = value.split(';');
         var i;
-        var queryKey;
         var selectorQuery = {};
-        for (i = 0; i &lt; queryExpArray.length; i++) {
-          queryKey = queryExpArray[i].split('=')[0];
-
-          if (queryKey) {
-            var queryVal = queryExpArray[i].split('=')[1].replace(/^"|'(.*)'|"$/, '$1');
-            selectorQuery["value." + queryKey] = queryVal;
+        
+          for (i = 0; i &lt; queryExpArray.length; i++) {
+            
+            selectorQuery = parser.parse(queryExpArray[i], function(operatorValue, operands)
+              {
+                operatorValue = operatorValue.toUpperCase();
+                // the LHS operand is always a value operand
+                if (operatorValue != 'AND' &amp;&amp;
+                  operatorValue != 'OR') {
+                  operands[0] = 'value.' + operands[0];
+                }
+                var lhsOp = operands[0];
+                var rhsOp = operands[1];
+                var returnExp = {};
+                switch (operatorValue) {
+                  case '>':
+                    returnExp[lhsOp] = {
+                      $gt: rhsOp
+                    };
+                    break;
+                  case '&lt;':
+                    returnExp[lhsOp] = {
+                      $lt: rhsOp
+                    };
+                    break;
+                  case '>=':
+                    returnExp[lhsOp] = {
+                      $gte: rhsOp
+                    };
+                    break;
+                  case '&lt;=':
+                    returnExp[lhsOp] = {
+                      $lte: rhsOp
+                    };
+                    break;
+                  case '=':
+                    returnExp[lhsOp] = {
+                      $eq: rhsOp
+                    };
+                    break;
+                  case '!=':
+                    returnExp[lhsOp] = {
+                      $ne: rhsOp
+                    };
+                    break;
+                  case 'AND':
+                    returnExp = {
+                      $and: operands
+                    };
+                    break;
+                  case 'OR':
+                    returnExp = {
+                      $or: operands
+                    };
+                    break;
+                  case 'LIKE':
+                    rhsOp = rhsOp.replace('%', '.+');
+                    returnExp[lhsOp] = {
+                      $regex: rhsOp
+                    };
+                    break;
+                  case 'BETWEEN':
+                    var betweenOperands = [];
+                    betweenOperands[0] = {};
+                    betweenOperands[1] = {};
+                    betweenOperands[0][lhsOp] = {$gte: operands[1]};
+                    betweenOperands[1][lhsOp] = {$lte: operands[2]};
+                    returnExp = {
+                      $and: betweenOperands
+                    };
+                    break;
+                }
+                return returnExp;
+              });
+          }
+          if (Object.keys(selectorQuery).length > 0) {
+            findQuery.selector = selectorQuery;
           }
         }
-
-        if (Object.keys(selectorQuery).length > 0) {
-          findQuery.selector = selectorQuery;
-        }
-      }
       return findQuery;
     };
 

docs/simpleJsonShredding.html

@@ -211,6 +211,9 @@ <h5>Parameters:</h5>
 
 
 <span class="param-type">string</span>
+|
+
+<span class="param-type">Array</span>
 
 
 
@@ -220,7 +223,7 @@ <h5>Parameters:</h5>
 
 
 
-            <td class="description last">The id field in the JSON data</td>
+            <td class="description last">The id field or array of fields in the JSON data</td>
         </tr>
 
 
@@ -369,7 +372,7 @@ <h4 class="name" id=".getUnshredder"><span class="type-signature">(static) </spa
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="simpleJsonShredding.js.html">simpleJsonShredding.js</a>, <a href="simpleJsonShredding.js.html#line75">line 75</a>
+        <a href="simpleJsonShredding.js.html">simpleJsonShredding.js</a>, <a href="simpleJsonShredding.js.html#line91">line 91</a>
     </li></ul></dd>