rack-mini-profiler 0.1.19 → 0.1.24

data/{lib → Ruby/lib}/html/includes.js

@@ -1,5 +1,6 @@
 "use strict";
-var MiniProfiler = (function ($) {
+var MiniProfiler = (function () {
+    var $;
 
     var options,
         container,
@@ -60,11 +61,10 @@ var MiniProfiler = (function ($) {
         }
     };
 
-    var getClientPerformance = function () {
+    var getClientPerformance = function() {
         return window.performance == null ? null : window.performance;
-    }
+    };
 
-    var waitedForEnd = 0;
     var fetchResults = function (ids) {
         var clientPerformance, clientProbes, i, j, p, id, idx;
 
@@ -364,6 +364,9 @@ var MiniProfiler = (function ($) {
                 popupHide(button, popup);
             }
         });
+        $(document).bind('keydown', options.toggleShortcut, function(e) {
+            $('.profiler-results').toggle();
+        });
     };
 
     var initFullView = function () {
@@ -432,6 +435,7 @@ var MiniProfiler = (function ($) {
                 // get master page profiler results
                 fetchResults(options.ids);
             });
+            if (options.startHidden) container.hide();
         }
         else {
             fetchResults(options.ids);
@@ -449,11 +453,12 @@ 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);
         }
 
-        if (jQuery(document).ajaxStart)
+        if (jQuery && jQuery(document).ajaxStart)
             jQuery(document).ajaxStart(function () { ajaxStartTime = new Date(); });
         
         // fetch results after ASP Ajax calls
@@ -506,20 +511,92 @@ var MiniProfiler = (function ($) {
             });
         }
 
+        if (typeof (MooTools) != 'undefined' && typeof (Request) != 'undefined') {
+          Request.prototype.addEvents({
+            onComplete: function() {
+              var stringIds = this.xhr.getResponseHeader('X-MiniProfiler-Ids');
+              if (stringIds) {
+                var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
+                fetchResults(ids);
+              }
+            }
+          });
+        }
+
+        // add support for AngularJS, which use the basic XMLHttpRequest object.
+        if (window.angular && typeof (XMLHttpRequest) != 'undefined') {
+          var _send = XMLHttpRequest.prototype.send;
+
+          XMLHttpRequest.prototype.send = function sendReplacement(data) {
+            this._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);
+                }
+              }
+
+              return this._onreadystatechange.apply(this, arguments);
+            }
+
+            return _send.apply(this, arguments);
+          }
+        }
+
         // some elements want to be hidden on certain doc events
         bindDocumentEvents();
     };
 
     return {
 
-        init: function (opt) {
-
-            options = opt || {};
+        init: function () {
+            var script = document.getElementById('mini-profiler');
+            if (!script || !script.getAttribute) return;
+
+            options = (function () {
+                var version = script.getAttribute('data-version');
+                var path = script.getAttribute('data-path');
+
+                var currentId = script.getAttribute('data-current-id');
+
+                var ids = script.getAttribute('data-ids');
+                if (ids)  ids = ids.split(',');
+
+                var position = script.getAttribute('data-position');
+
+                var toggleShortcut = script.getAttribute('data-toggle-shortcut');
+
+                if (script.getAttribute('data-max-traces'))
+                    var maxTraces = parseInt(script.getAttribute('data-max-traces'));
+
+                if (script.getAttribute('data-trivial') === 'true') var trivial = true;
+                if (script.getAttribute('data-children') == 'true') var children = true;
+                if (script.getAttribute('data-controls') == 'true') var controls = true;
+                if (script.getAttribute('data-authorized') == 'true') var authorized = true;
+                if (script.getAttribute('data-start-hidden') == 'true') var startHidden = true;
+
+                return {
+                    ids: ids,
+                    path: path,
+                    version: version,
+                    renderPosition: position,
+                    showTrivial: trivial,
+                    showChildrenTime: children,
+                    maxTracesToShow: maxTraces,
+                    showControls: controls,
+                    currentId: currentId,
+                    authorized: authorized,
+                    toggleShortcut: toggleShortcut,
+                    startHidden: startHidden
+                }
+            })();
 
             var doInit = function () {
                 // when rendering a shared, full page, this div will exist
                 container = $('.profiler-result-full');
-
                 if (container.length) {
                     if (window.location.href.indexOf("&trivial=1") > 0) {
                         options.showTrivial = true
@@ -546,24 +623,49 @@ var MiniProfiler = (function ($) {
                 document.getElementsByTagName('head')[0].appendChild(sc);
             };
 
-            if (options.authorized) {
-                var url = options.path + "includes.css?v=" + options.version;
-                if (document.createStyleSheet) {
-                    document.createStyleSheet(url);
+            var wait = 0;
+            var finish = false;
+            var deferInit = function() {
+                if (finish) return;
+                if (window.performance && window.performance.timing && window.performance.timing.loadEventEnd == 0 && wait < 10000) {
+                    setTimeout(deferInit, 100);
+                    wait += 100;
                 } else {
-                    $('head').append($('<link rel="stylesheet" type="text/css" href="' + url + '" />'));
+                    finish = true;
+                    init();
                 }
+            };
 
-                if (!$.tmpl) {
-                    load(options.path + 'jquery.tmpl.js?v=' + options.version, doInit);
+            var init = function() {
+                if (options.authorized) {
+                    var url = options.path + "includes.css?v=" + options.version;
+                    if (document.createStyleSheet) {
+                        document.createStyleSheet(url);
+                    } else {
+                        $('head').append($('<link rel="stylesheet" type="text/css" href="' + url + '" />'));
+                    }
+                    if (!$.tmpl) {
+                        load(options.path + 'jquery.tmpl.js?v=' + options.version, doInit);
+                    } else {
+                        doInit();
+                    }
                 } else {
                     doInit();
                 }
+            };
+
+            if (typeof(jQuery) == 'function') {
+                var jQueryVersion = jQuery.fn.jquery.split('.');
             }
-            else {
-                doInit();
+            if (jQueryVersion && parseInt(jQueryVersion[0]) < 2 && parseInt(jQueryVersion[1]) >= 7) {
+                MiniProfiler.jQuery = $ = jQuery;
+                $(deferInit);
+            } else {
+                load(options.path + "jquery.1.7.1.js?v=" + options.version, function() {
+                    MiniProfiler.jQuery = $ = jQuery.noConflict(true);
+                    $(deferInit);
+                });
             }
-
         },
 
         getClientTimingByName: function (clientTiming, name) {
@@ -650,7 +752,7 @@ var MiniProfiler = (function ($) {
             // start adding at the root and recurse down
             addToResults(root);
 
-            var removeDuration = function (list, duration) {
+            var removeDuration = function(list, duration) {
 
                 var newList = [];
                 for (var i = 0; i < list.length; i++) {
@@ -674,7 +776,7 @@ var MiniProfiler = (function ($) {
                 }
 
                 return newList;
-            }
+            };
 
             var processTimes = function (elem, parent) {
                 var duration = { start: elem.StartMilliseconds, finish: (elem.StartMilliseconds + elem.DurationMilliseconds) };
@@ -696,7 +798,7 @@ var MiniProfiler = (function ($) {
             // sort results by time
             result.sort(function (a, b) { return a.StartMilliseconds - b.StartMilliseconds; });
 
-            var determineOverlap = function (gap, node) {
+            var determineOverlap = function(gap, node) {
                 var overlap = 0;
                 for (var i = 0; i < node.richTiming.length; i++) {
                     var current = node.richTiming[i];
@@ -710,7 +812,7 @@ var MiniProfiler = (function ($) {
                     overlap += Math.min(gap.finish, current.finish) - Math.max(gap.start, current.start);
                 }
                 return overlap;
-            }
+            };
 
             var determineGap = function (gap, node, match) {
                 var overlap = determineOverlap(gap, node);
@@ -783,7 +885,16 @@ var MiniProfiler = (function ($) {
             return (duration || 0).toFixed(1);
         }
     };
-})(jQueryMP);
+})();
+
+MiniProfiler.init();
+
+// 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}})})(jQuery);
 
 // prettify.js
 // http://code.google.com/p/google-code-prettify/

data/{lib → Ruby/lib}/html/includes.less

@@ -49,7 +49,7 @@
 // styles shared between popup view and full view
 .profiler-result 
 {
- 
+
     .profiler-toggle-duration-with-children
     {
         float: right;
@@ -143,6 +143,9 @@
                         float:left;
                         margin-left:0px;
                     }
+                    &.profiler-custom-link {
+                        float:left;
+                    }
                 }
             }
         }
@@ -189,15 +192,15 @@
             text-align:right;
             margin-bottom:5px;
         }
-        
+
         .profiler-gap-info, .profiler-gap-info td { background-color: #ccc;}
         .profiler-gap-info  {
             .profiler-unit {color: #777;}
             .profiler-info {text-align: right}
             &.profiler-trivial-gaps {display: none}
-         }
-         
-         .profiler-trivial-gap-container { text-align: center;}
+        }
+
+        .profiler-trivial-gap-container { text-align: center;}
 
         // prettify colors
         .str{color:maroon}
@@ -287,24 +290,24 @@
         }
     }
 
-	.profiler-controls {
-		display: block;
-		font-size:12px;
-		font-family: @codeFonts;
-		cursor:default;
-		text-align: center;
-
-		span {
-			border-right: 1px solid @mutedColor;
-			padding-right: 5px;
-			margin-right: 5px;
-			cursor:pointer;
-		}
-
-		span:last-child {
-			border-right: none;
-		}		
-	}
+    .profiler-controls {
+        display: block;
+        font-size:12px;
+        font-family: @codeFonts;
+        cursor:default;
+        text-align: center;
+
+        span {
+            border-right: 1px solid @mutedColor;
+            padding-right: 5px;
+            margin-right: 5px;
+            cursor:pointer;
+        }
+
+        span:last-child {
+            border-right: none;
+        }
+    }
 
     .profiler-popup {
         display:none;
@@ -367,19 +370,19 @@
         }
     }
 
-	&.profiler-min .profiler-result {
-		display: none;
-	}
+    &.profiler-min .profiler-result {
+        display: none;
+    }
 
-	&.profiler-min .profiler-controls span {
-		display: none;
-	}
+    &.profiler-min .profiler-controls span {
+        display: none;
+    }
 
-	&.profiler-min .profiler-controls .profiler-min-max {
-		border-right: none;
-		padding: 0px;
-		margin: 0px;
-	}
+    &.profiler-min .profiler-controls .profiler-min-max {
+        border-right: none;
+        padding: 0px;
+        margin: 0px;
+    }
 }
 
 // popup results' queries will be displayed in front of this
@@ -465,4 +468,4 @@
             }
         }
     }
-}
+}

data/{lib → Ruby/lib}/html/includes.tmpl

@@ -27,10 +27,13 @@
             {{if HasSqlTimings}}
               <th colspan="2">query time (ms)</th>
             {{/if}}
+            {{each CustomTimingNames}}
+              <th colspan="2">${$value.toLowerCase()} (ms)</th>
+            {{/each}}
             </tr>
           </thead>
           <tbody>
-            {{tmpl(Root) "#timingTemplate"}}
+            {{tmpl({timing:Root, page:this.data}) "#timingTemplate"}}
           </tbody>
           <tfoot>
             <tr>
@@ -46,6 +49,12 @@
                 <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)}
+                <span class="profiler-unit">% in ${$value.toLowerCase()}</span>
+              </td>
+            {{/each}}
             </tr>
           </tfoot>
         </table>
@@ -114,6 +123,9 @@
 
 <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>
+  {{/if}}
   {{if HasTrivialTimings}}
   <a class="profiler-toggle-trivial" data-show-on-load="${HasAllTrivialTimings}" title="toggles any rows with &lt; ${TrivialDurationThresholdMilliseconds} ms">
     show trivial
@@ -123,37 +135,50 @@
 
 <script id="timingTemplate" type="text/x-jquery-tmpl">
 
-  <tr class="{{if IsTrivial }}profiler-trivial{{/if}}" data-timing-id="${Id}">
-    <td class="profiler-label" title="{{if Name && Name.length > 45 }}${Name}{{/if}}">
-      <span class="profiler-indent">${MiniProfiler.renderIndent(Depth)}</span> ${Name.slice(0,45)}{{if Name && Name.length > 45 }}...{{/if}}
+  <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}}
     </td>
     <td class="profiler-duration" title="duration of this step without any children's durations">
-      ${MiniProfiler.formatDuration(DurationWithoutChildrenMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.DurationWithoutChildrenMilliseconds)}
     </td>
     <td class="profiler-duration profiler-duration-with-children" title="duration of this step and its children">
-      ${MiniProfiler.formatDuration(DurationMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.DurationMilliseconds)}
     </td>
     <td class="profiler-duration time-from-start" title="time elapsed since profiling started">
-      <span class="profiler-unit">+</span>${MiniProfiler.formatDuration(StartMilliseconds)}
+      <span class="profiler-unit">+</span>${MiniProfiler.formatDuration(timing.StartMilliseconds)}
     </td>
 
-  {{if HasSqlTimings}}
-    <td class="profiler-duration {{if HasDuplicateSqlTimings}}profiler-warning{{/if}}" title="{{if HasDuplicateSqlTimings}}duplicate queries detected - {{/if}}{{if ExecutedReaders > 0 || ExecutedScalars > 0 || ExecutedNonQueries > 0}}${ExecutedReaders} reader, ${ExecutedScalars} scalar, ${ExecutedNonQueries} non-query statements executed{{/if}}">
+  {{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}}">
       <a class="profiler-queries-show">
-        {{if HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
-        ${SqlTimings.length} <span class="profiler-unit">sql</span>
+        {{if timing.HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
+        ${timing.SqlTimings.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(SqlTimingsDurationMilliseconds)}
+      ${MiniProfiler.formatDuration(timing.SqlTimingsDurationMilliseconds)}
     </td>
   {{/if}}
 
+  {{each page.CustomTimingNames}}
+    {{if timing.CustomTimings && timing.CustomTimings[$value]}}
+      <td class="profiler-duration" title="aggregate number of all ${$value.toLowerCase()} invocations in this step (excludes children)">
+        ${timing.CustomTimings[$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)}
+      </td>
+    {{else}}
+      <td colspan="2"></td>
+    {{/if}}
+  {{/each}}
+
   </tr>
 
-  {{if HasChildren}}
-    {{each Children}}
-      {{tmpl($value) "#timingTemplate"}}
+  {{if timing.HasChildren}}
+    {{each timing.Children}}
+      {{tmpl({timing: $value, page: page}) "#timingTemplate"}}
     {{/each}}
   {{/if}}