prismic.io - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3

dist/prismic.io.js

@@ -53,3 +53,3 @@ (function (Global, undefined) {
         }
-    })();
+    });
 
@@ -69,4 +69,2 @@ var nodeJSRequest = (function() {
   
-                    console.log('[prismic.io] ' + requestUrl)
-  
                     var parsed = url.parse(requestUrl),
@@ -110,3 +108,3 @@ h = parsed.protocol == 'https:' ? https : http,
         }
-    })();
+    });
 
@@ -197,3 +195,3 @@ // --
             this.accessToken = accessToken;
-            this.requestHandler = maybeRequestHandler || ajaxRequest || nodeJSRequest || (function() {throw new Error("No request handler available (tried XMLHttpRequest & NodeJS)")})();
+            this.requestHandler = maybeRequestHandler || ajaxRequest() || nodeJSRequest() || (function() {throw new Error("No request handler available (tried XMLHttpRequest & NodeJS)")})();
             return this;
@@ -246,17 +244,7 @@ },
 
-        if(form.fields && form.fields.q) {
-            for (var f in form.fields) {
-                var val = this.data[f];
-                if(!val) {
-                    this.data[f] = [];
-                }
-                // FIXME: only handle value "default"?
-                if(f === "q") {
-                    this.query(form.fields[f].default);
-                } else {
-                    this.data[f].push(form.fields[f].default);
-                }
+        for(var field in form.fields) {
+            if(form.fields[field].default) {
+                this.data[field] = [form.fields[field].default];
             }
         }
-
     };
@@ -266,18 +254,26 @@
 
-        ref: function(ref) {
-            this.data.ref = ref;
+        set: function(field, value) {
+            var fieldDesc = this.form.fields[field];
+            if(!fieldDesc) throw new Error("Unknown field " + field);
+            var values= this.data[field] || [];
+            if(fieldDesc.multiple) {
+                values.push(value);
+            } else {
+                values = [value];
+            }
+            this.data[field] = values;
             return this;
         },
 
+        ref: function(ref) {
+            return this.set("ref", ref);
+        },
+
         query: function(query) {
+            if(this.form.fields.q.multiple) {
+                return this.set("q", query);
+            } 
 
-            function strip(q) {
-                if(q == null) return "";
-                if(q.indexOf("[") === 0 && q.lastIndexOf("]") === q.length - 1) {
-                    return q.substring(1, q.length - 1);
-                }
-                return q;
-            }
             this.data.q = this.data.q || [];
-            this.data.q.push(strip(query));
+            this.data.q.push(query);
 
@@ -288,27 +284,15 @@ return this;
         submit: function(cb) {
-            var self = this;
+            var self = this,
+                url = this.form.action;
 
-            var q = "[" + this.data.q.join("") + "]",
-                ref = this.data.ref,
-                params = {
-                    ref: ref
-                };
-
-            if (this.data.q.length === 1 && this.data.q[0] === "") {
-
-            } else {
-                params.q = q;
-            }
-
-            if(this.data.accessToken && this.data.accessToken.length) {
-                params['access_token'] = this.data.accessToken[0];
-            } 
-
-            var url = this.form.action;
-
-            if(params) {
+            if(this.data) {
                 var sep = (url.indexOf('?') > -1 ? '&' : '?');
-                for(var key in params) {
-                    url += sep + key + '=' + encodeURIComponent(params[key]);
-                    sep = '&';
+                for(var key in this.data) {
+                    var values = this.data[key];
+                    if(values) {
+                        for(var i=0; i<values.length; i++) {
+                            url += sep + key + '=' + encodeURIComponent(values[i]);
+                            sep = '&';
+                        }
+                    }
                 }
@@ -318,3 +302,6 @@ }
             this.api.requestHandler(url, function (d) {
-                var docs = d.map(function (doc) {
+
+                var results = d.results || d;
+
+                var docs = results.map(function (doc) {
                     var fragments = {}
@@ -321,0 +308,0 @@

Gruntfile.js

@@ -5,3 +5,3 @@ module.exports = function(grunt) {
 
-    VERSION: '1.0.2',
+    VERSION: '1.0.3',
 
@@ -8,0 +8,0 @@ pkg: grunt.file.readJSON('package.json'),

package.json

@@ -6,3 +6,3 @@ {
   "keywords": ["prismic", "prismic.io", "cms", "content", "api"],
-  "version": "1.0.2",
+  "version": "1.0.3",
   "devDependencies": {
@@ -9,0 +9,0 @@ "grunt": "~0.4.1",

README.md

@@ -8,3 +8,3 @@ ## JavaScript development kit for prismic.io
 ```
-https://github.com/prismicio/repository/raw/master/javascript/prismic.io-1.0.1.min.js
+https://github.com/prismicio/repository/raw/master/javascript/prismic.io-1.0.2.min.js
 ```
@@ -11,0 +11,0 @@

src/api.js

@@ -53,3 +53,3 @@ (function (Global, undefined) {
         }
-    })();
+    });
 
@@ -69,4 +69,2 @@ var nodeJSRequest = (function() {
   
-                    console.log('[prismic.io] ' + requestUrl)
-  
                     var parsed = url.parse(requestUrl),
@@ -110,3 +108,3 @@ h = parsed.protocol == 'https:' ? https : http,
         }
-    })();
+    });
 
@@ -197,3 +195,3 @@ // --
             this.accessToken = accessToken;
-            this.requestHandler = maybeRequestHandler || ajaxRequest || nodeJSRequest || (function() {throw new Error("No request handler available (tried XMLHttpRequest & NodeJS)")})();
+            this.requestHandler = maybeRequestHandler || ajaxRequest() || nodeJSRequest() || (function() {throw new Error("No request handler available (tried XMLHttpRequest & NodeJS)")})();
             return this;
@@ -246,17 +244,7 @@ },
 
-        if(form.fields && form.fields.q) {
-            for (var f in form.fields) {
-                var val = this.data[f];
-                if(!val) {
-                    this.data[f] = [];
-                }
-                // FIXME: only handle value "default"?
-                if(f === "q") {
-                    this.query(form.fields[f].default);
-                } else {
-                    this.data[f].push(form.fields[f].default);
-                }
+        for(var field in form.fields) {
+            if(form.fields[field].default) {
+                this.data[field] = [form.fields[field].default];
             }
         }
-
     };
@@ -266,18 +254,26 @@
 
-        ref: function(ref) {
-            this.data.ref = ref;
+        set: function(field, value) {
+            var fieldDesc = this.form.fields[field];
+            if(!fieldDesc) throw new Error("Unknown field " + field);
+            var values= this.data[field] || [];
+            if(fieldDesc.multiple) {
+                values.push(value);
+            } else {
+                values = [value];
+            }
+            this.data[field] = values;
             return this;
         },
 
+        ref: function(ref) {
+            return this.set("ref", ref);
+        },
+
         query: function(query) {
+            if(this.form.fields.q.multiple) {
+                return this.set("q", query);
+            } 
 
-            function strip(q) {
-                if(q == null) return "";
-                if(q.indexOf("[") === 0 && q.lastIndexOf("]") === q.length - 1) {
-                    return q.substring(1, q.length - 1);
-                }
-                return q;
-            }
             this.data.q = this.data.q || [];
-            this.data.q.push(strip(query));
+            this.data.q.push(query);
 
@@ -288,27 +284,15 @@ return this;
         submit: function(cb) {
-            var self = this;
+            var self = this,
+                url = this.form.action;
 
-            var q = "[" + this.data.q.join("") + "]",
-                ref = this.data.ref,
-                params = {
-                    ref: ref
-                };
-
-            if (this.data.q.length === 1 && this.data.q[0] === "") {
-
-            } else {
-                params.q = q;
-            }
-
-            if(this.data.accessToken && this.data.accessToken.length) {
-                params['access_token'] = this.data.accessToken[0];
-            } 
-
-            var url = this.form.action;
-
-            if(params) {
+            if(this.data) {
                 var sep = (url.indexOf('?') > -1 ? '&' : '?');
-                for(var key in params) {
-                    url += sep + key + '=' + encodeURIComponent(params[key]);
-                    sep = '&';
+                for(var key in this.data) {
+                    var values = this.data[key];
+                    if(values) {
+                        for(var i=0; i<values.length; i++) {
+                            url += sep + key + '=' + encodeURIComponent(values[i]);
+                            sep = '&';
+                        }
+                    }
                 }
@@ -318,3 +302,6 @@ }
             this.api.requestHandler(url, function (d) {
-                var docs = d.map(function (doc) {
+
+                var results = d.results || d;
+
+                var docs = results.map(function (doc) {
                     var fragments = {}
@@ -321,0 +308,0 @@

test/test.js

@@ -31,2 +31,11 @@ (function(Prismic) {
 
+  asyncTest('Submit the `everything` form with a predicate', 1, function() {
+    Prismic.Api(testRepository, function(Api) {
+      Api.forms('everything').ref(Api.master()).query('[[:d = at(document.type, "product")]]').submit(function(results) {
+        equal(results.length, 16);
+        start();
+      });
+    });
+  });
+
   asyncTest('Submit the `products` form', 1, function() {
@@ -41,2 +50,11 @@ Prismic.Api(testRepository, function(Api) {
 
+  asyncTest('Submit the `products` form with a predicate', 1, function() {
+    Prismic.Api(testRepository, function(Api) {
+      Api.forms('products').ref(Api.master()).query('[[:d = at(my.product.flavour, "Chocolate")]]').submit(function(results) {
+        equal(results.length, 5);
+        start();
+      });
+    });
+  });
+
   asyncTest('Render a document to Html', 1, function() {
@@ -43,0 +61,0 @@ Prismic.Api(testRepository, function(Api) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

128059

decreased by-0.4%

Lines of code

3487

decreased by-0.06%

No dependency changes