rack-mini-profiler 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3ee0b3863448cab4aa77a7d21a6660cd864fdd
-  data.tar.gz: 84d03ff97e66376542b2ad7862abcb1e5fee280b
+  metadata.gz: 915cfa4f71cab960c3f73128fa213cce013f0b65
+  data.tar.gz: 3465e843ef28ed50178f1f76255de96b474903f6
 SHA512:
-  metadata.gz: e31c6eacf0d6fa8b01f1c11ef4be1f16a86e1f08843ef79ff8051c5029b78460aa9c23802b1cdc1be8e1b4d19dc19e6644c621740bec0c8578aed6a04bb52ede
-  data.tar.gz: cf86b40baacdd86a5e90f641a4ec9e2367ddfef55c3f1810aeed774fd55950b86c428ab9df7eabcd08f09a1dc093b142f270ac3bad4ff7acba4a4b87e1d52826
+  metadata.gz: 7c232ba029fb050b15d6b4cdb08b9dc3a6079ed723c06beb7b99dcbc7b6d009822aa2686895661a8e57497a0c5e529a691bf7507c0a895639be9b0e0346ddf29
+  data.tar.gz: 45b90274fd6828441a1a4ca14017a6d3b1f1292b65c157dbd03964748b7fd648b39f06484b36d56fd0340b52498bd9c8b0242fe6063e6e23dd115d4b99c10040

data/README.md

@@ -1,6 +1,6 @@
 # rack-mini-profiler
 
-[![Code Climate](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler.png)](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler) [![Build Status](https://travis-ci.org/MiniProfiler/rack-mini-profiler.png)](https://travis-ci.org/MiniProfiler/rack-mini-profiler)
+[![Code Climate](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler/badges/gpa.svg)](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler) [![Build Status](https://travis-ci.org/MiniProfiler/rack-mini-profiler.svg)](https://travis-ci.org/MiniProfiler/rack-mini-profiler)
 
 Middleware that displays speed badge for every html page. Designed to work both in production and in development.
 
@@ -23,7 +23,7 @@ We have decided to restructure our repository so there is a central UI repo and
 
 - Setting up a build that reuses https://github.com/MiniProfiler/ui
 - Migrating the internal data structures [per the spec](https://github.com/MiniProfiler/ui)
-- Cleaning up the [horrendous class structure that is using strings as keys and crazy non-objects](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/lib/mini_profiler/sql_timer_struct.rb#L36-L44)
+- Cleaning up the [horrendous class structure that is using strings as keys and crazy non-objects](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/lib/mini_profiler/timer_struct/sql.rb#L36-L44)
 
 If you feel like taking on any of this start an issue and update us on your progress.
 
@@ -87,7 +87,7 @@ end
 
 To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler):
 
-* add the **flamegraph** gem to your Gemfile
+* add the [**flamegraph**](https://github.com/SamSaffron/flamegraph) gem to your Gemfile
 * visit a page in your app with `?pp=flamegraph`
 
 Flamegraph generation is supported in MRI 2.0 and 2.1 only.
@@ -112,6 +112,19 @@ Various aspects of rack-mini-profiler's behavior can be configured when your app
 For example in a Rails app, this should be done in an initializer:
 **config/initializers/mini_profiler.rb**
 
+### Caching behavior
+To fix some nasty bugs with rack-mini-profiler showing the wrong data, the middleware
+will remove headers relating to caching (Date & Etag on responses, If-Modified-Since & If-None-Match on requests).
+This probably won't ever break your application, but it can cause some unexpected behavior. For
+example, in a Rails app, calls to `stale?` will always return true.
+
+To disable this behavior, use the following config setting:
+
+```ruby
+# Do not let rack-mini-profiler disable caching
+Rack::MiniProfiler.config.disable_caching = false # defaults to true 
+```
+
 ### Storage
 
 rack-mini-profiler stores its results so they can be shared later and aren't lost at the end of the request.
@@ -167,6 +180,7 @@ The available configuration options are:
 
 * pre_authorize_cb - A lambda callback you can set to determine whether or not mini_profiler should be visible on a given request. Default in a Rails environment is only on in development mode. If in a Rack app, the default is always on.
 * position - Can either be 'right' or 'left'. Default is 'left'.
+* skip_paths - Specifies path list that can be skipped.
 * skip_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
 * auto_inject (default true) - when false the miniprofiler script is not injected in the page
 * backtrace_filter - a regex you can use to filter out unwanted lines from the backtraces

data/lib/html/includes.css

@@ -149,6 +149,21 @@
 .profiler-result .profiler-queries .profiler-stack-trace {
   margin-bottom: 15px;
 }
+.profiler-result .profiler-queries tbody tr {
+  border-bottom: 1px solid #f1f1f1;
+}
+.profiler-result .profiler-queries tr {
+  background-color: #FFF;
+}
+.profiler-result .profiler-queries tr.slow {
+  background-color: #FEE;
+}
+.profiler-result .profiler-queries tr.very-slow {
+  background-color: #FDD;
+}
+.profiler-result .profiler-queries tr.very-very-slow {
+  background-color: #FCC;
+}
 .profiler-result .profiler-queries pre {
   font-family: Consolas, monospace, serif;
   white-space: pre-wrap;
@@ -163,14 +178,10 @@
 .profiler-result .profiler-queries td {
   padding: 15px;
   text-align: left;
-  background-color: #fff;
 }
 .profiler-result .profiler-queries td:last-child {
   padding-right: 25px;
 }
-.profiler-result .profiler-queries .profiler-odd td {
-  background-color: #e5e5e5;
-}
 .profiler-result .profiler-queries .profiler-since-start,
 .profiler-result .profiler-queries .profiler-duration {
   text-align: right;

data/lib/html/includes.js

@@ -278,7 +278,7 @@ var MiniProfiler = (function () {
 
     var queriesScrollIntoView = function (link, queries, whatToScroll) {
         var id = link.closest('tr').attr('data-timing-id'),
-            cells = queries.find('tr[data-timing-id="' + id + '"] td');
+            cells = queries.find('tr[data-timing-id="' + id + '"]');
 
         // ensure they're in view
         whatToScroll.scrollTop(whatToScroll.scrollTop() + cells.first().position().top - 100);
@@ -326,13 +326,13 @@ var MiniProfiler = (function () {
         if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) return [parseInt(result[1] + result[1], 16), parseInt(result[2] + result[2], 16), parseInt(result[3] + result[3], 16)];
 
         // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-        if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) return colors['transparent'];
+        if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) return [0,0,0,0];
 
         return null;
     };
 
     var bindDocumentEvents = function () {
-        $(document).bind('click keyup', function (e) {
+        $(document).bind('click.mini-profiler keyup.mini-profiler', function (e) {
 
             // this happens on every keystroke, and :visible is crazy expensive in IE <9
             // and in this case, the display:none check is sufficient.
@@ -365,9 +365,19 @@ var MiniProfiler = (function () {
                 popupHide(button, popup);
             }
         });
-        $(document).bind('keydown', options.toggleShortcut, function(e) {
+        $(document).bind('keydown.mini-profiler', options.toggleShortcut, function(e) {
             $('.profiler-results').toggle();
         });
+
+        if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+            $(document).bind('page:change.mini-profiler', function() {
+               unbindDocumentEvents();
+            });
+        }
+    };
+
+    var unbindDocumentEvents = function() {
+        $(document).unbind('.mini-profiler');
     };
 
     var initFullView = function () {
@@ -456,11 +466,11 @@ var MiniProfiler = (function () {
         // fetch profile results for any ajax calls
         // note, this does not use $ cause we want to hook into the main jQuery
         if (jQuery && jQuery(document) && jQuery(document).ajaxComplete) {
-            jQuery(document).ajaxComplete(jQueryAjaxComplete);
+            jQuery(document).bind('ajaxComplete.mini-profiler', jQueryAjaxComplete);
         }
 
         if (jQuery && jQuery(document).ajaxStart)
-            jQuery(document).ajaxStart(function () { ajaxStartTime = new Date(); });
+            jQuery(document).bind('ajaxStart.mini-profiler', function () { ajaxStartTime = new Date(); });
 
         // fetch results after ASP Ajax calls
         if (typeof (Sys) != 'undefined' && typeof (Sys.WebForms) != 'undefined' && typeof (Sys.WebForms.PageRequestManager) != 'undefined') {
@@ -534,22 +544,27 @@ var MiniProfiler = (function () {
           var _send = XMLHttpRequest.prototype.send;
 
           XMLHttpRequest.prototype.send = function sendReplacement(data) {
-            this._onreadystatechange = this.onreadystatechange;
+            if (this.onreadystatechange) {
+              if (typeof (this.miniprofiler) == 'undefined' || typeof (this.miniprofiler.prev_onreadystatechange) == 'undefined') {
+                this.miniprofiler = { prev_onreadystatechange: this.onreadystatechange };
 
-            this.onreadystatechange = function onReadyStateChangeReplacement() {
-              if (this.readyState == 4) {
-                var stringIds = this.getResponseHeader('X-MiniProfiler-Ids');
-                if (stringIds) {
-                  var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                  fetchResults(ids);
-                }
-              }
+                this.onreadystatechange = function onReadyStateChangeReplacement() {
+                  if (this.readyState == 4) {
+                    var stringIds = this.getResponseHeader('X-MiniProfiler-Ids');
+                    if (stringIds) {
+                      var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
+                      fetchResults(ids);
+                    }
+                  }
 
-              return this._onreadystatechange.apply(this, arguments);
-            };
+                  if (this.miniprofiler.prev_onreadystatechange != null)
+                    return this.miniprofiler.prev_onreadystatechange.apply(this, arguments);
+                };
+              }
+            }
 
             return _send.apply(this, arguments);
-          };
+          }
         }
 
         // some elements want to be hidden on certain doc events
@@ -644,6 +659,16 @@ var MiniProfiler = (function () {
             };
 
             var init = function() {
+
+                // jquery.hotkeys.js
+                // https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
+
+                if (jQuery.hotkeys === undefined) {
+                    (function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
+                    !0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
+                    109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(MiniProfiler.jQuery);
+                }
+
                 if (options.authorized) {
                     var url = options.path + "includes.css?v=" + options.version;
                     if (document.createStyleSheet) {
@@ -660,13 +685,6 @@ var MiniProfiler = (function () {
                     doInit();
                 }
 
-                // jquery.hotkeys.js
-                // https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
-
-                (function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
-                !0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
-                109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(MiniProfiler.jQuery);
-
             };
 
             var major, minor;
@@ -688,11 +706,15 @@ var MiniProfiler = (function () {
             }
         },
 
+        cleanUp: function() {
+            unbindDocumentEvents();
+        },
+
         getClientTimingByName: function (clientTiming, name) {
 
-            for (var i = 0; i < clientTiming.Timings.length; i++) {
-                if (clientTiming.Timings[i].Name == name) {
-                    return clientTiming.Timings[i];
+            for (var i = 0; i < clientTiming.timings.length; i++) {
+                if (clientTiming.timings[i].name == name) {
+                    return clientTiming.timings[i];
                 }
             }
             return { Name: name, Duration: "", Start: "" };
@@ -730,10 +752,10 @@ var MiniProfiler = (function () {
             var list = [];
             var t;
 
-            if (!clientTimings.Timings) return [];
+            if (!clientTimings.timings) return [];
 
-            for (var i = 0; i < clientTimings.Timings.length; i++) {
-                t = clientTimings.Timings[i];
+            for (var i = 0; i < clientTimings.timings.length; i++) {
+                t = clientTimings.timings[i];
                 var trivial = t.Name != "Dom Complete" && t.Name != "Response" && t.Name != "First Paint Time";
                 trivial = t.Duration < 2 ? trivial : false;
                 list.push(
@@ -752,19 +774,32 @@ var MiniProfiler = (function () {
         getSqlTimings: function (root) {
             var result = [],
                 addToResults = function (timing) {
-                    if (timing.SqlTimings) {
-                        for (var i = 0, sqlTiming; i < timing.SqlTimings.length; i++) {
-                            sqlTiming = timing.SqlTimings[i];
+                    if (timing.sql_timings) {
+                        for (var i = 0, sqlTiming; i < timing.sql_timings.length; i++) {
+                            sqlTiming = timing.sql_timings[i];
 
                             // HACK: add info about the parent Timing to each SqlTiming so UI can render
-                            sqlTiming.ParentTimingName = timing.Name;
+                            sqlTiming.parent_timing_name = timing.name;
+
+                            if(sqlTiming.duration_milliseconds > 50) {
+                              sqlTiming.row_class = "slow";
+                            }
+
+                            if(sqlTiming.duration_milliseconds > 200) {
+                              sqlTiming.row_class = "very-slow";
+                            }
+
+                            if(sqlTiming.duration_milliseconds > 400) {
+                              sqlTiming.row_class = "very-very-slow";
+                            }
+
                             result.push(sqlTiming);
                         }
                     }
 
-                    if (timing.Children) {
-                        for (var i = 0; i < timing.Children.length; i++) {
-                            addToResults(timing.Children[i]);
+                    if (timing.children) {
+                        for (var i = 0; i < timing.children.length; i++) {
+                            addToResults(timing.children[i]);
                         }
                     }
                 };
@@ -799,16 +834,16 @@ var MiniProfiler = (function () {
             };
 
             var processTimes = function (elem, parent) {
-                var duration = { start: elem.StartMilliseconds, finish: (elem.StartMilliseconds + elem.DurationMilliseconds) };
+                var duration = { start: elem.start_milliseconds, finish: (elem.start_milliseconds + elem.duration_milliseconds) };
                 elem.richTiming = [duration];
                 if (parent != null) {
                     elem.parent = parent;
                     elem.parent.richTiming = removeDuration(elem.parent.richTiming, duration);
                 }
 
-                if (elem.Children) {
-                    for (var i = 0; i < elem.Children.length; i++) {
-                        processTimes(elem.Children[i], elem);
+                if (elem.children) {
+                    for (var i = 0; i < elem.children.length; i++) {
+                        processTimes(elem.children[i], elem);
                     }
                 }
             };
@@ -816,7 +851,7 @@ var MiniProfiler = (function () {
             processTimes(root, null);
 
             // sort results by time
-            result.sort(function (a, b) { return a.StartMilliseconds - b.StartMilliseconds; });
+            result.sort(function (a, b) { return a.start_milliseconds - b.start_milliseconds; });
 
             var determineOverlap = function(gap, node) {
                 var overlap = 0;
@@ -837,15 +872,15 @@ var MiniProfiler = (function () {
             var determineGap = function (gap, node, match) {
                 var overlap = determineOverlap(gap, node);
                 if (match == null || overlap > match.duration) {
-                    match = { name: node.Name, duration: overlap };
+                    match = { name: node.name, duration: overlap };
                 }
-                else if (match.name == node.Name) {
+                else if (match.name == node.name) {
                     match.duration += overlap;
                 }
 
-                if (node.Children) {
-                    for (var i = 0; i < node.Children.length; i++) {
-                        match = determineGap(gap, node.Children[i], match);
+                if (node.children) {
+                    for (var i = 0; i < node.children.length; i++) {
+                        match = determineGap(gap, node.children[i], match);
                     }
                 }
                 return match;
@@ -855,14 +890,14 @@ var MiniProfiler = (function () {
             var prev = null;
             $.each(result, function () {
                 this.prevGap = {
-                    duration: (this.StartMilliseconds - time).toFixed(2),
+                    duration: (this.start_milliseconds - time).toFixed(2),
                     start: time,
-                    finish: this.StartMilliseconds
+                    finish: this.start_milliseconds
                 };
 
                 this.prevGap.topReason = determineGap(this.prevGap, root, null);
 
-                time = this.StartMilliseconds + this.DurationMilliseconds;
+                time = this.start_milliseconds + this.duration_milliseconds;
                 prev = this;
             });
 
@@ -870,9 +905,9 @@ var MiniProfiler = (function () {
             if (result.length > 0) {
                 var me = result[result.length - 1];
                 me.nextGap = {
-                    duration: (root.DurationMilliseconds - time).toFixed(2),
+                    duration: (root.duration_milliseconds - time).toFixed(2),
                     start: time,
-                    finish: root.DurationMilliseconds
+                    finish: root.duration_milliseconds
                 };
                 me.nextGap.topReason = determineGap(me.nextGap, root, null);
             }
@@ -883,13 +918,13 @@ var MiniProfiler = (function () {
         getSqlTimingsCount: function (root) {
             var result = 0,
                 countSql = function (timing) {
-                    if (timing.SqlTimings) {
-                        result += timing.SqlTimings.length;
+                    if (timing.sql_timings) {
+                        result += timing.sql_timings.length;
                     }
 
-                    if (timing.Children) {
-                        for (var i = 0; i < timing.Children.length; i++) {
-                            countSql(timing.Children[i]);
+                    if (timing.children) {
+                        for (var i = 0; i < timing.children.length; i++) {
+                            countSql(timing.children[i]);
                         }
                     }
                 };

data/lib/html/includes.less

@@ -157,6 +157,27 @@
         .profiler-stack-trace {
             margin-bottom:15px;
         }
+
+        tbody tr {
+          border-bottom: 1px solid #f1f1f1;
+        }
+
+        tr {
+          background-color: #FFF;
+        }
+
+        tr.slow {
+          background-color: #FEE;
+        }
+
+        tr.very-slow {
+          background-color: #FDD;
+        }
+
+        tr.very-very-slow {
+          background-color: #FCC;
+        }
+
         pre {
             font-family:@codeFonts;
             white-space:pre-wrap;
@@ -173,17 +194,12 @@
         td {
             padding:15px;
             text-align:left;
-            background-color:#fff;
 
             &:last-child {
                 padding-right:25px; // compensate for scrollbars
             }
         }
 
-        .profiler-odd td {
-            background-color:#e5e5e5;
-        }
-
         .profiler-since-start, .profiler-duration {
             text-align:right;
         }

data/lib/html/includes.tmpl

@@ -2,19 +2,19 @@
 
   <div class="profiler-result">
 
-    <div class="profiler-button {{if HasDuplicateSqlTimings}}profiler-warning{{/if}}">
-    {{if HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
+    <div class="profiler-button {{if has_duplicate_sql_timings}}profiler-warning{{/if}}">
+    {{if has_duplicate_sql_timings}}<span class="profiler-nuclear">!</span>{{/if}}
       <span class="profiler-number">
-        ${MiniProfiler.formatDuration(DurationMilliseconds)} <span class="profiler-unit">ms</span>
+        ${MiniProfiler.formatDuration(duration_milliseconds)} <span class="profiler-unit">ms</span>
       </span>
     </div>
 
     <div class="profiler-popup">
       <div class="profiler-info">
         <span class="profiler-name">
-          ${Name} <span class="profiler-overall-duration">(${MiniProfiler.formatDuration(DurationMilliseconds)} ms)</span>
+          ${name} <span class="profiler-overall-duration">(${MiniProfiler.formatDuration(duration_milliseconds)} ms)</span>
         </span>
-        <span class="profiler-server-time">${MachineName} on ${MiniProfiler.renderDate(Started)}</span>
+        <span class="profiler-server-time">${machine_name} on ${MiniProfiler.renderDate(started)}</span>
       </div>
       <div class="profiler-output">
         <table class="profiler-timings">
@@ -24,41 +24,41 @@
               <th>duration (ms)</th>
               <th class="profiler-duration-with-children">with children (ms)</th>
               <th class="time-from-start">from start (ms)</th>
-            {{if HasSqlTimings}}
+            {{if has_sql_timings}}
               <th colspan="2">query time (ms)</th>
             {{/if}}
-            {{each CustomTimingNames}}
+            {{each custom_timing_names}}
               <th colspan="2">${$value.toLowerCase()} (ms)</th>
             {{/each}}
             </tr>
           </thead>
           <tbody>
-            {{tmpl({timing:Root, page:this.data}) "#timingTemplate"}}
+            {{tmpl({timing:root, page:this.data}) "#timingTemplate"}}
           </tbody>
           <tfoot>
             <tr>
               <td colspan="3">
-                {{if !ClientTimings}}
+                {{if !client_timings}}
                 {{tmpl "#linksTemplate"}}
                 {{/if}}
                 <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a>
               </td>
-            {{if HasSqlTimings}}
-              <td colspan="2" class="profiler-number profiler-percent-in-sql" title="${MiniProfiler.getSqlTimingsCount(Root)} queries spent ${MiniProfiler.formatDuration(DurationMillisecondsInSql)} ms of total request time">
-                ${MiniProfiler.formatDuration(DurationMillisecondsInSql / DurationMilliseconds * 100)}
+            {{if has_sql_timings}}
+              <td colspan="2" class="profiler-number profiler-percent-in-sql" title="${MiniProfiler.getSqlTimingsCount(root)} queries spent ${MiniProfiler.formatDuration(duration_milliseconds_in_sql)} ms of total request time">
+                ${MiniProfiler.formatDuration(duration_milliseconds_in_sql / duration_milliseconds * 100)}
                 <span class="profiler-unit">% in sql</span>
               </td>
             {{/if}}
-            {{each CustomTimingNames}}
-              <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="${CustomTimingStats[$value].Count} ${$value.toLowerCase()} invocations spent ${MiniProfiler.formatDuration(CustomTimingStats[$value].Duration)} ms of total request time">
-                ${MiniProfiler.formatDuration(CustomTimingStats[$value].Duration / DurationMilliseconds * 100)}
+            {{each custom_timing_names}}
+              <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="${custom_timing_stats[$value].count} ${$value.toLowerCase()} invocations spent ${MiniProfiler.formatDuration(custom_timing_stats[$value].duration)} ms of total request time">
+                ${MiniProfiler.formatDuration(custom_timing_stats[$value].duration / duration_milliseconds * 100)}
                 <span class="profiler-unit">% in ${$value.toLowerCase()}</span>
               </td>
             {{/each}}
             </tr>
           </tfoot>
         </table>
-        {{if ClientTimings}}
+        {{if client_timings}}
         <table class="profiler-timings profiler-client-timings">
           <thead>
             <tr>
@@ -68,7 +68,7 @@
             </tr>
           </thead>
           <tbody>
-            {{each MiniProfiler.getClientTimings(ClientTimings)}}
+            {{each MiniProfiler.getClientTimings(client_timings)}}
             <tr class="{{if $value.isTrivial }}profiler-trivial{{/if}}">
               <td class="profiler-label">${$value.name}</td>
               <td class="profiler-duration">
@@ -92,7 +92,7 @@
       </div>
     </div>
 
-  {{if HasSqlTimings}}
+  {{if has_sql_timings}}
     <div class="profiler-queries">
       <table>
       <thead>
@@ -102,7 +102,7 @@
         </tr>
       </thead>
       <tbody>
-        {{each(i, s) MiniProfiler.getSqlTimings(Root)}}
+        {{each(i, s) MiniProfiler.getSqlTimings(root)}}
           {{tmpl({ g:s.prevGap }) "#sqlGapTemplate"}}
           {{tmpl({ i:i, s:s }) "#sqlTimingTemplate"}}
           {{if s.nextGap}}
@@ -122,12 +122,12 @@
 </script>
 
 <script id="linksTemplate" type="text/x-jquery-tmpl">
-  <a href="${MiniProfiler.shareUrl(Id)}" class="profiler-share-profiler-results" target="_blank">share</a>
-  {{if CustomLink}}
-  <a href="${CustomLink}" class="profiler-custom-link" target="_blank">${CustomLinkName}</a>
+  <a href="${MiniProfiler.shareUrl(id)}" class="profiler-share-profiler-results" target="_blank">share</a>
+  {{if custom_link}}
+  <a href="${custom_link}" class="profiler-custom-link" target="_blank">${custom_link_name}</a>
   {{/if}}
-  {{if HasTrivialTimings}}
-  <a class="profiler-toggle-trivial" data-show-on-load="${HasAllTrivialTimings}" title="toggles any rows with &lt; ${TrivialDurationThresholdMilliseconds} ms">
+  {{if has_trivial_timings}}
+  <a class="profiler-toggle-trivial" data-show-on-load="${has_all_trivial_timings}" title="toggles any rows with &lt; ${trivial_duration_threshold_milliseconds} ms">
     show trivial
   </a>
   {{/if}}
@@ -135,41 +135,41 @@
 
 <script id="timingTemplate" type="text/x-jquery-tmpl">
 
-  <tr class="{{if timing.IsTrivial }}profiler-trivial{{/if}}" data-timing-id="${timing.Id}">
-    <td class="profiler-label" title="{{if timing.Name && timing.Name.length > 45 }}${timing.Name}{{/if}}">
-      <span class="profiler-indent">${MiniProfiler.renderIndent(timing.Depth)}</span> ${timing.Name.slice(0,45)}{{if timing.Name && timing.Name.length > 45 }}...{{/if}}
+  <tr class="{{if timing.is_trivial }}profiler-trivial{{/if}}" data-timing-id="${timing.id}">
+    <td class="profiler-label" title="{{if timing.name && timing.name.length > 45 }}${timing.name}{{/if}}">
+      <span class="profiler-indent">${MiniProfiler.renderIndent(timing.depth)}</span> ${timing.name.slice(0,45)}{{if timing.name && timing.name.length > 45 }}...{{/if}}
     </td>
     <td class="profiler-duration" title="duration of this step without any children's durations">
-      ${MiniProfiler.formatDuration(timing.DurationWithoutChildrenMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.duration_without_children_milliseconds)}
     </td>
     <td class="profiler-duration profiler-duration-with-children" title="duration of this step and its children">
-      ${MiniProfiler.formatDuration(timing.DurationMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.duration_milliseconds)}
     </td>
     <td class="profiler-duration time-from-start" title="time elapsed since profiling started">
-      <span class="profiler-unit">+</span>${MiniProfiler.formatDuration(timing.StartMilliseconds)}
+      <span class="profiler-unit">+</span>${MiniProfiler.formatDuration(timing.start_milliseconds)}
     </td>
 
-  {{if timing.HasSqlTimings}}
-    <td class="profiler-duration {{if timing.HasDuplicateSqlTimings}}profiler-warning{{/if}}" title="{{if timing.HasDuplicateSqlTimings}}duplicate queries detected - {{/if}}{{if timing.ExecutedReaders > 0 || timing.ExecutedScalars > 0 || timing.ExecutedNonQueries > 0}}${timing.ExecutedReaders} reader, ${timing.ExecutedScalars} scalar, ${timing.ExecutedNonQueries} non-query statements executed{{/if}}">
+  {{if timing.has_sql_timings}}
+    <td class="profiler-duration {{if timing.has_duplicate_sql_timings}}profiler-warning{{/if}}" title="{{if timing.has_duplicate_sql_timings}}duplicate queries detected - {{/if}}{{if timing.executed_readers > 0 || timing.executed_scalars > 0 || timing.executed_non_queries > 0}}${timing.executed_readers} reader, ${timing.executed_scalars} scalar, ${timing.executed_non_queries} non-query statements executed{{/if}}">
       <a class="profiler-queries-show">
-        {{if timing.HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
-        ${timing.SqlTimings.length} <span class="profiler-unit">sql</span>
+        {{if timing.has_duplicate_sql_timings}}<span class="profiler-nuclear">!</span>{{/if}}
+        ${timing.sql_timings.length} <span class="profiler-unit">sql</span>
       </a>
     </td>
     <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)">
-      ${MiniProfiler.formatDuration(timing.SqlTimingsDurationMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.sql_timings_duration_milliseconds)}
     </td>
   {{else}}
     <td colspan="2"></td>
   {{/if}}
 
-  {{each page.CustomTimingNames}}
-    {{if timing.CustomTimings && timing.CustomTimings[$value]}}
+  {{each page.custom_timing_names}}
+    {{if timing.custom_timings && timing.custom_timings[$value]}}
       <td class="profiler-duration" title="aggregate number of all ${$value.toLowerCase()} invocations in this step (excludes children)">
-        ${timing.CustomTimings[$value].length} ${$value.toLowerCase()}
+        ${timing.custom_timings[$value].length} ${$value.toLowerCase()}
       </td>
       <td class="profiler-duration" title="aggregate duration of all ${$value.toLowerCase()} invocations in this step (excludes children)">
-        ${MiniProfiler.formatDuration(timing.CustomTimingStats[$value].Duration)}
+        ${MiniProfiler.formatDuration(timing.custom_timing_stats[$value].duration)}
       </td>
     {{else}}
       <td colspan="2"></td>
@@ -178,8 +178,8 @@
 
   </tr>
 
-  {{if timing.HasChildren}}
-    {{each timing.Children}}
+  {{if timing.has_children}}
+    {{each timing.children}}
       {{tmpl({timing: $value, page: page}) "#timingTemplate"}}
     {{/each}}
   {{/if}}
@@ -188,20 +188,20 @@
 
 <script id="sqlTimingTemplate" type="text/x-jquery-tmpl">
 
-  <tr class="{{if i % 2 == 1}}profiler-odd{{/if}}" data-timing-id="${s.ParentTimingId}">
+  <tr class="${s.row_class}" data-timing-id="${s.parent_timing_id}">
     <td class="profiler-info">
-      <div>${s.ParentTimingName}</div>
-      <div class="profiler-number"><span class="profiler-unit">T+</span>${MiniProfiler.formatDuration(s.StartMilliseconds)} <span class="profiler-unit">ms</span></div>
+      <div>${s.parent_timing_name}</div>
+      <div class="profiler-number"><span class="profiler-unit">T+</span>${MiniProfiler.formatDuration(s.start_milliseconds)} <span class="profiler-unit">ms</span></div>
       <div>
-        {{if s.IsDuplicate}}<span class="profiler-warning">DUPLICATE</span>{{/if}}
-        ${MiniProfiler.renderExecuteType(s.ExecuteType)}
+        {{if s.is_duplicate}}<span class="profiler-warning">DUPLICATE</span>{{/if}}
+        ${MiniProfiler.renderExecuteType(s.execute_type)}
       </div>
-      <div title="{{if s.ExecuteType == 3}}first result fetched: ${s.FirstFetchDurationMilliseconds}ms{{/if}}">${MiniProfiler.formatDuration(s.DurationMilliseconds)} <span class="profiler-unit">ms</span></div>
+      <div title="{{if s.execute_type == 3}}first result fetched: ${s.first_fetch_duration_milliseconds}ms{{/if}}">${MiniProfiler.formatDuration(s.duration_milliseconds)} <span class="profiler-unit">ms</span></div>
     </td>
     <td>
       <div class="query">
-        <pre class="profiler-stack-trace">${s.StackTraceSnippet}</pre>
-        <pre class="prettyprint lang-sql"><code>${s.FormattedCommandString}   </code></pre>
+        <pre class="profiler-stack-trace">${s.stack_trace_snippet}</pre>
+        <pre class="prettyprint lang-sql"><code>${s.formatted_command_string}   </code></pre>
       </div>
     </td>
   </tr>