Merge branch 'dev-in-node' into develop

* dev-in-node:
  bump npm version
  initial version of in node for querying

Author: lgfa29

77-cloudant-cf.html

@@ -137,6 +137,46 @@
     </script>
 </script>
 
+<script type="text/x-red" data-template-name="cloudant in">
+    <div class="form-row">
+        <label for="node-input-service"><i class="fa fa-folder-close"></i> Service</label>
+        <select id="node-input-service">
+            <option value="" disabled></option>
+            <option value="_ext_"> External service</option>
+        </select>
+    </div>
+
+    <div class="form-row hide" id="node-input-external-details">
+        <label for="node-input-cloudant"><i class=" fa fa-bookmark"></i> Server</label>
+        <input type="text" id="node-input-cloudant">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-database"><i class="fa fa-briefcase"></i> Database</label>
+        <input type="text" id="node-input-database" placeholder="database">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-design-doc"><i class="fa fa-search"></i> Search Idx.</label>
+        <input type="text" id="node-input-design" style="width: 30%" placeholder="design document">
+        /
+        <input type="text" id="node-input-index" style="width: 30%" placeholder="index name">
+    </div>
+
+    <div class="form-row">
+        <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-operation").change(function() {
+            var id = $("#node-input-operation option:selected").val();
+            if (id == "delete") $(".node-input-payonly").hide();
+            else $(".node-input-payonly").show();
+        });
+    </script>
+</script>
+
 <script type="text/javascript">
     RED.nodes.registerType("cloudant out", {
         category: "storage-output",
@@ -160,6 +200,27 @@
         oneditprepare: oneditprepare
     });
 
+    RED.nodes.registerType("cloudant in", {
+        category: "storage-input",
+        color: "rgb(114, 199, 231)",
+        defaults: {
+            service : { value: "", required: true },
+            cloudant: { type: "cloudant", validate: validateServer },
+            name    : { value: "" },
+            database: { value: "", required: true },
+            design  : { value: "", required: true },
+            index   : { value: "", required: true }
+        },
+        inputs : 1,
+        outputs: 1,
+        icon   : "cloudant.png",
+        label  : label,
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: oneditprepare
+    });
+
     function oneditprepare() {
         var select = $('#node-input-service');
         var node = this;
@@ -228,3 +289,14 @@
         and selecting the <b>remove</b> option for the node.
     </p>
 </script>
+
+<script type="text/x-red" data-help-name="cloudant in">
+   <p>
+        A node for searching a Cloudant database using a Search Index.
+    </p>
+    <p>
+        Query is performed on existing <b>Search Indexes</b> stored on the desired
+        database. The query argument should be passed on the <code>msg.payload</code>
+        following the <code>indexName:value</code> pattern.
+    </p>
+</script>

77-cloudant-cf.js

@@ -125,19 +125,7 @@ module.exports = function(RED) {
         this.payonly        = n.payonly || false;
         this.database       = n.database;
         this.cloudant       = n.cloudant;
-
-        if (n.service == "_ext_") {
-            var cloudantConfig = RED.nodes.getNode(this.cloudant);
-            if (cloudantConfig) {
-                this.url = cloudantConfig.url;
-            }
-        }
-        else if (n.service != "") {
-            var cloudantConfig = cfEnv.getService(n.service);
-            if (cloudantConfig) {
-                this.url = cloudantConfig.credentials.url;
-            }
-        }
+        this.url            = _getUrl(this, n);
 
         if (this.url) {
             var node = this;
@@ -220,4 +208,49 @@ module.exports = function(RED) {
         }
     };
     RED.nodes.registerType("cloudant out", CloudantOutNode);
+
+    function CloudantInNode(n) {
+        RED.nodes.createNode(this,n);
+
+        this.design   = n.design;
+        this.index    = n.index;
+        this.database = n.database;
+        this.cloudant = n.cloudant;
+        this.url      = _getUrl(this, n);
+
+        if (this.url) {
+            var node = this;
+
+            var nano = require('nano')(node.url);
+            var db   = nano.use(node.database);
+
+            node.on("input", function(msg) {
+                var query = { q: msg.payload };
+
+                db.search(node.design, node.index, query, function(err, doc) {
+                    if (!err) {
+                        node.send(doc);
+                    } else {
+                        node.error(err);
+                    }
+                });
+            });
+        }
+    }
+    RED.nodes.registerType("cloudant in", CloudantInNode);
+
+    function _getUrl(node, n) {
+        if (n.service == "_ext_") {
+            var cloudantConfig = RED.nodes.getNode(node.cloudant);
+            if (cloudantConfig) {
+                return cloudantConfig.url;
+            }
+        }
+        else if (n.service != "") {
+            var cloudantConfig = cfEnv.getService(n.service);
+            if (cloudantConfig) {
+                return cloudantConfig.credentials.url;
+            }
+        }
+    }
 };

package.json

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