rubyception 0.1.1 → 0.2.0

data/app/assets/javascripts/rubyception/views/backtrace_lines/index.coffee

@@ -6,7 +6,6 @@ class App.Views.BacktraceLines.Index extends Backbone.View
     @name = @options.name
     @bind_render()
   render: =>
-    console.log @options
     @collection.collect 'tbody',
       args:
         name: @name

data/app/assets/javascripts/rubyception/views/entries/entry.coffee

@@ -1,11 +1,17 @@
 class App.Views.Entries.Entry extends Backbone.View
   className: 'entry'
   events:
+    'click .toggle_params': 'toggle_params'
     'click': 'select_and_toggle'
   initialize: ->
     @model.bind 'notice', @notice
     @model.bind 'ignore', @ignore
     @render()
+  toggle_params: (e) =>
+    params = @$ '.params'
+    params.toggleClass 'nested'
+    e.preventDefault()
+    e.stopPropagation()
   select_and_toggle: (event) =>
     target = $ event.target
     # Return unless we clicked directory on .details, or .heading, or a child of .heading
@@ -20,20 +26,33 @@ class App.Views.Entries.Entry extends Backbone.View
     @color_marker()
     @params()
     @backtrace()
+    @nested_params @model.get 'parsed_nested_params'
     @lines()
-  params:->
-    params = @model.get 'params'
-    html   = _.map params, (v,k)->
-      boolean = v is true or v is false
-      number  = !isNaN(parseFloat(v)) && isFinite(v)
-      kind    = if boolean then 'boolean'
-      else      if number  then 'number'
+    _.defer window.sh_highlightDocument
+  escape_html: (text) =>
+    text = text.replace /&/g, '&'
+    text = text.replace /</g, '&lt;'
+    text = text.replace />/g, '&gt;'
+    text
+  nested_params: (params)=>
+    inner_html = _.map params, (v,k) =>
+      name = k
+      if typeof v != 'string'
+        definition = @nested_params(v).html()
       else
-        v = "'#{v}'"
-        'string'
+        definition = "<span class='value string'>#{@escape_html v}</span>"
+      "<dt class='key'>#{@escape_html k}<span class='colon'>:</span></dt><dd>#{definition}</dt>"
+    html = "<dl>#{inner_html.join('')}</dl>"
+    $(@el).find('.params .nested').html html
 
-      "<span class='param'><span class='key'>#{k}</span><span class='colon'>:</span> <span class='value #{kind}'>#{v}</span></span>"
-    $(@el).find('.params').html html.join('')
+  params:->
+    if $.isEmptyObject @model.get('parsed_params')
+      @$('.params').hide()
+      return
+    params = @model.get 'parsed_params'
+    html   = _.map params, (v,k)=>
+      "<span class='param'><span class='key'>#{@escape_html k}</span><span class='colon'>:</span> <span class='value string'>#{@escape_html v}</span></span>"
+    $(@el).find('.params .basic').append html.join('')
   backtrace:->
     backtrace = @model.get 'backtrace'
     if backtrace

data/app/assets/stylesheets/rubyception/application.sass

@@ -2,5 +2,4 @@
 @import entries
 @import lines
 @import backtrace_lines
-@import shCore.css
-@import shThemeDefault.css
+@import syntax_highlighting

data/app/assets/stylesheets/rubyception/entries.sass

@@ -1,3 +1,5 @@
+body
+  :width 100%
 .entry
   :position relative
   :-webkit-box-shadow rgba(255, 255, 255, 0.07) 0px 1px 0
@@ -27,14 +29,33 @@
     :background rgb(250,50,0)
   .details
     :padding 0 10px
+    .method
+      :width 70px
+    .controller
+      :width 200px
+    .format
+      :width 50px
+    .datetime
+      :width 70px
+    .ms
+      :width 80px
     .method, .format
       :text-transform uppercase
-    .heading
+    .heading_wrapper
       :padding 10px 0 10px 0
-      div
-        :display inline-block
+    .heading
+      :overflow auto
+      :table-layout fixed
+      :border-collapse collapse
+      :width 100%
+      td
+        :padding-right 5px
+        :white-space nowrap
+        :overflow hidden
+        :text-overflow ellipsis
+      td:last-child
+        :padding-right 0
       .ms, .datetime
-        :float right
         :margin
           :left 10px
       .ms.slow
@@ -60,7 +81,7 @@
   :height 2px
   :margin 2px 0
 
-.params
+.params, .nested_params
   :padding 5px
     :top 0px
   :font-size 12px
@@ -92,3 +113,31 @@ body.pretty_params
           //:display table-cell
         //.key, .colon
           //:width 1%
+.params
+  .nested
+    :display none
+  a.toggle_params
+    :display block
+    :float left
+    :width 15px
+    :height 15px
+    :background image-url('rubyception/entry_collapse.png') no-repeat center center
+
+.params.nested
+  a.toggle_params
+    :background image-url('rubyception/entry_expand.png') no-repeat center center
+  .basic
+    :display none
+  .nested
+    :display block
+.nested
+  :clear both
+dt
+  :clear both
+  :margin-right 10px
+  :text-align right
+  :width 120px
+  :word-wrap break-word
+dt, dd
+  :float left
+

data/app/assets/stylesheets/rubyception/lines.sass

@@ -1,5 +1,6 @@
 .lines
-  :font-family 'Menlo'
+  tr, td, pre, div, span
+    :font-family monospace
   :margin
     :top 5px
   :background rgb(32, 32, 32)
@@ -13,24 +14,26 @@
       :vertical-align bottom
   .line
     :font-size 11px
+    .name, .duration, .msg, .layout
+      :white-space nowrap
+    .num,.msg
+      :padding 1px 5px
     .duration
       :text-align right
       :color rgb(50,250,100)
-    .num,.msg
-      :display inline-block
-      :padding 1px 5px
-    .msg
-      :padding
-        :left 1px
     .num
       :text-align right
       :background rgb(0,0,0)
     td:first-child
+      :background rgb(10,10,10)
       :padding
+        :right 5px
         :left 5px
     td:last-child
       :padding
         :right 5px
+    .max
+      :width 100%
   .line:first-child
     td
       :padding

data/app/assets/stylesheets/rubyception/syntax_highlighting.css

@@ -0,0 +1,138 @@
+pre.sh_sourceCode {
+  color: #ffffff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_keyword {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_type {
+  color: #00ff00;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_string {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_regexp {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_specialchar {
+  color: #ff22ff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_comment {
+  color: #0000ff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_number {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_preproc {
+  color: #ff22ff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_function {
+  color: #ffffff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_url {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_date {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_time {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_file {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_ip {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_name {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_variable {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_oldfile {
+  color: #ff22ff;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_newfile {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_difflines {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_selector {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_property {
+  color: #B26818;
+  font-weight: normal;
+  font-style: normal;
+}
+
+pre.sh_sourceCode .sh_value {
+  color: #ff0000;
+  font-weight: normal;
+  font-style: normal;
+}
+

data/app/controllers/rubyception/templates_controller.rb

@@ -0,0 +1,12 @@
+class Rubyception::TemplatesController < ApplicationController
+  layout false
+
+  helper :all
+
+  def index
+    @templates = {}
+    respond_to do |f|
+      f.js
+    end
+  end
+end

data/app/helpers/rubyception/application_helper.rb

@@ -5,5 +5,24 @@ module Rubyception
           class: 'show_rails',
         onclick: 'return false'
     end
+    def parse_tree tree, parents=[], result={}
+      if tree.is_a?(String)
+          item = result
+          parents.each do |parent|
+            item[parent] ||= {}
+            item = item[parent]
+          end
+          item[tree] = render(partial: "rubyception/#{parents.join('/')}/#{tree}")
+      elsif tree.is_a?(Hash)
+        tree.each do |key, val|
+          parse_tree val, parents + [key], result
+        end
+      elsif tree.is_a?(Array)
+        tree.each do |val|
+          parse_tree val, parents, result
+        end
+      end
+      result
+    end
   end
 end

data/app/models/rubyception/entry.rb

@@ -32,8 +32,41 @@ class Rubyception::Entry
 		params.delete 'controller'
 		params.delete 'action'
     self.params     = params
-    self.start_time = event.time.to_s :entry
-    self.end_time   = event.end.to_s  :entry
+    self.start_time = event.time.strftime('%H:%M:%S')
+    self.end_time   = event.end.strftime('%H:%M:%S')
+  end
+
+
+  def parsed_params
+    result = {}
+    jsonified = params.collect do |key,val|
+      [key, val.to_json]
+    end
+    Hash[jsonified]
+  end
+
+  def deep_clone_hash hash
+    result = {}
+    hash.each do |k,v|
+      if v.is_a? Hash
+        result[k] = deep_clone_hash v
+      else
+        result[k] = v
+      end
+    end
+    result
+  end
+
+  def parsed_nested_params params=nil
+    params ||= deep_clone_hash(self.params)
+    if params.kind_of? Hash
+      params.each do |key,val|
+        params[key] = parsed_nested_params(params[key])
+      end
+    else
+      return params.inspect
+    end
+    params
   end
 
   def error?; error; end
@@ -97,6 +130,8 @@ class Rubyception::Entry
                  backtrace
                  finished
                  start_time
+                 parsed_params
+                 parsed_nested_params
                  end_time}
     result = {}
     methods.each do |method|

data/app/views/layouts/rubyception/application.haml

@@ -3,6 +3,7 @@
   %head
     %title Rubyception
     = stylesheet_link_tag    'rubyception/application', :media => 'all'
+    = javascript_include_tag '/rubyception/templates'
     = javascript_include_tag 'rubyception/application'
     = csrf_meta_tags
   %body

data/app/views/rubyception/entries/_entry.haml

@@ -1,13 +1,20 @@
 .marker
 .details
-  .heading
-    .method   {{method}}
-    .format   {{format}}
-    = '{{controller}}#{{action}}'
-    .path     {{path}}
-    .datetime {{start_time}}
-    .ms       {{duration}}ms
+  .heading_wrapper
+    %table.heading
+      %tr
+        %td.method   {{method}}
+        %td.controller{title: '{{controller}}#{{action}}'}
+          = '{{controller}}#{{action}}'
+        %td.format   {{format}}
+        %td.path{title: '{{path}}'}     {{path}}
+        %td.datetime {{start_time}}
+        %td.ms       {{duration}}ms
   .params
+    %a.toggle_params{href: '#'}
+    .basic
+    %dl.nested
+  .clear
   .lines
   .backtrace_lines
 .clear