Merge pull request #133 from prismicio/fix-array-numbers

Fix any operator with number values

Author: srenault

lib/predicates.js

@@ -1,10 +1,22 @@
-
 "use strict";
 
-function clean(s) {
+function stripQuotes(s) {
   return s.replace(/"/g, "");
 }
 
+function toQueryValue(value) {
+  if (typeof value === 'string') {
+    return '"' + stripQuotes(value) + '"';
+  } else if (value instanceof Date) {
+    return value.getTime();
+  } else if (Array.isArray(value)) {
+    return "[" + value.map(function (item) {
+      return toQueryValue(item);
+    }).join(',') + "]";
+  }
+  return value;
+}
+
 /**
  * @global
  * @namespace
@@ -16,27 +28,11 @@ module.exports = {
    * Convert a predicate (array of 3 elements) into a query for prismic.io (string)
    */
   toQuery: function (predicate) {
-    var pred = clean(predicate[0]);
-    var first = clean(predicate[1]);
-    var firstArg = (first.indexOf("my.") === 0 || first.indexOf("document") === 0) ? first
-                 : '"' + first + '"';
-    return "[:d = " + pred + "(" + firstArg +
-      (predicate.length > 2 ? ", " : "") +
-      (function() {
-        return predicate.slice(2).map(function(p) {
-          if (typeof p === 'string') {
-            return '"' + clean(p) + '"';
-          } else if (Array.isArray(p)) {
-            return "[" + p.map(function (e) {
-              return '"' + clean(e) + '"';
-            }).join(',') + "]";
-          } else if (p instanceof Date) {
-            return p.getTime();
-          } else {
-            return p;
-          }
-        }).join(',');
-      })() + ")]";
+    var operator = stripQuotes(predicate[0]);
+    var path = stripQuotes(predicate[1]);
+    var pathArg = (path.indexOf("my.") === 0 || path.indexOf("document") === 0) ? path : '"' + path + '"';
+    var values = predicate.slice(2).map(toQueryValue).join(',');
+    return "[:d = " + operator + "(" + pathArg + (predicate.length > 2 ? ", " : "") + values + ")]";
   },
 
   /**

test/test.js

@@ -6,8 +6,6 @@ var chai = require('chai');
 
 var assert = chai.assert;
 
-/* === TESTS ARE RUN OVER "LES BONNES CHOSES" EXAMPLE REPOSITORY === */
-
 var microRepository = 'https://micro.prismic.io/api',
     previewToken = 'MC5VcXBHWHdFQUFONDZrbWp4.77-9cDx6C3lgJu-_vXZafO-_vXPvv73vv73vv70777-9Ju-_ve-_vSLvv73vv73vv73vv70O77-977-9Me-_vQ',
     Predicates = Prismic.Predicates;
@@ -122,7 +120,7 @@ describe('API form submissions', function() {
     });
   });
 
-  it('Use an Array to query', function (done) {
+  it('Use an Array of String to query', function (done) {
     Prismic.api(microRepository, function (err, Api) {
       if (err) {
         console.log(err);
@@ -143,6 +141,25 @@ describe('API form submissions', function() {
     });
   });
 
+  it('Use an Array of Number to query', function (done) {
+    Prismic.api(microRepository, function (err, Api) {
+      if (err) {
+        console.log(err);
+        done();
+      }
+      Api.form('everything')
+        .query(Predicates.any('my.argument.priority', [1000, 600]))
+        .ref(Api.master())
+        .submit(function (err, response) {
+          if (err) {
+            console.log(err);
+          }
+          assert.equal(response.results.length, 2);
+          done();
+        });
+    });
+  });
+
   it('Use getByID', function(done) {
     Prismic.api(microRepository, function (err, Api) {
       if (err) throw err;