peek-rblineprof 0.0.1 → 0.1.0

data/README.md

@@ -34,7 +34,7 @@ Or install it yourself as:
 Add the following to your `config/initializers/peek.rb`:
 
 ```ruby
-Peek.into Peek::Views::Rblineconf
+Peek.into Peek::Views::Rblineprof
 ```
 
 You'll then need to add the following CSS and CoffeeScript:
@@ -53,10 +53,31 @@ CoffeeScript:
 #= require peek/views/rblineprof
 ```
 
+## Integration with pygments.rb
+
+By default peek-rblineprof renders the code of each file in plain text with no
+syntax highlighting for performance reasons. If you'd like to have your code
+highlighted as it does on GitHub.com, just include the [pygments.rb](https://github.com/tmm1/pygments.rb) gem:
+
+```ruby
+gem 'pygments.rb', :require => false
+```
+
+peek-rblineprof will now highlight each file for you, but there's one more thing...
+
+To use the default theme that peek-rblineprof provides just add the following
+to your peek specific or application stylesheet:
+
+```scss
+//= require peek/views/rblineprof/pygments
+```
+
+That's it! Now your code will look :sparkles:
+
 ## Contributors
 
-- [@tmm1](https://github.com/tmm1) Wrote rblineprof
-- [@dewski](https://github.com/dewski) Wrote peek-rblineprof
+- [@tmm1](https://github.com/tmm1) wrote rblineprof
+- [@dewski](https://github.com/dewski) wrote peek-rblineprof
 
 ## Contributing
 

data/app/assets/stylesheets/peek/views/rblineprof.scss

@@ -5,7 +5,8 @@
   left: 50%;
   margin-left: -450px;
 
-  pre {
+  pre,
+  pre span {
     font: 12px/18px monospace;
   }
 }
@@ -53,7 +54,21 @@
     }
   }
 
+  .data {
+    overflow: hidden;
+  }
+
+  .code {
+    overflow-x: scroll;
+    border-left: 1px solid #ccc;
+  }
+
   pre {
     padding: 15px;
+
+    &.duration {
+      float: left;
+      width: 230px;
+    }
   }
 }

data/app/assets/stylesheets/peek/views/rblineprof/pygments.scss

@@ -0,0 +1,60 @@
+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

data/lib/peek-rblineprof/version.rb

@@ -1,5 +1,5 @@
 module Peek
   module Rblineprof
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

data/lib/peek/rblineprof/controller_helpers.rb

@@ -1,3 +1,9 @@
+begin
+  require 'pygments.rb'
+rescue LoadError
+  # Doesn't have pygments.rb installed
+end
+
 module Peek
   module Rblineprof
     module ControllerHelpers
@@ -9,13 +15,32 @@ module Peek
 
       protected
 
+      def pygmentize?
+        defined?(Pygments)
+      end
+
+      def pygmentize(file_name, code, lexer = nil)
+        if pygmentize? && lexer.present?
+          Pygments.highlight(code, :lexer => lexer_for_filename(file_name))
+        else
+          code
+        end
+      end
+
       def rblineprof_enabled?
         params[:lineprofiler].present?
       end
 
-      def inject_rblineprof
+      def lexer_for_filename(file_name)
+        case file_name
+        when /\.rb$/ then 'ruby'
+        when /\.erb$/ then 'erb'
+        end
+      end
+
+      def rblineprof_profiler_regex
         escaped_rails_root = Regexp.escape(Rails.root.to_s)
-        regex = case params[:lineprofiler]
+        case params[:lineprofiler]
         when 'app'
           %r{^#{escaped_rails_root}/(app|lib)}
         when 'views'
@@ -29,9 +54,11 @@ module Peek
         else
           %r{^#{escaped_rails_root}/(app|config|lib|vendor/plugin)}
         end
+      end
 
+      def inject_rblineprof
         ret = nil
-        profile = lineprof(regex) do
+        profile = lineprof(rblineprof_profiler_regex) do
           ret = yield
         end
 
@@ -41,12 +68,13 @@ module Peek
           min  = (params[:lineprofiler_min] || 5).to_i * 1000
           summary = params[:lineprofiler_summary]
 
+          # Sort each file by the longest calculated time
           per_file = profile.map do |file, lines|
             total, child, excl, total_cpu, child_cpu, excl_cpu = lines[0]
 
             wall = summary == 'exclusive' ? excl : total
             cpu  = summary == 'exclusive' ? excl_cpu : total_cpu
-            idle = summary == 'exclusive' ? (excl-excl_cpu) : (total-total_cpu)
+            idle = summary == 'exclusive' ? (excl - excl_cpu) : (total - total_cpu)
 
             [
               file, lines,
@@ -57,41 +85,43 @@ module Peek
 
           output = ''
           per_file.each do |file_name, lines, file_wall, file_cpu, file_idle, file_sort|
+
             output << "<div class='peek-rblineprof-file'><div class='heading'>"
 
             show_src = file_sort > min
             tmpl = show_src ? "<a href='#' class='js-lineprof-file'>%s</a>" : "%s"
 
             if mode == 'cpu'
-              output << sprintf("<span class='duration'>% 8.1fms + % 8.1fms</span> #{tmpl}\n", file_cpu / 1000.0, file_idle / 1000.0, file_name.sub(Rails.root.to_s + '/', ''))
+              output << sprintf("<span class='duration'>% 8.1fms + % 8.1fms</span> #{tmpl}", file_cpu / 1000.0, file_idle / 1000.0, file_name.sub(Rails.root.to_s + '/', ''))
             else
-              output << sprintf("<span class='duration'>% 8.1fms</span> #{tmpl}\n", file_wall/1000.0, file_name.sub(Rails.root.to_s + '/', ''))
+              output << sprintf("<span class='duration'>% 8.1fms</span> #{tmpl}", file_wall/1000.0, file_name.sub(Rails.root.to_s + '/', ''))
             end
 
-            output << "</div>"
+            output << "</div>" # .heading
 
             next unless show_src
 
-            output << "<pre style='overflow-x: scroll'>"
+            output << "<div class='data'>"
+            code = []
+            times = []
             File.readlines(file_name).each_with_index do |line, i|
+              code << line
               wall, cpu, calls = lines[i + 1]
 
               if calls && calls > 0
                 if mode == 'cpu'
                   idle = wall - cpu
-                  output << sprintf("% 8.1fms + % 8.1fms (% 5d) | %s", cpu / 1000.0, idle / 1000.0, calls, Rack::Utils.escape_html(line))
+                  times << sprintf("% 8.1fms + % 8.1fms (% 5d)", cpu / 1000.0, idle / 1000.0, calls)
                 else
-                  output << sprintf("% 8.1fms (% 5d) | %s", wall / 1000.0, calls, Rack::Utils.escape_html(line))
+                  times << sprintf("% 8.1fms (% 5d)", wall / 1000.0, calls)
                 end
               else
-                if mode == 'cpu'
-                  output << sprintf("                                | %s", Rack::Utils.escape_html(line))
-                else
-                  output << sprintf("                   | %s", Rack::Utils.escape_html(line))
-                end
+                times << ' '
               end
             end
-            output << "</pre></div>"
+            output << "<pre class='duration'>#{times.join("\n")}</pre>"
+            output << "<div class='code'>#{pygmentize(file_name, code.join, 'ruby')}</div>"
+            output << "</div></div>" # .data then .peek-rblineprof-file
           end
 
           response.body += "<div class='peek-rblineprof-modal' id='line-profile'>#{output}</div>".html_safe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peek-rblineprof
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,7 @@ files:
 - Rakefile
 - app/assets/javascripts/peek/views/rblineprof.coffee
 - app/assets/stylesheets/peek/views/rblineprof.scss
+- app/assets/stylesheets/peek/views/rblineprof/pygments.scss
 - app/views/peek/views/_rblineprof.html.erb
 - lib/peek-rblineprof.rb
 - lib/peek-rblineprof/railtie.rb