tailog 0.4.3 → 0.4.5

data/app/views/logs/index.erb

@@ -32,6 +32,17 @@
     </div>
 
     <script type="text/javascript">
+      String.prototype.hashCode = function(){
+        var hash = 0;
+        if (this.length == 0) return "0000000";
+        for (i = 0; i < this.length; i++) {
+          char = this.charCodeAt(i);
+          hash = ((hash<<5)-hash)+char;
+          hash = hash & hash; // Convert to 32bit integer
+        }
+        return ("0000000" + (hash >>> 0).toString(16)).substr(-8);
+      }
+
       var $settingsPanel = $("#settings-panel");
       $("#settings-toggle").click(function() {
         $settingsPanel.toggleClass("hidden");
@@ -49,18 +60,28 @@
       var $highlight = $("#highlight"),
           $highlightList = $("#highlight-list");
 
+      function highlightClassname(keyword) {
+        return 'highlight-' + keyword.hashCode();
+      }
+
       function rawHighlight(keyword) {
-        $content.highlight(keyword, { className: 'highlight highlight-' + keyword });
+        $content.highlight(keyword, { className: 'highlight ' + highlightClassname(keyword) });
       }
 
       function rawUnhighlight(keyword) {
-        $content.unhighlight({ className: 'highlight-' + keyword });
+        $content.unhighlight({ className: highlightClassname(keyword) });
       }
 
+      var highlightColors = ['#FFFF88', '#FF88FF', '#88FFFF', '#CCCCFF', '#CCFFCC', '#FFCCCC'];
       function highlight(keyword) {
-        if ($highlightList.find('.highlight-' + keyword).length > 0) return;
+        var color = highlightColors[$highlightList.find("span").length % highlightColors.length];
+        var classname = highlightClassname(keyword);
+
+        if ($highlightList.find('.' + classname).length > 0) return;
         rawHighlight(keyword);
-        $highlightList.append('<span class="label label-primary highlight-' + keyword + ' toggle-highlight">' + keyword + '</span>');
+        $highlightList.append('<div class="label label-primary ' + classname + '"><span>' + keyword + '</span><em>&bull;</em></div>');
+
+        $('body').append('<style>.highlight.' + classname + '{background-color:' + color + ';} .label.' + classname + '>em{color:' + color + ';}</style>');
       }
 
       $highlight.keypress(function(event) {
@@ -72,11 +93,12 @@
         highlight($highlight.val());
       });
 
-      $("#highlight-list").on("click", ".toggle-highlight", function(event) {
+      $("#highlight-list").on("click", ".label", function(event) {
         var $this = $(this),
-            keyword = $this.text();
-        $this.data('hidden') ? rawHighlight(keyword) : rawUnhighlight(keyword);
-        $this.data('hidden', !$this.data('hidden'));
+            keyword = $this.find('span').text();
+
+        $this.hasClass('highlight-hidden') ? rawHighlight(keyword) : rawUnhighlight(keyword);
+        $this.toggleClass('highlight-hidden');
       });
 
       window.fileSize = {};
@@ -101,9 +123,10 @@
               .append('<span class="text-info">' + data.server_hostname + ' - ' + data.file_size + '</span>')
               .append(ansi_up.ansi_to_html(data.content));
 
-            $highlightList.find("span").each(function(index, node) {
-              var $node = $(node);
-              $node.data('hidden') || rawHighlight($node.text());
+            $highlightList.find(".label").each(function(index, node) {
+              var $node = $(node),
+                  keyword = $node.find('span').text();
+              $node.hasClass('highlight-hidden') || rawHighlight(keyword);
             });
 
             if (shouldScrollToBottom) {

data/lib/tailog/eval.rb

@@ -16,11 +16,17 @@ module Tailog
       else
         before = env["HTTP_TAILOG_EVAL_BEFORE"].presence
         after = env["HTTP_TAILOG_EVAL_AFTER"].presence
+        inject = env["HTTP_TAILOG_INJECT"].presence
+        inject_options = env["HTTP_TAILOG_INJECT_OPTIONS"].present? ? JSON.parse(env["HTTP_TAILOG_INJECT_OPTIONS"]).symbolize_keys : Hash.new
 
         binding = Object.new.send(:binding)
-        binding.eval before if before
+        binding.eval(before) if before
+        Tailog.inject(inject.split(" "), inject_options) rescue nil if inject
+
         response = @app.call(env)
-        binding.eval after if after
+
+        Tailog.cleanup(inject.split(" ")) if inject
+        binding.eval(after) if after
 
         response
       end

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.4.3"
+  VERSION = "0.4.5"
 end

data/lib/tailog/watch_methods.rb

@@ -34,6 +34,7 @@ module Tailog
     }
 
     def inject targets, options = {}
+      WatchMethods.logger.debug "Inject #{targets} with options #{options}."
       options = Tailog::WatchMethods.inject_options.merge(options)
       targets.each do |target|
         begin
@@ -51,6 +52,7 @@ module Tailog
     end
 
     def cleanup targets
+      WatchMethods.logger.debug "Cleanup #{targets}."
       targets.each do |target|
         if target.include? "#"
           cleanup_instance_method target
@@ -71,6 +73,11 @@ module Tailog
     end
 
     def inject_constant target, options
+      unless const_defined? target
+        WatchMethods.logger.error "Inject #{target} FAILED: NameError: uninitialized constant #{target}."
+        return
+      end
+
       constant = target.constantize
       constant.instance_methods(false).each do |method|
         inject_instance_method "#{target}##{method}", options unless raw_method? method

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - bbtfr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -59,14 +59,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- app/assets/fonts/glyphicons-halflings-regular.eot
+- app/assets/fonts/glyphicons-halflings-regular.svg
+- app/assets/fonts/glyphicons-halflings-regular.ttf
+- app/assets/fonts/glyphicons-halflings-regular.woff
+- app/assets/fonts/glyphicons-halflings-regular.woff2
 - app/assets/javascripts/ansi_up.js
+- app/assets/javascripts/jquery.form.js
 - app/assets/javascripts/jquery.highlight.js
+- app/assets/javascripts/jquery.js
 - app/assets/stylesheets/application.css
+- app/assets/stylesheets/bootstrap.css
 - app/views/env.erb
 - app/views/error.erb
 - app/views/layout.erb
@@ -105,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: tail -f to the web-browser