rack-mini-profiler 0.10.2 → 0.10.3

data/lib/html/includes.js

@@ -366,7 +366,7 @@ var MiniProfiler = (function () {
     };
 
     var bindDocumentEvents = function () {
-        $(document).bind('click.mini-profiler keyup.mini-profiler', function (e) {
+        $(document).on('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.
@@ -399,19 +399,19 @@ var MiniProfiler = (function () {
                 popupHide(button, popup);
             }
         });
-        $(document).bind('keydown.mini-profiler', options.toggleShortcut, function(e) {
+        $(document).on('keydown.mini-profiler', options.toggleShortcut, function(e) {
             $('.profiler-results').toggle();
         });
 
         if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
-            $(document).bind('page:change.mini-profiler turbolinks:load.mini-profiler', function() {
+            $(document).on('page:change.mini-profiler turbolinks:load.mini-profiler', function() {
                unbindDocumentEvents();
             });
         }
     };
 
     var unbindDocumentEvents = function() {
-        $(document).unbind('.mini-profiler');
+        $(document).off('.mini-profiler');
     };
 
     var initFullView = function () {
@@ -500,11 +500,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).bind('ajaxComplete.mini-profiler', jQueryAjaxComplete);
+            jQuery(document).on('ajaxComplete.mini-profiler', jQueryAjaxComplete);
         }
 
         if (jQuery && jQuery(document).ajaxStart)
-            jQuery(document).bind('ajaxStart.mini-profiler', function () { ajaxStartTime = new Date(); });
+            jQuery(document).on('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') {
@@ -990,7 +990,16 @@ var MiniProfiler = (function () {
         fetchResultsExposed: function (ids) {
             return fetchResults(ids);
         },
-
+        
+        formatParameters: function (parameters) {
+            if (parameters != null) {
+                return parameters.map(function(item, index){ return "["+item[0]+", "+ item[1] +"]";}).join(', ');           
+            }
+            else {
+                return ''; 
+            }
+        },
+        
         formatDuration: function (duration) {
             return (duration || 0).toFixed(1);
         }

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

@@ -1,17 +1,17 @@
-.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;
+@mixin 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;
 }
 
-@anchorColor: #0077CC;
-@buttonBorderColor: #888;
-@numberColor: #111;
-@textColor: #555;
-@mutedColor: #aaa;
-@normalFonts: Helvetica, Arial, sans-serif;
-@codeFonts: Consolas, monospace, serif;
-@zindex:2147483640; // near 32bit max 2147483647
+$anchorColor: #0077CC;
+$buttonBorderColor: #888;
+$numberColor: #111;
+$textColor: #555;
+$mutedColor: #aaa;
+$normalFonts: Helvetica, Arial, sans-serif;
+$codeFonts: Consolas, monospace, serif;
+$zindex:2147483640; // near 32bit max 2147483647
 
 // do some resets
 .profiler-result, .profiler-queries {
@@ -36,7 +36,7 @@
     }
     a, a:hover {
         cursor:pointer;
-        color:@anchorColor;
+        color:$anchorColor;
     }
     a {
         text-decoration:none;
@@ -54,37 +54,35 @@
     {
         float: right;
     }
-    
     table.profiler-client-timings
     {
         margin-top: 10px;
     }
-    
-    font-family:@normalFonts;
+    font-family:$normalFonts;
 
     .profiler-label {
-        color:@textColor;
+        color:$textColor;
         overflow:hidden;
         text-overflow: ellipsis;
     }
 
     .profiler-unit {
-        color:@mutedColor;
+        color:$mutedColor;
     }
 
     .profiler-trivial {
         display:none;
         td, td * {
-            color:@mutedColor !important;
+            color:$mutedColor !important;
         }
     }
 
     pre, code, .profiler-number, .profiler-unit {
-        font-family:@codeFonts;
+        font-family:$codeFonts;
     }
 
     .profiler-number {
-        color:@numberColor;
+        color:$numberColor;
     }
 
     .profiler-info {
@@ -96,11 +94,11 @@
             white-space:nowrap;
         }
     }
-    
+
     .profiler-timings {
         th {
             background-color:#fff;
-            color:@mutedColor;
+            color:$mutedColor;
             text-align:right;
         }
         th, td {
@@ -110,7 +108,7 @@
             display:none;
         }
         .profiler-duration {
-            .profiler-number;
+            color:$numberColor;
             text-align:right;
         }
         .profiler-indent {
@@ -118,7 +116,7 @@
         }
         .profiler-queries-show {
             .profiler-number, .profiler-unit {
-                color:@anchorColor;
+                color:$anchorColor;
             }
         }
         .profiler-queries-duration {
@@ -152,7 +150,7 @@
     }
 
     .profiler-queries {
-        font-family:@normalFonts;
+        font-family:$normalFonts;
 
         .profiler-stack-trace {
             margin-bottom:15px;
@@ -179,7 +177,7 @@
         }
 
         pre {
-            font-family:@codeFonts;
+            font-family:$codeFonts;
             white-space:pre-wrap;
         }
 
@@ -240,7 +238,10 @@
     }
 
     .profiler-nuclear {
-        .profiler-warning;
+        color:#f00;
+        &:hover {
+            color:#f00;
+        }
         font-weight:bold;
         padding-right:2px;
     }
@@ -249,23 +250,23 @@
 // ajaxed-in results will be appended to this
 .profiler-results
 {
-    z-index:@zindex + 3;
+    z-index:$zindex + 3;
     position:fixed;
     top:0px;
 
-    @radius:10px;
+    $radius:10px;
 
     &.profiler-left {
         left:0px;
 
         &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
-            -webkit-border-bottom-right-radius: @radius;
-            -moz-border-radius-bottomright: @radius;
-            border-bottom-right-radius: @radius;
+            -webkit-border-bottom-right-radius: $radius;
+            -moz-border-radius-bottomright: $radius;
+            border-bottom-right-radius: $radius;
         }
 
         .profiler-button, .profiler-controls {
-            border-right: 1px solid @buttonBorderColor;
+            border-right: 1px solid $buttonBorderColor;
         }
     }
 
@@ -273,20 +274,20 @@
         right:0px;
 
         &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
-            -webkit-border-bottom-left-radius: @radius;
-            -moz-border-radius-bottomleft: @radius;
-            border-bottom-left-radius: @radius;
+            -webkit-border-bottom-left-radius: $radius;
+            -moz-border-radius-bottomleft: $radius;
+            border-bottom-left-radius: $radius;
         }
 
         .profiler-button, .profiler-controls {
-            border-left: 1px solid @buttonBorderColor;
+            border-left: 1px solid $buttonBorderColor;
         }
     }
 
     .profiler-button, .profiler-controls {
         display:none;
-        z-index:@zindex;
-        border-bottom: 1px solid @buttonBorderColor;
+        z-index:$zindex;
+        border-bottom: 1px solid $buttonBorderColor;
         background-color:#fff;
         padding: 4px 7px;
         text-align:right;
@@ -309,11 +310,11 @@
 
     .profiler-totals {
       .profiler-reqs {
-        font-family: @codeFonts;
+        font-family: $codeFonts;
         font-size: 10px;
         margin-left: 6px;
         &:before {
-          font-family: @codeFonts;
+          font-family: $codeFonts;
           content: "×";
           margin-right: 1px;
         }
@@ -323,12 +324,12 @@
     .profiler-controls {
         display: block;
         font-size:12px;
-        font-family: @codeFonts;
+        font-family: $codeFonts;
         cursor:default;
         text-align: center;
 
         span {
-            border-right: 1px solid @mutedColor;
+            border-right: 1px solid $mutedColor;
             padding-right: 5px;
             margin-right: 5px;
             cursor:pointer;
@@ -341,7 +342,7 @@
 
     .profiler-popup {
         display:none;
-        z-index:@zindex + 1;
+        z-index:$zindex + 1;
         position:absolute;
         background-color:#fff;
         border: 1px solid #aaa;
@@ -350,7 +351,7 @@
         line-height:18px;
         overflow:auto;
 
-        .box-shadow(0px, 1px, 15px, #555);
+        @include box-shadow(0px, 1px, 15px, #555);
 
         .profiler-info {
             margin-bottom:3px;
@@ -389,7 +390,7 @@
 
     .profiler-queries {
         display:none;
-        z-index:@zindex + 3;
+        z-index:$zindex + 3;
         position:absolute;
         overflow-y:auto;
         overflow-x:auto;
@@ -420,7 +421,7 @@
 
 // popup results' queries will be displayed in front of this
 .profiler-queries-bg {
-    z-index:@zindex + 2;
+    z-index:$zindex + 2;
     display:none;
     background:#000;
     opacity:0.7;
@@ -446,7 +447,7 @@
 
             .profiler-info {
                 font-size: 25px;
-                border-bottom:1px solid @mutedColor;
+                border-bottom:1px solid $mutedColor;
                 padding-bottom:3px;
                 margin-bottom:25px;
 

data/lib/html/includes.tmpl

@@ -202,7 +202,7 @@
     <td>
       <div class="query">
         <pre class="profiler-stack-trace">${s.stack_trace_snippet}</pre>
-        <pre class="prettyprint lang-sql"><code>${s.formatted_command_string}   </code></pre>
+        <pre class="prettyprint lang-sql"><code>${s.formatted_command_string}; ${MiniProfiler.formatParameters(s.parameters)}</code></pre>
       </div>
     </td>
   </tr>

data/lib/mini_profiler/asset_version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '52dc741c63ccbaf9d87102ee24033482'.freeze
+    ASSET_VERSION = '8f332564e7761fb3795939d6582f992a'.freeze
   end
 end

data/lib/mini_profiler/profiler.rb

@@ -158,7 +158,7 @@ module Rack
       path         = env['PATH_INFO'].sub('//', '/')
 
       # Someone (e.g. Rails engine) could change the SCRIPT_NAME so we save it
-      env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME'] = env['SCRIPT_NAME']
+      env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME'] = ENV['PASSENGER_BASE_URI'] || env['SCRIPT_NAME']
 
       skip_it = (@config.pre_authorize_cb && !@config.pre_authorize_cb.call(env)) ||
                 (@config.skip_paths && @config.skip_paths.any?{ |p| path.start_with?(p) }) ||
@@ -334,9 +334,9 @@ module Rack
 
 
       begin
+        @storage.save(page_struct)
         # no matter what it is, it should be unviewed, otherwise we will miss POST
         @storage.set_unviewed(page_struct[:user], page_struct[:id])
-        @storage.save(page_struct)
 
         # inject headers, script
         if status >= 200 && status < 300
@@ -584,17 +584,7 @@ Append the following to your query string:
     # * you have disabled auto append behaviour throught :auto_inject => false flag
     # * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
     def get_profile_script(env)
-      path = if ENV["PASSENGER_BASE_URI"] then
-        # added because the SCRIPT_NAME workaround below then
-        # breaks running under a prefix as permitted by Passenger.
-        "#{ENV['PASSENGER_BASE_URI']}#{@config.base_url_path}"
-      elsif env["action_controller.instance"]
-        # Rails engines break SCRIPT_NAME; the following appears to discard SCRIPT_NAME
-        # since url_for appears documented to return any String argument unmodified
-        env["action_controller.instance"].url_for("#{@config.base_url_path}")
-      else
-        "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
-      end
+      path = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
 
       settings = {
        :path            => path,

data/lib/mini_profiler/storage/redis_store.rb

@@ -14,11 +14,11 @@ module Rack
       end
 
       def save(page_struct)
-        redis.setex "#{@prefix}#{page_struct[:id]}", @expires_in_seconds, Marshal::dump(page_struct)
+        redis.setex prefixed_id(page_struct[:id]), @expires_in_seconds, Marshal::dump(page_struct)
       end
 
       def load(id)
-        key = "#{@prefix}#{id}"
+        key = prefixed_id(id)
         raw = redis.get key
         begin
           Marshal::load(raw) if raw
@@ -30,24 +30,35 @@ module Rack
       end
 
       def set_unviewed(user, id)
-        key = "#{@prefix}-#{user}-v"
-        redis.sadd key, id
-        redis.expire key, @expires_in_seconds
+        key = user_key(user)
+        if redis.exists(prefixed_id(id))
+          expire_at = Time.now.to_i + redis.ttl(prefixed_id(id))
+          redis.zadd(key, expire_at, id)
+        end
+        redis.expire(key, @expires_in_seconds)
       end
 
       def set_all_unviewed(user, ids)
-        key = "#{@prefix}-#{user}-v"
-        redis.del key
-        ids.each { |id| redis.sadd(key, id) }
-        redis.expire key, @expires_in_seconds
+        key = user_key(user)
+        redis.del(key)
+        ids.each do |id|
+          if redis.exists(prefixed_id(id))
+            expire_at = Time.now.to_i + redis.ttl(prefixed_id(id))
+            redis.zadd(key, expire_at, id)
+          end
+        end
+        redis.expire(key, @expires_in_seconds)
       end
 
       def set_viewed(user, id)
-        redis.srem "#{@prefix}-#{user}-v", id
+        redis.zrem(user_key(user), id)
       end
 
+      # Remove expired ids from the unviewed sorted set and return the remaining ids
       def get_unviewed_ids(user)
-        redis.smembers "#{@prefix}-#{user}-v"
+        key = user_key(user)
+        redis.zremrangebyscore(key, '-inf', Time.now.to_i)
+        redis.zrevrangebyscore(key, '+inf', '-inf')
       end
 
       def diagnostics(user)
@@ -96,6 +107,14 @@ unviewed_ids: #{get_unviewed_ids(user)}
 
       private
 
+      def user_key(user)
+        "#{@prefix}-#{user}-v"
+      end
+
+      def prefixed_id(id)
+        "#{@prefix}#{id}"
+      end
+
       def redis
         @redis_connection ||= begin
           require 'redis' unless defined? Redis