Merge branch 'develop'

* develop:
  bump version and add authors
  fix required fields bug and improve error messages when document _id doesn't exist

Author: lgfa29

77-cloudant-cf.html

@@ -175,14 +175,6 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-
-    <script>
-        $("#node-input-search").change(function() {
-            var searchType = $("#node-input-search option:selected").val();
-            if (searchType == "_id_") $("#node-search-index-form").hide();
-            else $("#node-search-index-form").show();
-        });
-    </script>
 </script>
 
 <script type="text/javascript">
@@ -217,8 +209,8 @@
             name    : { value: "" },
             database: { value: "", required: true },
             search  : { value: "_id_", required: true },
-            design  : { value: "", required: true },
-            index   : { value: "", required: true }
+            design  : { value: "" },
+            index   : { value: "" }
         },
         inputs : 1,
         outputs: 1,
@@ -231,11 +223,14 @@
     });
 
     function oneditprepare() {
-        var select = $('#node-input-service');
         var node = this;
 
+        var serviceSelect  = $('#node-input-service');
+        var searchBySelect = $('#node-input-search');
+        var searchForm     = $('#node-search-index-form');
+
         $.getJSON('cloudant/vcap/',function(data) {
-            var last = select.children().last();
+            var last = serviceSelect.children().last();
             var opts = [];
 
             for (var i=0; i < data.length; i++) {
@@ -249,24 +244,38 @@
 
             if (opts.length == 0) {
                 node.service = "_ext_";
-                select.find("option").filter(function() {
+                serviceSelect.find("option").filter(function() {
                     return $(this).val() == node.service;
                 }).attr('selected', true);
             } else {
                 last.before(opts.join(""));
             }
 
-            select.change();
+            serviceSelect.change();
         });
 
-        select.change(function() {
-            var service = select.val();
+        serviceSelect.change(function() {
+            var service = serviceSelect.val();
             if (service == "_ext_") {
                 $("#node-input-external-details").show();
             } else {
                 $("#node-input-external-details").hide();
             }
         });
+
+        searchBySelect.change(function() {
+            var searchBy = searchBySelect.val();
+
+            if (searchBy === "_idx_") {
+                node._def.defaults.design.required = true;
+                node._def.defaults.index.required  = true;
+                searchForm.show();
+            } else {
+                node._def.defaults.design.required = false;
+                node._def.defaults.index.required  = false;
+                searchForm.hide();
+            }
+        });
     }
 
     function label() {

77-cloudant-cf.js

@@ -212,12 +212,13 @@ module.exports = function(RED) {
     function CloudantInNode(n) {
         RED.nodes.createNode(this,n);
 
-        this.cloudant = n.cloudant;
-        this.url      = _getUrl(this, n);
-        this.database = n.database;
-        this.search   = n.search;
-        this.design   = n.design;
-        this.index    = n.index;
+        this.cloudant  = n.cloudant;
+        this.url       = _getUrl(this, n);
+        this.database  = n.database;
+        this.search    = n.search;
+        this.design    = n.design;
+        this.index     = n.index;
+        this.payloadIn = "";
 
         if (this.url) {
             var node = this;
@@ -226,6 +227,8 @@ module.exports = function(RED) {
             var db   = nano.use(node.database);
 
             node.on("input", function(msg) {
+                node.payloadIn = msg.payload;
+
                 if (node.search === "_id_") {
                     var id = msg.payload;
                     db.get(id, sendDocumentOnPayload);
@@ -241,7 +244,12 @@ module.exports = function(RED) {
             if (!err) {
                 node.send({ payload: body });
             } else {
-                node.error(err);
+                if (err.description === "missing") {
+                    node.warn("Document '" + node.payloadIn+ "' not found in database '" +
+                                node.database + "'.");
+                } else {
+                    node.error(err.reason);
+                }
             }
         }
     }

README.md

@@ -30,3 +30,8 @@ from the database. For both cases, the query should be passed in the
 
 When getting documents by id, the `payload` will be the desired `_id` value.
 For `search indexes`, the query should follow the format `indexName:value`.
+
+Authors
+-------
+* Luiz Gustavo Ferraz Aoqui - [[email protected]](mailto:[email protected])
+* Túlio Pascoal

package.json

@@ -1,6 +1,6 @@
 {
     "name"         : "node-red-node-cf-cloudant",
-    "version"      : "0.2.1",
+    "version"      : "0.2.2",
     "description"  : "A Node-RED node to write to a Cloudant database on Bluemix",
     "dependencies" : {
         "nano" : "5.10.0"