rack-mini-profiler 0.1.4 → 0.1.9

data/CHANGELOG

@@ -24,3 +24,17 @@
 	* Added some more client probing built in to rails
 	* More tests
 
+18-July-2012 - Sam 
+  
+  * Added First Paint time for chrome
+  * Bug fix to ensure non Rails installs have mini profiler
+  * Version 0.1.7
+
+30-July-2012 - Sam 
+  
+  * Made compliant with ancient versions of Rack (including Rack used by Rails2)
+  * Fixed broken share link 
+  * Fixed crashes on startup (in MemoryStore and FileStore)
+  * Version 0.1.8
+  * Unicode fix 
+  * Version 0.1.9

data/README.md

@@ -47,6 +47,24 @@ class MyApp < Sinatra::Base
 end
 ```
 
+## Storage
+
+By default, rack-mini-profiler stores its results in a memory store: 
+
+```ruby 
+# our default
+Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
+```
+
+There are 2 other available storage engines, `RedisStore` and `FileStore`. 
+
+MemoryStore is stores results in a processes heap - something that does not work well in a multi process environment. 
+FileStore stores results in the file system - something that may not work well in a multi machine environment. 
+
+Additionally you may implement an AbstractStore for your own provider. 
+
+Rails hooks up a FileStore for all environments. 
+
 ## Running the Specs
 
 ```
@@ -67,11 +85,18 @@ Rack::MiniProfiler.config.position = 'right'
 
 In a Rails app, this can be done conveniently in an initializer such as config/initializers/mini_profiler.rb.
 
+## Rails 2.X support
+
+MiniProfiler uses [railtie](https://github.com/SamSaffron/MiniProfiler/blob/master/Ruby/lib/mini_profiler_rails/railtie.rb) to bootstrap itself. This will not be called in a Rails 2 app. You are going to need to hook it up manually. (TODO: document this - pull request please)
+
 ## Available Options
 
 * 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_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
+* use_existing_jquery - Use the version of jQuery on the page as opposed to the self contained one
+* 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
 
 ## Special query strings 
 

data/lib/html/includes.css

@@ -1 +1,75 @@
-.profiler-result,.profiler-queries{color:#555;line-height:1;font-size:12px;}.profiler-result pre,.profiler-queries pre,.profiler-result code,.profiler-queries code,.profiler-result label,.profiler-queries label,.profiler-result table,.profiler-queries table,.profiler-result tbody,.profiler-queries tbody,.profiler-result thead,.profiler-queries thead,.profiler-result tfoot,.profiler-queries tfoot,.profiler-result tr,.profiler-queries tr,.profiler-result th,.profiler-queries th,.profiler-result td,.profiler-queries td{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;background-color:transparent;overflow:visible;max-height:none;}.profiler-result table,.profiler-queries table{border-collapse:collapse;border-spacing:0;}.profiler-result a,.profiler-queries a,.profiler-result a:hover,.profiler-queries a:hover{cursor:pointer;color:#07c;}.profiler-result a,.profiler-queries a{text-decoration:none;}.profiler-result a:hover,.profiler-queries a:hover{text-decoration:underline;}.profiler-result{font-family:Helvetica,Arial,sans-serif;}.profiler-result .profiler-toggle-duration-with-children{float:right;}.profiler-result table.profiler-client-timings{margin-top:10px;}.profiler-result .profiler-label{color:#555;overflow:hidden;text-overflow:ellipsis;}.profiler-result .profiler-unit{color:#aaa;}.profiler-result .profiler-trivial{display:none;}.profiler-result .profiler-trivial td,.profiler-result .profiler-trivial td *{color:#aaa !important;}.profiler-result pre,.profiler-result code,.profiler-result .profiler-number,.profiler-result .profiler-unit{font-family:Consolas,monospace,serif;}.profiler-result .profiler-number{color:#111;}.profiler-result .profiler-info{text-align:right;}.profiler-result .profiler-info .profiler-name{float:left;}.profiler-result .profiler-info .profiler-server-time{white-space:nowrap;}.profiler-result .profiler-timings th{background-color:#fff;color:#aaa;text-align:right;}.profiler-result .profiler-timings th,.profiler-result .profiler-timings td{white-space:nowrap;}.profiler-result .profiler-timings .profiler-duration-with-children{display:none;}.profiler-result .profiler-timings .profiler-duration{font-family:Consolas,monospace,serif;color:#111;text-align:right;}.profiler-result .profiler-timings .profiler-indent{letter-spacing:4px;}.profiler-result .profiler-timings .profiler-queries-show .profiler-number,.profiler-result .profiler-timings .profiler-queries-show .profiler-unit{color:#07c;}.profiler-result .profiler-timings .profiler-queries-duration{padding-left:6px;}.profiler-result .profiler-timings .profiler-percent-in-sql{white-space:nowrap;text-align:right;}.profiler-result .profiler-timings tfoot td{padding-top:10px;text-align:right;}.profiler-result .profiler-timings tfoot td a{font-size:95%;display:inline-block;margin-left:12px;}.profiler-result .profiler-timings tfoot td a:first-child{float:left;margin-left:0px;}.profiler-result .profiler-queries{font-family:Helvetica,Arial,sans-serif;}.profiler-result .profiler-queries .profiler-stack-trace{margin-bottom:15px;}.profiler-result .profiler-queries pre{font-family:Consolas,monospace,serif;white-space:pre-wrap;}.profiler-result .profiler-queries th{background-color:#fff;border-bottom:1px solid #555;font-weight:bold;padding:15px;white-space:nowrap;}.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;}.profiler-result .profiler-queries .profiler-info div{text-align:right;margin-bottom:5px;}.profiler-result .profiler-queries .profiler-gap-info,.profiler-result .profiler-queries .profiler-gap-info td{background-color:#ccc;}.profiler-result .profiler-queries .profiler-gap-info .profiler-unit{color:#777;}.profiler-result .profiler-queries .profiler-gap-info .profiler-info{text-align:right;}.profiler-result .profiler-queries .profiler-gap-info.profiler-trivial-gaps{display:none;}.profiler-result .profiler-queries .profiler-trivial-gap-container{text-align:center;}.profiler-result .profiler-queries .str{color:maroon;}.profiler-result .profiler-queries .kwd{color:#00008b;}.profiler-result .profiler-queries .com{color:gray;}.profiler-result .profiler-queries .typ{color:#2b91af;}.profiler-result .profiler-queries .lit{color:maroon;}.profiler-result .profiler-queries .pun{color:#000;}.profiler-result .profiler-queries .pln{color:#000;}.profiler-result .profiler-queries .tag{color:maroon;}.profiler-result .profiler-queries .atn{color:red;}.profiler-result .profiler-queries .atv{color:blue;}.profiler-result .profiler-queries .dec{color:purple;}.profiler-result .profiler-warning,.profiler-result .profiler-warning *,.profiler-result .profiler-warning .profiler-queries-show,.profiler-result .profiler-warning .profiler-queries-show .profiler-unit{color:#f00;}.profiler-result .profiler-warning:hover,.profiler-result .profiler-warning *:hover,.profiler-result .profiler-warning .profiler-queries-show:hover,.profiler-result .profiler-warning .profiler-queries-show .profiler-unit:hover{color:#f00;}.profiler-result .profiler-nuclear{color:#f00;font-weight:bold;padding-right:2px;}.profiler-result .profiler-nuclear:hover{color:#f00;}.profiler-results{z-index:2147483643;position:fixed;top:0px;}.profiler-results.profiler-left{left:0px;}.profiler-results.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,.profiler-results.profiler-left .profiler-controls{-webkit-border-bottom-right-radius:10px;-moz-border-radius-bottomright:10px;border-bottom-right-radius:10px;}.profiler-results.profiler-left .profiler-button,.profiler-results.profiler-left .profiler-controls{border-right:1px solid #888;}.profiler-results.profiler-right{right:0px;}.profiler-results.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,.profiler-results.profiler-right .profiler-controls{-webkit-border-bottom-left-radius:10px;-moz-border-radius-bottomleft:10px;border-bottom-left-radius:10px;}.profiler-results.profiler-right .profiler-button,.profiler-results.profiler-right .profiler-controls{border-left:1px solid #888;}.profiler-results .profiler-button,.profiler-results .profiler-controls{display:none;z-index:2147483640;border-bottom:1px solid #888;background-color:#fff;padding:4px 7px;text-align:right;cursor:pointer;}.profiler-results .profiler-button.profiler-button-active,.profiler-results .profiler-controls.profiler-button-active{background-color:maroon;}.profiler-results .profiler-button.profiler-button-active .profiler-number,.profiler-results .profiler-controls.profiler-button-active .profiler-number,.profiler-results .profiler-button.profiler-button-active .profiler-nuclear,.profiler-results .profiler-controls.profiler-button-active .profiler-nuclear{color:#fff;font-weight:bold;}.profiler-results .profiler-button.profiler-button-active .profiler-unit,.profiler-results .profiler-controls.profiler-button-active .profiler-unit{color:#fff;font-weight:normal;}.profiler-results .profiler-controls{display:block;font-size:12px;font-family:Consolas,monospace,serif;cursor:default;text-align:center;}.profiler-results .profiler-controls span{border-right:1px solid #aaa;padding-right:5px;margin-right:5px;cursor:pointer;}.profiler-results .profiler-controls span:last-child{border-right:none;}.profiler-results .profiler-popup{display:none;z-index:2147483641;position:absolute;background-color:#fff;border:1px solid #aaa;padding:5px 10px;text-align:left;line-height:18px;overflow:auto;-moz-box-shadow:0px 1px 15px #555;-webkit-box-shadow:0px 1px 15px #555;box-shadow:0px 1px 15px #555;}.profiler-results .profiler-popup .profiler-info{margin-bottom:3px;padding-bottom:2px;border-bottom:1px solid #ddd;}.profiler-results .profiler-popup .profiler-info .profiler-name{font-size:110%;font-weight:bold;}.profiler-results .profiler-popup .profiler-info .profiler-name .profiler-overall-duration{display:none;}.profiler-results .profiler-popup .profiler-info .profiler-server-time{font-size:95%;}.profiler-results .profiler-popup .profiler-timings th,.profiler-results .profiler-popup .profiler-timings td{padding-left:6px;padding-right:6px;}.profiler-results .profiler-popup .profiler-timings th{font-size:95%;padding-bottom:3px;}.profiler-results .profiler-popup .profiler-timings .profiler-label{max-width:275px;}.profiler-results .profiler-queries{display:none;z-index:2147483643;position:absolute;overflow-y:auto;overflow-x:hidden;background-color:#fff;}.profiler-results .profiler-queries th{font-size:17px;}.profiler-results.profiler-min .profiler-result{display:none;}.profiler-results.profiler-min .profiler-controls span{display:none;}.profiler-results.profiler-min .profiler-controls .profiler-min-max{border-right:none;padding:0px;margin:0px;}.profiler-queries-bg{z-index:2147483642;display:none;background:#000;opacity:0.7;position:absolute;top:0px;left:0px;min-width:100%;}.profiler-result-full .profiler-result{width:950px;margin:30px auto;}.profiler-result-full .profiler-result .profiler-button{display:none;}.profiler-result-full .profiler-result .profiler-popup .profiler-info{font-size:25px;border-bottom:1px solid #aaa;padding-bottom:3px;margin-bottom:25px;}.profiler-result-full .profiler-result .profiler-popup .profiler-info .profiler-overall-duration{padding-right:20px;font-size:80%;color:#888;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings td,.profiler-result-full .profiler-result .profiler-popup .profiler-timings th{padding-left:8px;padding-right:8px;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings th{padding-bottom:7px;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings td{font-size:14px;padding-bottom:4px;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings td:first-child{padding-left:10px;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings .profiler-label{max-width:550px;}.profiler-result-full .profiler-result .profiler-queries{margin:25px 0;}.profiler-result-full .profiler-result .profiler-queries table{width:100%;}.profiler-result-full .profiler-result .profiler-queries th{font-size:16px;color:#555;line-height:20px;}.profiler-result-full .profiler-result .profiler-queries td{padding:15px 10px;text-align:left;}.profiler-result-full .profiler-result .profiler-queries .profiler-info div{text-align:right;margin-bottom:5px;}
+.profiler-result,.profiler-queries{color:#555;line-height:1;font-size:12px;}.profiler-result pre,.profiler-queries pre,.profiler-result code,.profiler-queries code,.profiler-result label,.profiler-queries label,.profiler-result table,.profiler-queries table,.profiler-result tbody,.profiler-queries tbody,.profiler-result thead,.profiler-queries thead,.profiler-result tfoot,.profiler-queries tfoot,.profiler-result tr,.profiler-queries tr,.profiler-result th,.profiler-queries th,.profiler-result td,.profiler-queries td{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;background-color:transparent;overflow:visible;max-height:none;}
+.profiler-result table,.profiler-queries table{border-collapse:collapse;border-spacing:0;}
+.profiler-result a,.profiler-queries a,.profiler-result a:hover,.profiler-queries a:hover{cursor:pointer;color:#0077cc;}
+.profiler-result a,.profiler-queries a{text-decoration:none;}.profiler-result a:hover,.profiler-queries a:hover{text-decoration:underline;}
+.profiler-result{font-family:Helvetica,Arial,sans-serif;}.profiler-result .profiler-toggle-duration-with-children{float:right;}
+.profiler-result table.profiler-client-timings{margin-top:10px;}
+.profiler-result .profiler-label{color:#555555;overflow:hidden;text-overflow:ellipsis;}
+.profiler-result .profiler-unit{color:#aaaaaa;}
+.profiler-result .profiler-trivial{display:none;}.profiler-result .profiler-trivial td,.profiler-result .profiler-trivial td *{color:#aaaaaa !important;}
+.profiler-result pre,.profiler-result code,.profiler-result .profiler-number,.profiler-result .profiler-unit{font-family:Consolas,monospace,serif;}
+.profiler-result .profiler-number{color:#111111;}
+.profiler-result .profiler-info{text-align:right;}.profiler-result .profiler-info .profiler-name{float:left;}
+.profiler-result .profiler-info .profiler-server-time{white-space:nowrap;}
+.profiler-result .profiler-timings th{background-color:#fff;color:#aaaaaa;text-align:right;}
+.profiler-result .profiler-timings th,.profiler-result .profiler-timings td{white-space:nowrap;}
+.profiler-result .profiler-timings .profiler-duration-with-children{display:none;}
+.profiler-result .profiler-timings .profiler-duration{font-family:Consolas,monospace,serif;color:#111111;text-align:right;}
+.profiler-result .profiler-timings .profiler-indent{letter-spacing:4px;}
+.profiler-result .profiler-timings .profiler-queries-show .profiler-number,.profiler-result .profiler-timings .profiler-queries-show .profiler-unit{color:#0077cc;}
+.profiler-result .profiler-timings .profiler-queries-duration{padding-left:6px;}
+.profiler-result .profiler-timings .profiler-percent-in-sql{white-space:nowrap;text-align:right;}
+.profiler-result .profiler-timings tfoot td{padding-top:10px;text-align:right;}.profiler-result .profiler-timings tfoot td a{font-size:95%;display:inline-block;margin-left:12px;}.profiler-result .profiler-timings tfoot td a:first-child{float:left;margin-left:0px;}
+.profiler-result .profiler-queries{font-family:Helvetica,Arial,sans-serif;}.profiler-result .profiler-queries .profiler-stack-trace{margin-bottom:15px;}
+.profiler-result .profiler-queries pre{font-family:Consolas,monospace,serif;white-space:pre-wrap;}
+.profiler-result .profiler-queries th{background-color:#fff;border-bottom:1px solid #555;font-weight:bold;padding:15px;white-space:nowrap;}
+.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;}
+.profiler-result .profiler-queries .profiler-info div{text-align:right;margin-bottom:5px;}
+.profiler-result .profiler-queries .profiler-gap-info,.profiler-result .profiler-queries .profiler-gap-info td{background-color:#ccc;}
+.profiler-result .profiler-queries .profiler-gap-info .profiler-unit{color:#777;}
+.profiler-result .profiler-queries .profiler-gap-info .profiler-info{text-align:right;}
+.profiler-result .profiler-queries .profiler-gap-info.profiler-trivial-gaps{display:none;}
+.profiler-result .profiler-queries .profiler-trivial-gap-container{text-align:center;}
+.profiler-result .profiler-queries .str{color:#800000;}
+.profiler-result .profiler-queries .kwd{color:#00008b;}
+.profiler-result .profiler-queries .com{color:#808080;}
+.profiler-result .profiler-queries .typ{color:#2b91af;}
+.profiler-result .profiler-queries .lit{color:#800000;}
+.profiler-result .profiler-queries .pun{color:#000000;}
+.profiler-result .profiler-queries .pln{color:#000000;}
+.profiler-result .profiler-queries .tag{color:#800000;}
+.profiler-result .profiler-queries .atn{color:#ff0000;}
+.profiler-result .profiler-queries .atv{color:#0000ff;}
+.profiler-result .profiler-queries .dec{color:#800080;}
+.profiler-result .profiler-warning,.profiler-result .profiler-warning *,.profiler-result .profiler-warning .profiler-queries-show,.profiler-result .profiler-warning .profiler-queries-show .profiler-unit{color:#f00;}.profiler-result .profiler-warning:hover,.profiler-result .profiler-warning *:hover,.profiler-result .profiler-warning .profiler-queries-show:hover,.profiler-result .profiler-warning .profiler-queries-show .profiler-unit:hover{color:#f00;}
+.profiler-result .profiler-nuclear{color:#f00;font-weight:bold;padding-right:2px;}.profiler-result .profiler-nuclear:hover{color:#f00;}
+.profiler-results{z-index:2147483643;position:fixed;top:0px;}.profiler-results.profiler-left{left:0px;}.profiler-results.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,.profiler-results.profiler-left .profiler-controls{-webkit-border-bottom-right-radius:10px;-moz-border-radius-bottomright:10px;border-bottom-right-radius:10px;}
+.profiler-results.profiler-left .profiler-button,.profiler-results.profiler-left .profiler-controls{border-right:1px solid #888888;}
+.profiler-results.profiler-right{right:0px;}.profiler-results.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,.profiler-results.profiler-right .profiler-controls{-webkit-border-bottom-left-radius:10px;-moz-border-radius-bottomleft:10px;border-bottom-left-radius:10px;}
+.profiler-results.profiler-right .profiler-button,.profiler-results.profiler-right .profiler-controls{border-left:1px solid #888888;}
+.profiler-results .profiler-button,.profiler-results .profiler-controls{display:none;z-index:2147483640;border-bottom:1px solid #888888;background-color:#fff;padding:4px 7px;text-align:right;cursor:pointer;}.profiler-results .profiler-button.profiler-button-active,.profiler-results .profiler-controls.profiler-button-active{background-color:maroon;}.profiler-results .profiler-button.profiler-button-active .profiler-number,.profiler-results .profiler-controls.profiler-button-active .profiler-number,.profiler-results .profiler-button.profiler-button-active .profiler-nuclear,.profiler-results .profiler-controls.profiler-button-active .profiler-nuclear{color:#fff;font-weight:bold;}
+.profiler-results .profiler-button.profiler-button-active .profiler-unit,.profiler-results .profiler-controls.profiler-button-active .profiler-unit{color:#fff;font-weight:normal;}
+.profiler-results .profiler-controls{display:block;font-size:12px;font-family:Consolas,monospace,serif;cursor:default;text-align:center;}.profiler-results .profiler-controls span{border-right:1px solid #aaaaaa;padding-right:5px;margin-right:5px;cursor:pointer;}
+.profiler-results .profiler-controls span:last-child{border-right:none;}
+.profiler-results .profiler-popup{display:none;z-index:2147483641;position:absolute;background-color:#fff;border:1px solid #aaa;padding:5px 10px;text-align:left;line-height:18px;overflow:auto;-moz-box-shadow:0px 1px 15px #555555;-webkit-box-shadow:0px 1px 15px #555555;box-shadow:0px 1px 15px #555555;}.profiler-results .profiler-popup .profiler-info{margin-bottom:3px;padding-bottom:2px;border-bottom:1px solid #ddd;}.profiler-results .profiler-popup .profiler-info .profiler-name{font-size:110%;font-weight:bold;}.profiler-results .profiler-popup .profiler-info .profiler-name .profiler-overall-duration{display:none;}
+.profiler-results .profiler-popup .profiler-info .profiler-server-time{font-size:95%;}
+.profiler-results .profiler-popup .profiler-timings th,.profiler-results .profiler-popup .profiler-timings td{padding-left:6px;padding-right:6px;}
+.profiler-results .profiler-popup .profiler-timings th{font-size:95%;padding-bottom:3px;}
+.profiler-results .profiler-popup .profiler-timings .profiler-label{max-width:275px;}
+.profiler-results .profiler-queries{display:none;z-index:2147483643;position:absolute;overflow-y:auto;overflow-x:hidden;background-color:#fff;}.profiler-results .profiler-queries th{font-size:17px;}
+.profiler-results.profiler-min .profiler-result{display:none;}
+.profiler-results.profiler-min .profiler-controls span{display:none;}
+.profiler-results.profiler-min .profiler-controls .profiler-min-max{border-right:none;padding:0px;margin:0px;}
+.profiler-queries-bg{z-index:2147483642;display:none;background:#000;opacity:0.7;position:absolute;top:0px;left:0px;min-width:100%;}
+.profiler-result-full .profiler-result{width:950px;margin:30px auto;}.profiler-result-full .profiler-result .profiler-button{display:none;}
+.profiler-result-full .profiler-result .profiler-popup .profiler-info{font-size:25px;border-bottom:1px solid #aaaaaa;padding-bottom:3px;margin-bottom:25px;}.profiler-result-full .profiler-result .profiler-popup .profiler-info .profiler-overall-duration{padding-right:20px;font-size:80%;color:#888;}
+.profiler-result-full .profiler-result .profiler-popup .profiler-timings td,.profiler-result-full .profiler-result .profiler-popup .profiler-timings th{padding-left:8px;padding-right:8px;}
+.profiler-result-full .profiler-result .profiler-popup .profiler-timings th{padding-bottom:7px;}
+.profiler-result-full .profiler-result .profiler-popup .profiler-timings td{font-size:14px;padding-bottom:4px;}.profiler-result-full .profiler-result .profiler-popup .profiler-timings td:first-child{padding-left:10px;}
+.profiler-result-full .profiler-result .profiler-popup .profiler-timings .profiler-label{max-width:550px;}
+.profiler-result-full .profiler-result .profiler-queries{margin:25px 0;}.profiler-result-full .profiler-result .profiler-queries table{width:100%;}
+.profiler-result-full .profiler-result .profiler-queries th{font-size:16px;color:#555;line-height:20px;}
+.profiler-result-full .profiler-result .profiler-queries td{padding:15px 10px;text-align:left;}
+.profiler-result-full .profiler-result .profiler-queries .profiler-info div{text-align:right;margin-bottom:5px;}

data/lib/html/includes.js

@@ -100,6 +100,18 @@ var MiniProfiler = (function ($) {
                         copy.navigation.redirectCount = clientPerformance.navigation.redirectCount;
                     }
                     clientPerformance = copy;
+
+                    // hack to add chrome timings 
+                    if (window.chrome && window.chrome.loadTimes) {
+                      var chromeTimes = window.chrome.loadTimes(); 
+                      if (chromeTimes.firstPaintTime) {
+                        clientPerformance.timing["First Paint Time"] = Math.round(chromeTimes.firstPaintTime * 1000);
+                      }
+                      if (chromeTimes.firstPaintTime) {
+                        clientPerformance.timing["First Paint After Load Time"] = Math.round(chromeTimes.firstPaintAfterLoadTime * 1000);
+                      }
+
+                    }
                 }
             }
 
@@ -593,7 +605,7 @@ var MiniProfiler = (function ($) {
 
             for (var i = 0; i < clientTimings.Timings.length; i++) {
                 t = clientTimings.Timings[i];
-                var trivial = t.Name != "Dom Complete" && t.Name != "Response";
+                var trivial = t.Name != "Dom Complete" && t.Name != "Response" && t.Name != "First Paint Time";
                 trivial = t.Duration < 2 ? trivial : false;
                 list.push(
                 {
@@ -811,4 +823,4 @@ PR_TAG:"tag",PR_TYPE:S}})()
 PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xA0]+/,null,"\t\n\r \u00a0"],["str",/^(?:"(?:[^\"\\]|\\.)*"|'(?:[^\'\\]|\\.)*')/,null,"\"'"]],[["com",/^(?:--[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/],["kwd",/^(?:ADD|ALL|ALTER|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BULK|BY|CASCADE|CASE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DELETE|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DROP|DUMMY|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXEC|EXECUTE|EXISTS|EXIT|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITYCOL|IDENTITY_INSERT|IF|IN|INDEX|INNER|INSERT|INTERSECT|INTO|IS|JOIN|KEY|KILL|LEFT|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|NULLIF|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|OPTION|OR|ORDER|OUTER|OVER|PERCENT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVOKE|RIGHT|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SELECT|SESSION_USER|SET|SETUSER|SHUTDOWN|SOME|STATISTICS|SYSTEM_USER|TABLE|TEXTSIZE|THEN|TO|TOP|TRAN|TRANSACTION|TRIGGER|TRUNCATE|TSEQUAL|UNION|UNIQUE|UPDATE|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHERE|WHILE|WITH|WRITETEXT)(?=[^\w-]|$)/i,
 null],["lit",/^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i],["pln",/^[a-z_][\w-]*/i],["pun",/^[^\w\t\n\r \xA0\"\'][^\w\t\n\r \xA0+\-\"\']*/]]),["sql"])
 
-;
+;

data/lib/html/includes.less

@@ -1,4 +1,4 @@
-.box-shadow(@dx, @dy, @radius, @color) {
+.box-shadow(@dx, @dy, @radius, @color) {
     -moz-box-shadow: @dx @dy @radius @color;
     -webkit-box-shadow: @dx @dy @radius @color;
     box-shadow: @dx @dy @radius @color;

data/lib/html/profile_handler.js

@@ -1,6 +1,6 @@
-<script type="text/javascript">    
+<script type="text/javascript">
     (function(){{
-        var init = function() {{        
+        var init = function() {{
                 var load = function(s,f){{
                     var sc = document.createElement('script');
                     sc.async = 'async';
@@ -14,8 +14,8 @@
                     }};
 
                     document.getElementsByTagName('head')[0].appendChild(sc);
-                }};                
-                
+                }};
+
                 var initMp = function(){{
                     load('{path}includes.js?v={version}',function(){{
                         MiniProfiler.init({{
@@ -32,18 +32,18 @@
                         }});
                     }});
                 }};
-                if ({useExistingjQuery}) {{
+                if ({useExistingjQuery} && typeof(jQuery) === 'function') {{
                     jQueryMP = jQuery;
                     initMp();
                 }} else {{
                     load('{path}jquery.1.7.1.js?v={version}', initMp);
                 }}
-                
+
         }};
 
-        var w = 0;        
+        var w = 0;
         var f = false;
-        var deferInit = function(){{ 
+        var deferInit = function(){{
             if (f) return;
             if (window.performance && window.performance.timing && window.performance.timing.loadEventEnd == 0 && w < 10000){{
                 setTimeout(deferInit, 100);
@@ -59,4 +59,4 @@
         var o = window.onload;
         window.onload = function(){{if(o)o; deferInit()}};
     }})();
-</script>
+</script>

data/lib/mini_profiler/client_timer_struct.rb

@@ -23,7 +23,7 @@ module Rack
         super
       end
 
-      def init_from_form_data(env, page_struct)
+      def self.init_from_form_data(env, page_struct)
         timings = []
         clientTimes, clientPerf, baseTime = nil 
         form = env['rack.request.form_hash']
@@ -36,7 +36,7 @@ module Rack
 
         probes = form['clientProbes']
         translated = {}
-        if probes 
+        if probes && probes != "null"
           probes.each do |id, val|
             name = val["n"]
             translated[name] ||= {} 
@@ -67,8 +67,10 @@ module Rack
           timings.push("Name" => k, "Start" => clientTimes[k].to_i - baseTime, "Duration" => -1)
         end
 
-        self['RedirectCount'] = env['rack.request.form_hash']['clientPerformance']['navigation']['redirectCount']
-        self['Timings'] = timings
+        rval = self.new
+        rval['RedirectCount'] = env['rack.request.form_hash']['clientPerformance']['navigation']['redirectCount']
+        rval['Timings'] = timings
+        rval
       end
     end
 

data/lib/mini_profiler/config.rb

@@ -14,7 +14,7 @@ module Rack
 
     attr_accessor :auto_inject, :base_url_path, :pre_authorize_cb, :position,
         :backtrace_remove, :backtrace_filter, :skip_schema_queries, 
-        :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode
+        :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode, :use_existing_jquery
       
       def self.default
         new.instance_eval {
@@ -30,6 +30,7 @@ module Rack
           @storage = MiniProfiler::MemoryStore
           @user_provider = Proc.new{|env| Rack::Request.new(env).ip}
           @authorization_mode = :allow_all
+          @use_existing_jquery = false
           self
         }
       end

data/lib/mini_profiler/page_timer_struct.rb

@@ -16,7 +16,7 @@ module Rack
               "Level" => 0,
               "User" => "unknown user",
               "HasUserViewed" => false,
-              "ClientTimings" => ClientTimerStruct.new,
+              "ClientTimings" => nil,
               "DurationMilliseconds" => 0,
               "HasTrivialTimings" => true,
               "HasAllTrivialTimigs" => false,

data/lib/mini_profiler/profiler.rb

@@ -6,7 +6,6 @@ require 'mini_profiler/page_timer_struct'
 require 'mini_profiler/sql_timer_struct'
 require 'mini_profiler/client_timer_struct'
 require 'mini_profiler/request_timer_struct'
-require 'mini_profiler/body_add_proxy'
 require 'mini_profiler/storage/abstract_store'
 require 'mini_profiler/storage/memory_store'
 require 'mini_profiler/storage/redis_store'
@@ -19,7 +18,7 @@ module Rack
 
 	class MiniProfiler
 
-		VERSION = 'rZlycOOTnzxZvxTmFuOEV0dSmu4P5m5bLrCtwJHVXPA=A'.freeze
+		VERSION = '104'.freeze
 
     class << self 
       
@@ -101,8 +100,9 @@ module Rack
 			@app = app
 			@config.base_url_path << "/" unless @config.base_url_path.end_with? "/"
       unless @config.storage_instance
-        @storage = @config.storage_instance = @config.storage.new(@config.storage_options)
+        @config.storage_instance = @config.storage.new(@config.storage_options)
       end
+      @storage = @config.storage_instance 
 		end
     
     def user(env)
@@ -118,7 +118,7 @@ module Rack
         return [404, {}, ["Request not found: #{request['id']} - user #{user(env)}"]] 
       end
 			unless page_struct['HasUserViewed']
-				page_struct['ClientTimings'].init_from_form_data(env, page_struct)
+        page_struct['ClientTimings'] = ClientTimerStruct.init_from_form_data(env, page_struct)
 				page_struct['HasUserViewed'] = true
         @storage.save(page_struct) 
         @storage.set_viewed(user(env), id) 
@@ -151,8 +151,17 @@ module Rack
 			return [404, {}, ["Not found"]] unless ::File.exists? full_path
 			f = Rack::File.new nil
 			f.path = full_path
-			f.cache_control = "max-age:86400"
-			f.serving env
+
+      begin 
+        f.cache_control = "max-age:86400"
+        f.serving env
+      rescue
+        # old versions of rack have a different api 
+        status, headers, body = f.serving
+        headers.merge! 'Cache-Control' => "max-age:86400"
+        [status, headers, body]
+      end
+
 		end
 
     
@@ -245,7 +254,7 @@ module Rack
       end
       
       return [status,headers,body] if skip_it
-      
+
       # we must do this here, otherwise current[:discard] is not being properly treated
       if env["QUERY_STRING"] =~ /pp=env/
         body.close if body.respond_to? :close
@@ -274,6 +283,12 @@ module Rack
       # inject headers, script
 			if status == 200
         
+        # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
+        # Rack::ETag has already inserted some nonesense in the chain
+        headers.delete('ETag')
+        headers.delete('Date')
+        headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
+
 				# inject header
         if headers.is_a? Hash
           headers['X-MiniProfiler-Ids'] = ids_json(env)
@@ -283,21 +298,37 @@ module Rack
 				if current.inject_js \
 					&& headers.has_key?('Content-Type') \
 					&& !headers['Content-Type'].match(/text\/html/).nil? then
-					body = MiniProfiler::BodyAddProxy.new(body, self.get_profile_script(env))
+					
+          response = Rack::Response.new([], status, headers)
+          script = self.get_profile_script(env)
+          if String === body
+            response.write inject(body,script)
+          else
+            body.each { |fragment| response.write inject(fragment, script) }
+          end
+          body.close if body.respond_to? :close
+          return response.finish
 				end
 			end
 
-      # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
-      # Rack::ETag has already inserted some nonesense in the chain
-      headers.delete('ETag')
-      headers.delete('Date')
-      headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
 			[status, headers, body]
     ensure
       # Make sure this always happens
       current = nil
 		end
 
+    def inject(fragment, script)
+      fragment.sub(/<\/body>/i) do 
+        # if for whatever crazy reason we dont get a utf string, 
+        #   just force the encoding, no utf in the mp scripts anyway 
+        if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
+          (script + "</body>").force_encoding(fragment.encoding)
+        else
+          script + "</body>"
+        end
+      end
+    end
+
     def dump_env(env)
       headers = {'Content-Type' => 'text/plain'}
       body = "" 
@@ -380,7 +411,7 @@ module Rack
 			showControls = false
 			currentId = current.page_struct["Id"]
 			authorized = true
-      useExistingjQuery = false
+			useExistingjQuery = @config.use_existing_jquery
 			# TODO : cache this snippet 
 			script = IO.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
 			# replace the variables

data/lib/mini_profiler/storage/file_store.rb

@@ -39,9 +39,14 @@ module Rack
 
         me = self
         Thread.new do
-          while true do
-            me.cleanup_cache if MiniProfiler.instance
-            sleep(3600)
+          begin 
+            while true do
+              # TODO: a sane retry count before bailing
+              me.cleanup_cache
+              sleep(3600)
+            end
+          rescue
+            # don't crash the thread, we can clean up next time 
           end
         end
       end
@@ -83,10 +88,6 @@ module Rack
         }
       end
       
-
-      private 
-
-
       def cleanup_cache
         files = Dir.entries(@path)
         @timer_struct_lock.synchronize {

data/lib/mini_profiler/storage/memory_store.rb

@@ -52,10 +52,6 @@ module Rack
         }
       end
       
-
-      private 
-
-
       def cleanup_cache
         expire_older_than = ((Time.now.to_f - MiniProfiler::MemoryStore::EXPIRE_TIMER_CACHE) * 1000).to_i
         @timer_struct_lock.synchronize {

data/lib/mini_profiler_rails/railtie.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module MiniProfilerRails
 
   class Railtie < ::Rails::Railtie
@@ -22,7 +24,7 @@ module MiniProfilerRails
 
       # The file store is just so much less flaky
       tmp = Rails.root.to_s + "/tmp/miniprofiler"
-      Dir::mkdir(tmp) unless File.exists?(tmp)
+      FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
 
       c.storage_options = {:path => tmp}
       c.storage = Rack::MiniProfiler::FileStore
@@ -76,7 +78,7 @@ module MiniProfilerRails
     #     end
     #   end
 
-    end
+    # end
 
   end
 end

data/lib/patches/sql_patches.rb

@@ -13,6 +13,12 @@ class SqlPatches
 	rescue NameError
 		false
 	end
+	
+  def self.module_exists?(name)
+		eval(name + ".class").to_s.eql?('Module')
+	rescue NameError
+		false
+	end
 end
 
 # The best kind of instrumentation is in the actual db provider, however we don't want to double instrument
@@ -134,45 +140,46 @@ end
 
 ## based off https://github.com/newrelic/rpm/blob/master/lib/new_relic/agent/instrumentation/active_record.rb
 ## fallback for alls sorts of weird dbs
-module Rack
-  class MiniProfiler  
-    module ActiveRecordInstrumentation
-      def self.included(instrumented_class)
-        instrumented_class.class_eval do
-          unless instrumented_class.method_defined?(:log_without_miniprofiler)
-            alias_method :log_without_miniprofiler, :log
-            alias_method :log, :log_with_miniprofiler
-            protected :log
+if SqlPatches.module_exists?('ActiveRecord')
+  module Rack
+    class MiniProfiler  
+      module ActiveRecordInstrumentation
+        def self.included(instrumented_class)
+          instrumented_class.class_eval do
+            unless instrumented_class.method_defined?(:log_without_miniprofiler)
+              alias_method :log_without_miniprofiler, :log
+              alias_method :log, :log_with_miniprofiler
+              protected :log
+            end
           end
         end
-      end
 
-      def log_with_miniprofiler(*args, &block)
-        current = ::Rack::MiniProfiler.current
-        return log_without_miniprofiler(*args, &block) unless current
+        def log_with_miniprofiler(*args, &block)
+          current = ::Rack::MiniProfiler.current
+          return log_without_miniprofiler(*args, &block) unless current
 
-        sql, name, binds = args
-        t0 = Time.now
-        rval = log_without_miniprofiler(*args, &block)
-        
-        # Don't log schema queries if the option is set
-        return rval if Rack::MiniProfiler.config.skip_schema_queries and name =~ /SCHEMA/
+          sql, name, binds = args
+          t0 = Time.now
+          rval = log_without_miniprofiler(*args, &block)
+          
+          # Don't log schema queries if the option is set
+          return rval if Rack::MiniProfiler.config.skip_schema_queries and name =~ /SCHEMA/
 
-        elapsed_time = ((Time.now - t0).to_f * 1000).round(1)
-        Rack::MiniProfiler.record_sql(sql, elapsed_time)
-        rval
+          elapsed_time = ((Time.now - t0).to_f * 1000).round(1)
+          Rack::MiniProfiler.record_sql(sql, elapsed_time)
+          rval
+        end
       end
     end
-  end
 
-  def self.insert_instrumentation 
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-      include ::Rack::MiniProfiler::ActiveRecordInstrumentation
+    def self.insert_instrumentation 
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
+        include ::Rack::MiniProfiler::ActiveRecordInstrumentation
+      end
     end
-  end
 
-  if defined?(::Rails) && !SqlPatches.patched?
-    insert_instrumentation
+    if defined?(::Rails) && !SqlPatches.patched?
+      insert_instrumentation
+    end
   end
 end
-

data/lib/rack-mini-profiler.rb

@@ -1,6 +1,6 @@
-require File.expand_path('mini_profiler/profiler', File.dirname(__FILE__) )
-require File.expand_path('patches/sql_patches', File.dirname(__FILE__) )
+require 'mini_profiler/profiler'
+require 'patches/sql_patches'
 
 if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
-  require File.expand_path('mini_profiler_rails/railtie', File.dirname(__FILE__) )
+  require 'mini_profiler_rails/railtie'
 end

data/rack-mini-profiler.gemspec

@@ -1,9 +1,8 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.4"
+	s.version = "0.1.9"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Aleks Totic","Sam Saffron", "Robin Ward"]
-	s.date = "2012-04-02"
 	s.description = "Page loading speed displayed on every page. Optimize while you develop, performance is a feature."
 	s.email = "sam.saffron@gmail.com"
 	s.homepage = "http://miniprofiler.com"
@@ -14,9 +13,9 @@ Gem::Specification.new do |s|
 		"README.md",
     "CHANGELOG"
 	]
-	s.add_runtime_dependency 'rack', '>= 1.1.3' 
+	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
-    s.add_runtime_dependency 'json', '>= 1.6' 
+    s.add_runtime_dependency 'json', '>= 1.6'
   end
 
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -93,7 +93,6 @@ files:
 - lib/mini_profiler/page_timer_struct.rb
 - lib/mini_profiler/context.rb
 - lib/mini_profiler/config.rb
-- lib/mini_profiler/body_add_proxy.rb
 - lib/mini_profiler/profiling_methods.rb
 - lib/mini_profiler/client_timer_struct.rb
 - lib/mini_profiler/profiler.rb
@@ -107,7 +106,6 @@ files:
 - lib/html/share.html
 - lib/html/includes.less
 - lib/html/list.css
-- lib/html/MiniProfilerHandler.cs
 - lib/html/includes.js
 - lib/html/jquery.tmpl.js
 - lib/html/list.tmpl
@@ -132,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887503633
+      hash: 663723709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887503633
+      hash: 663723709
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/html/MiniProfilerHandler.cs

@@ -1,419 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Web;
-using System.Web.Routing;
-using System.Linq;
-
-using StackExchange.Profiling.Helpers;
-using System.Text;
-using System.Collections.Concurrent;
-
-namespace StackExchange.Profiling.UI
-{
-    /// <summary>
-    /// Understands how to route and respond to MiniProfiler UI urls.
-    /// </summary>
-    public class MiniProfilerHandler : IRouteHandler, IHttpHandler
-    {
-        internal static HtmlString RenderIncludes(MiniProfiler profiler, RenderPosition? position = null, bool? showTrivial = null, bool? showTimeWithChildren = null, int? maxTracesToShow = null, bool? showControls = null, bool? useExistingjQuery = null)
-        {
-            string format = GetResource("include.partial.html");
-
-            var result = "";
-
-            if (profiler != null)
-            {
-                // HACK: unviewed ids are added to this list during Storage.Save, but we know we haven't see the current one yet,
-                // so go ahead and add it to the end - it's usually the only id, but if there was a redirect somewhere, it'll be there, too
-                MiniProfiler.Settings.EnsureStorageStrategy();
-                
-                var authorized = 
-                    MiniProfiler.Settings.Results_Authorize == null || 
-                    MiniProfiler.Settings.Results_Authorize(HttpContext.Current.Request);
-
-                List<Guid> ids;
-                if (authorized)
-                {
-                    ids = MiniProfiler.Settings.Storage.GetUnviewedIds(profiler.User);
-                    ids.Add(profiler.Id);
-                }
-                else
-                {
-                    ids = new List<Guid> { profiler.Id };
-                }
-
-                result = format.Format(new
-                {
-                    path = VirtualPathUtility.ToAbsolute(MiniProfiler.Settings.RouteBasePath).EnsureTrailingSlash(),
-                    version = MiniProfiler.Settings.Version,
-                    ids = ids.ToJson(),
-                    position = (position ?? MiniProfiler.Settings.PopupRenderPosition).ToString().ToLower(),
-                    showTrivial = showTrivial ?? MiniProfiler.Settings.PopupShowTrivial ? "true" : "false",
-                    showChildren = showTimeWithChildren ?? MiniProfiler.Settings.PopupShowTimeWithChildren ? "true" : "false",
-                    maxTracesToShow = maxTracesToShow ?? MiniProfiler.Settings.PopupMaxTracesToShow,
-                    showControls = showControls ?? MiniProfiler.Settings.ShowControls ? "true" : "false",
-                    currentId = profiler.Id,
-                    authorized = authorized ? "true" : "false",
-                    useExistingjQuery = useExistingjQuery ?? MiniProfiler.Settings.UseExistingjQuery ? "true" : "false"
-                });
-                
-            }
-
-            return new HtmlString(result);
-        }
-
-        /// <summary>
-        /// Usually called internally, sometimes you may clear the routes during the apps lifecycle, if you do that call this to bring back mp
-        /// </summary>
-        public static void RegisterRoutes()
-        {
-           
-            var routes = RouteTable.Routes;
-            var handler = new MiniProfilerHandler();
-            var prefix = MiniProfiler.Settings.RouteBasePath.Replace("~/", "").EnsureTrailingSlash();
-
-            using (routes.GetWriteLock())
-            {
-                var route = new Route(prefix + "{filename}", handler)
-                {
-                    // we have to specify these, so no MVC route helpers will match, e.g. @Html.ActionLink("Home", "Index", "Home")
-                    Defaults = new RouteValueDictionary( new { controller = "MiniProfilerHandler", action = "ProcessRequest" }),
-                    Constraints = new RouteValueDictionary( new { controller = "MiniProfilerHandler", action = "ProcessRequest" })
-                };
-
-                // put our routes at the beginning, like a boss
-                routes.Insert(0, route);   
-            }
-        }
-
-        /// <summary>
-        /// Returns this <see cref="MiniProfilerHandler"/> to handle <paramref name="requestContext"/>.
-        /// </summary>
-        public IHttpHandler GetHttpHandler(RequestContext requestContext)
-        {
-            return this; // elegant? I THINK SO.
-        }
-
-        /// <summary>
-        /// Try to keep everything static so we can easily be reused.
-        /// </summary>
-        public bool IsReusable
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Returns either includes' css/javascript or results' html.
-        /// </summary>
-        public void ProcessRequest(HttpContext context)
-        {
-            string output;
-            string path = context.Request.AppRelativeCurrentExecutionFilePath;
-
-            switch (Path.GetFileNameWithoutExtension(path).ToLowerInvariant())
-            {
-                case "jquery.1.7.1":
-                case "jquery.tmpl":
-                case "includes":
-                case "list":
-                    output = Includes(context, path);
-                    break;
-
-                case "results-index":
-                    output = Index(context);
-                    break;
-                
-                case "results-list":
-                    output = ResultList(context);
-                    break;
-
-                case "results":
-                    output = Results(context);
-                    break;
-
-                default:
-                    output = NotFound(context);
-                    break;
-            }
-
-            context.Response.Write(output);
-        }
-
-        private static string ResultList(HttpContext context)
-        {
-            string message;
-            if (!AuthorizeRequest(context, isList: true, message: out message))
-            {
-                return message;
-            }
-
-            var lastId = context.Request["last-id"];
-            Guid lastGuid = Guid.Empty;
-
-            if (!lastId.IsNullOrWhiteSpace()) {
-                Guid.TryParse(lastId, out lastGuid);
-            }
-            
-            var guids = MiniProfiler.Settings.Storage.List(100);
-
-            if (lastGuid != Guid.Empty)
-            {
-                guids = guids.TakeWhile(g => g != lastGuid);
-            }
-
-            guids = guids.Reverse();
-
-            return guids.Select(g => 
-            {
-                var profiler = MiniProfiler.Settings.Storage.Load(g);
-                return new 
-                {
-                    profiler.Id, 
-                    profiler.Name, 
-                    profiler.DurationMilliseconds,
-                    profiler.DurationMillisecondsInSql,
-                    profiler.ClientTimings,
-                    profiler.Started,
-                    profiler.ExecutedNonQueries,
-                    profiler.ExecutedReaders,
-                    profiler.ExecutedScalars,
-                    profiler.HasAllTrivialTimings,
-                    profiler.HasDuplicateSqlTimings,
-                    profiler.HasSqlTimings,
-                    profiler.HasTrivialTimings,
-                    profiler.HasUserViewed,
-                    profiler.MachineName,
-                    profiler.User
-                };
-            }
-            
-           ).ToJson();
-        }
-
-        private static string Index(HttpContext context)
-        {
-            string message;
-            if (!AuthorizeRequest(context, isList: true, message: out message))
-            {
-                return message;
-            }
-
-            context.Response.ContentType = "text/html";
-
-            var path = VirtualPathUtility.ToAbsolute(MiniProfiler.Settings.RouteBasePath).EnsureTrailingSlash(); 
-
-            return new StringBuilder()
-                .AppendLine("<html><head>")
-                .AppendFormat("<title>List of profiling sessions</title>")
-                .AppendLine()
-                .AppendLine("<script type='text/javascript' src='" + path + "jquery.1.7.1.js?v=" + MiniProfiler.Settings.Version + "'></script>")
-                .AppendLine("<script type='text/javascript' src='" + path + "jquery.tmpl.js?v=" + MiniProfiler.Settings.Version + "'></script>")
-                .AppendLine("<script type='text/javascript' src='" + path + "includes.js?v=" + MiniProfiler.Settings.Version + "'></script>")
-                .AppendLine("<script type='text/javascript' src='" + path + "list.js?v=" + MiniProfiler.Settings.Version + "'></script>")
-                .AppendLine("<link href='" + path +"list.css?v=" + MiniProfiler.Settings.Version +  "' rel='stylesheet' type='text/css'>")
-                .AppendLine("<script type='text/javascript'>MiniProfiler.list.init({path: '" + path + "', version: '" + MiniProfiler.Settings.Version + "'})</script>")
-                .AppendLine("</head><body></body></html>")
-                .ToString();
-        }
-
-        /// <summary>
-        /// Handles rendering static content files.
-        /// </summary>
-        private static string Includes(HttpContext context, string path)
-        {
-            var response = context.Response;
-
-            switch (Path.GetExtension(path))
-            {
-                case ".js":
-                    response.ContentType = "application/javascript";
-                    break;
-                case ".css":
-                    response.ContentType = "text/css";
-                    break;
-                case ".tmpl":
-                    response.ContentType = "text/x-jquery-tmpl";
-                    break;
-                default:
-                    return NotFound(context);
-            }
-
-#if !DEBUG
-            var cache = response.Cache;
-            cache.SetCacheability(System.Web.HttpCacheability.Public);
-            cache.SetExpires(DateTime.Now.AddDays(7));
-            cache.SetValidUntilExpires(true);
-#endif
-            
-
-            var embeddedFile = Path.GetFileName(path);
-            return GetResource(embeddedFile);
-        }
-
-        /// <summary>
-        /// Handles rendering a previous MiniProfiler session, identified by its "?id=GUID" on the query.
-        /// </summary>
-        private static string Results(HttpContext context)
-        {
-            // when we're rendering as a button/popup in the corner, we'll pass ?popup=1
-            // if it's absent, we're rendering results as a full page for sharing
-            var isPopup = !string.IsNullOrWhiteSpace(context.Request["popup"]);
-
-            // this guid is the MiniProfiler.Id property
-            Guid id;
-            if (!Guid.TryParse(context.Request["id"], out id))
-                return isPopup ? NotFound(context) : NotFound(context, "text/plain", "No Guid id specified on the query string");
-
-            MiniProfiler.Settings.EnsureStorageStrategy();
-            var profiler = MiniProfiler.Settings.Storage.Load(id);
-
-            var provider = WebRequestProfilerProvider.Settings.UserProvider;
-            string user = null;
-            if (provider != null)
-            {
-                user = provider.GetUser(context.Request);
-            }
-
-            MiniProfiler.Settings.Storage.SetViewed(user, id);
-
-            if (profiler == null)
-            {
-                return isPopup ? NotFound(context) : NotFound(context, "text/plain", "No MiniProfiler results found with Id=" + id.ToString());
-            }
-
-            bool needsSave = false;
-            if (profiler.ClientTimings == null)
-            {
-                profiler.ClientTimings = ClientTimings.FromRequest(context.Request);
-                if (profiler.ClientTimings != null)
-                {
-                    needsSave = true;
-                }
-            }
-
-            if (profiler.HasUserViewed == false) 
-            {
-                profiler.HasUserViewed = true;
-                needsSave = true;
-            }
-
-            if (needsSave) MiniProfiler.Settings.Storage.Save(profiler);
-
-
-            var authorize = MiniProfiler.Settings.Results_Authorize;
-
-
-            if (authorize != null && !authorize(context.Request))
-            {
-                context.Response.ContentType = "application/json";
-                return "hidden".ToJson();
-            }
-
-            return isPopup ? ResultsJson(context, profiler) : ResultsFullPage(context, profiler);
-        }
-
-        private static bool AuthorizeRequest(HttpContext context, bool isList, out string message)
-        {
-            message = null;
-            var authorize = MiniProfiler.Settings.Results_Authorize;
-            var authorizeList = MiniProfiler.Settings.Results_List_Authorize;
-
-            if (authorize != null && !authorize(context.Request) || (isList && (authorizeList == null || !authorizeList(context.Request))))
-            {
-                context.Response.StatusCode = 401;
-                context.Response.ContentType = "text/plain";
-                message = "unauthorized";
-                return false;
-            }
-            return true;
-        }
-
-        private static string ResultsJson(HttpContext context, MiniProfiler profiler)
-        {
-            context.Response.ContentType = "application/json";
-            return MiniProfiler.ToJson(profiler);
-        }
-
-        private static string ResultsFullPage(HttpContext context, MiniProfiler profiler)
-        {
-            context.Response.ContentType = "text/html";
-
-            var template = GetResource("share.html");
-            return template.Format(new 
-            {
-                name = profiler.Name,
-                duration = profiler.DurationMilliseconds.ToString(),
-                path = VirtualPathUtility.ToAbsolute(MiniProfiler.Settings.RouteBasePath).EnsureTrailingSlash(),
-                json = MiniProfiler.ToJson(profiler),
-                includes = RenderIncludes(profiler),
-                version = MiniProfiler.Settings.Version
-            });
-        }
-
-        private static bool bypassLocalLoad = false; 
-        private static string GetResource(string filename)
-        {
-            filename = filename.ToLower();
-            string result;
-
-#if DEBUG 
-            // attempt to simply load from file system, this lets up modify js without needing to recompile A MILLION TIMES 
-            if (!bypassLocalLoad)
-            {
-
-                var trace = new System.Diagnostics.StackTrace(true);
-                var path = System.IO.Path.GetDirectoryName(trace.GetFrames()[0].GetFileName()) + "\\..\\UI\\" + filename;
-                try
-                {
-                    return File.ReadAllText(path);
-                }
-                catch 
-                {
-                    bypassLocalLoad = true;
-                }
-            }
-            
-#endif
-
-            if (!_ResourceCache.TryGetValue(filename, out result))
-            {
-                string customTemplatesPath = HttpContext.Current.Server.MapPath(MiniProfiler.Settings.CustomUITemplates);
-                string customTemplateFile = System.IO.Path.Combine(customTemplatesPath, filename);
-
-                if (System.IO.File.Exists(customTemplateFile))
-                {
-                    result = File.ReadAllText(customTemplateFile);
-                }
-                else
-                {
-                    using (var stream = typeof(MiniProfilerHandler).Assembly.GetManifestResourceStream("StackExchange.Profiling.UI." + filename))
-                    using (var reader = new StreamReader(stream))
-                    {
-                        result = reader.ReadToEnd();
-                    }
-                }
-                _ResourceCache[filename] = result;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Embedded resource contents keyed by filename.
-        /// </summary>
-        private static readonly ConcurrentDictionary<string, string> _ResourceCache = new ConcurrentDictionary<string, string>();
-
-        /// <summary>
-        /// Helper method that sets a proper 404 response code.
-        /// </summary>
-        private static string NotFound(HttpContext context, string contentType = "text/plain", string message = null)
-        {
-            context.Response.StatusCode = 404;
-            context.Response.ContentType = contentType;
-
-            return message;
-        }
-
-    }
-}

data/lib/mini_profiler/body_add_proxy.rb

@@ -1,45 +0,0 @@
-module Rack
-  class MiniProfiler
-
-    # This class acts as a proxy to the Body so that we can
-    # safely append to the end without knowing about the internals
-    # of the body class.    
-    class BodyAddProxy
-      def initialize(body, additional_text)
-        @body = body
-        @additional_text = additional_text
-      end
-
-      def respond_to?(*args)
-        super or @body.respond_to?(*args)
-      end
-
-      def method_missing(*args, &block)
-        @body.__send__(*args, &block)
-      end
-
-      # In the case of to_str we don't want to use method_missing as it might avoid
-      # a call to each (such as in Rack::Test)
-      def to_str
-        result = ""
-        each {|token| result << token}
-        result
-      end
-
-      def each(&block)
-
-        # In ruby 1.9 we don't support String#each
-        if @body.is_a?(String)
-          yield @body
-        else
-          @body.each(&block)
-        end
-
-        yield @additional_text
-        self
-      end
-
-    end
-
-  end
-end