search with db

Author: ilevd

.gitignore

@@ -23,7 +23,7 @@ jsdoc
 resources/keys/
 keys/
 .repl/
-data/
+/data
 .repl-*/
 .module-cache/
 .travis/id_rsa

build-js

@@ -1,3 +1,3 @@
 #!/bin/bash
-closure-compiler --js_output_file resources/public/js/reference.min.js --compilation_level SIMPLE `find js-src -type f \( -iname "*.js" ! -iname ".*" \)`
+closure-compiler --js_output_file resources/public/js/reference.min.js --compilation_level SIMPLE_OPTIMIZATIONS `find js-src -type f \( -iname "*.js" ! -iname ".*" \)`
 echo build

js-src/api/search.js

@@ -52,26 +52,12 @@ api.search.findConstants_ = function(str) {
     return res;
 };
 
-/** 
+/**
  * @private
- * @param {string} str
- * @param {string} container
- * @param {string} key
+ * @param {Array} res
  * @return {Array}
  */
-api.search.findGrouped_ = function(str, container, key) {
-    var data = api.search.data_;
-    var contains = api.search.match_;
-    var res = [];
-    for (var i = 0; i < data[container].length; i++) {
-        var c = data[container][i];
-        for (var j = 0; j < c[key].length; j++) {
-            var m = c[key][j];
-            if (contains(m.name, m["full-name"], str)) {
-                res.push(m);
-            }
-        }
-    }
+api.search.setMultiple_ = function(res){
     var actual = [];
     for (var i = 0; i < res.length; i++) {
         var item = res[i];
@@ -92,6 +78,29 @@ api.search.findGrouped_ = function(str, container, key) {
     return actual;
 };
 
+/** 
+ * @private
+ * @param {string} str
+ * @param {string} container
+ * @param {string} key
+ * @return {Array}
+ */
+api.search.findGrouped_ = function(str, container, key) {
+    var data = api.search.data_;
+    var contains = api.search.match_;
+    var res = [];
+    for (var i = 0; i < data[container].length; i++) {
+        var c = data[container][i];
+        for (var j = 0; j < c[key].length; j++) {
+            var m = c[key][j];
+            if (contains(m.name, m["full-name"], str)) {
+                res.push(m);
+            }
+        }
+    }
+    return api.search.setMultiple_(res);
+};
+
 /**
  * @private
  * @param {string} str
@@ -177,7 +186,7 @@ api.search.showGrouped_ = function(item, prefix, postfix) {
     var $res = $("<ul></ul>");
     for (var i = 0; i < item.group.length; i++) {
         var entry = item.group[i];
-        $res.append("<li><a class='item-link' href='/" + api.config.version + "/" + entry.link + "'>" + prefix + entry["full-name"] + postfix + "</a></li>");
+        $res.append("<li><a class='item-link' href='/" + api.config.version + "/" + entry.link + "'>" + prefix + entry["full_name"] + postfix + "</a></li>");
     }
 
     api.config.page = null;
@@ -213,7 +222,7 @@ api.search.addToResults_ = function($res, items, prefix, postfix, title) {
     for (var i = 0; i < items.length; i++) {
         var item = items[i];
         if (!item.multiple)
-            $res.append("<li><a class='item-link' href='/" + api.config.version + "/" + item.link + "'>" + prefix + item["full-name"] + postfix + "</a></li>");
+            $res.append("<li><a class='item-link' href='/" + api.config.version + "/" + item.link + "'>" + prefix + item["full_name"] + postfix + "</a></li>");
     }
 };
 
@@ -254,11 +263,65 @@ api.search.search_ = function(query) {
 
 /**
  * @private
- * @param {Object} data
+ * @param {Array} data
+ * @param {string} query
  */
-api.search.onLoad_ = function(data) {
+api.search.onDataLoad_ = function(data, query){
     api.search.data_ = data;
+    var constants = [];
+    var functions = [];
+    var methods = [];
+    var namespaces = [];
+    var enums = [];
+    var classes = [];
+    var typedefs = [];
+    for(var i = 0; i < data.length; i++){
+        var item = data[i];
+        switch(item.type){
+            case "method" : methods.push(item); break;
+            case "function" : functions.push(item); break;
+            case "class" : classes.push(item); break;
+            case "typedef": typedefs.push(item); break;
+            case "enum": enums.push(item); break;
+            case "namespace": namespaces.push(item); break;
+            case "constant": constants.push(item); break;
+        }
+    }
+    methods = api.search.setMultiple_(methods);
+    functions = api.search.setMultiple_(functions);
+
+    var $res = $("<ul></ul>");
+    api.search.addToResults_($res, constants, "", "", "Constants");
+    api.search.addToResults_($res, functions, "", "()", "Functions");
+    api.search.addToResults_($res, methods, "", "()", "Methods");
+    api.search.addToResults_($res, namespaces, "", "", "Namespaces");
+    api.search.addToResults_($res, enums, "[", "]", "Enums");
+    api.search.addToResults_($res, typedefs, "{", "}", "Typedefs");
+    api.search.addToResults_($res, classes, "", "", "Classes");
+    $res.find("a.item-link").click(api.links.typeLinkClick);
+
+    if (!$res.find("a").length) api.search.showEmpty_($res);
 
+    $("#search-results-new").show();
+    $("#search-results-new").html("");
+    $("#search-results-new").append($res);
+};
+
+/**
+ * @private
+ * @param {string} query
+ */
+api.search.makeSearchReq = function(query){
+    if (query.length < 2) {
+        api.search.hide();
+        return;
+    }
+    $.get("/" + api.config.version + "/search.json?q=" + query, function(data){
+        api.search.onDataLoad_(data, query);
+    });
+};
+
+api.search.init = function() {
     $("#search-results-new").click(function(e) {
         e.stopPropagation();
     });
@@ -268,19 +331,24 @@ api.search.onLoad_ = function(data) {
         return false;
     });
     $("#search").focus(function() {
-        api.search.search_($(this).val());
+        if( $(this).val() != ''){
+            $("#search-results-new").show();
+        }
     });
-    
+
+    var timeout = null;
     $("#search").keyup(function(e) {
         if (e.keyCode == 27) { //esc
             api.search.hide();
             $("#search").val('');
         }else {
-            api.search.search_($(this).val());
+            if(timeout !== null) {
+                window.clearTimeout(timeout);
+            }
+            timeout = window.setTimeout(function(){
+                api.search.makeSearchReq($("#search").val());
+            }, 250);
         }
     });
 };
 
-api.search.init = function() {
-    $.get("/" + api.config.version + "/data/search.json", api.search.onLoad_);
-};

project.clj

@@ -16,11 +16,13 @@
                  ;; logging
                  [com.taoensso/timbre "4.0.1"]
                  ;; databases
+                 [mpg "1.0.0"]
                  [com.taoensso/carmine "2.11.1"]
-                 [org.clojure/java.jdbc "0.3.6"]
-                 [postgresql/postgresql "8.4-702.jdbc4"]
+                 [org.clojure/java.jdbc "0.6.0-rc2"]
+                 [org.postgresql/postgresql "9.4.1208"]
                  [clojure.jdbc/clojure.jdbc-c3p0 "0.3.2"]
-                 [honeysql "0.5.2"]]
+                 [honeysql "0.6.3"]]
   :profiles {:dev {:jvm-opts ["-Ddev=true"]}
              :uberjar {:jvm-opts []}}
+  :plugins [[lein-ancient "0.6.10"]]
   :main reference.core)