gitdocs 0.4.1 → 0.4.2

data/CHANGELOG

@@ -3,4 +3,8 @@
   * Adds a basic search to web front-end
   * Beginning of the work towards cross-platform notifications
 
-0.4.2 (Not yet released)
+0.4.2 (12/13/2012)
+
+  * Fixes search on blank results case
+
+0.4.3 (Not Yet Released)

data/lib/gitdocs/manager.rb

@@ -16,7 +16,8 @@ module Gitdocs
       results = {}
       @runners.each_with_index do |runner, index|
         descriptor = RepoDescriptor.new(runner.root, index)
-        results[descriptor] = runner.search(term)
+        repo_results = runner.search(term)
+        results[descriptor] = repo_results unless repo_results.empty?
       end
       results
     end

data/lib/gitdocs/public/css/app.css

@@ -2,6 +2,8 @@ body {
   padding-top: 50px;
 }
 
+.contents a { color: inherit; }
+
 .inline-file {
   width:100%;
   min-height: 600px;

data/lib/gitdocs/public/js/app.js

@@ -27,6 +27,7 @@ GitDocs = {
 $(document).ready(function() {
   GitDocs.linkBreadcrumbs();
   GitDocs.fillDirMeta();
+  StringFormatter.autoLink();
 });
 
 // Redirect to edit page for new file when new file form is submitted

data/lib/gitdocs/public/js/util.js

@@ -16,6 +16,23 @@ Utils = {
   }
 };
 
+// Strings
+StringFormatter = {
+  // autolink text within a plain text file
+  // apply to the wrapper around any text (.autolink)
+  autoLink : function() {
+    $('.autolink:not(.linked)').each(function(index, item) {
+      var result = $(item).html().toString() + ' ';
+      $(result.match(/(https?.*?)[^<\s]*/gm)).each(function(index, linkString) {
+        var link = "<a href='" + linkString + "' target='_blank'>" + linkString + "</a>";
+        result = result.replace(linkString, link);
+        $(item).addClass('linked');
+      });
+      $(item).html(result.slice(0, -1));
+    });
+  }
+};
+
 // DATES
 // RelativeDate.time_ago_in_words(date)
 var RelativeDate = {

data/lib/gitdocs/runner.rb

@@ -14,8 +14,8 @@ module Gitdocs
     SearchResult = Struct.new(:file, :context)
     def search(term)
       results = []
-      sh_string("git grep #{ShellTools.escape(term)}").scan(/(.*?):([^\n]*)/) do |(file, context)|
-        results << SearchResult.new(file, context)
+      if result_test = sh_string("git grep #{ShellTools.escape(term)}")
+        result_test.scan(/(.*?):([^\n]*)/) { |(file, context)| results << SearchResult.new(file, context) }
       end
       results
     end

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/gitdocs/views/search.haml

@@ -1,14 +1,17 @@
 - @title = "Matches for #{request.params['q'].inspect}"
 
 .results{ "data-query" => request.params['q'] }
-  - results.each do |repo, search_results|
-    %h2= repo.name
-    %dl
-      - search_results.each do |res|
-        %dt
-          %a{:href => "/#{repo.index}/#{res.file}"}
-            = "/#{res.file}"
-        %dd
-          = res.context
+  -if results.empty?
+    %h2 No results
+  -else
+    - results.each do |repo, search_results|
+      %h2= repo.name
+      %dl
+        - search_results.each do |res|
+          %dt
+            %a{:href => "/#{repo.index}/#{res.file}"}
+              = "/#{res.file}"
+          %dd
+            = res.context
 
-%script{ :src => "/js/search.js", :type => "text/javascript", :charset => "utf-8" }
+%script{ :src => "/js/search.js", :type => "text/javascript", :charset => "utf-8" }

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Josh Hull