rack-mini-profiler 0.1.26 → 0.1.31

data/Ruby/lib/mini_profiler/request_timer_struct.rb

@@ -4,7 +4,7 @@ module Rack
   class MiniProfiler
 
     class RequestTimerStruct < TimerStruct
-      
+
       def self.createRoot(name, page)
         rt = RequestTimerStruct.new(name, page, nil)
         rt["IsRoot"]= true
@@ -77,7 +77,7 @@ module Rack
         self['SqlTimings'].push(timer)
         self['HasSqlTimings'] = true
         self['SqlTimingsDurationMilliseconds'] += elapsed_ms
-        page['DurationMillisecondsInSql'] += elapsed_ms        
+        page['DurationMillisecondsInSql'] += elapsed_ms
         timer
       end
 
@@ -103,13 +103,13 @@ module Rack
         self['DurationMilliseconds'] = milliseconds
         self['IsTrivial'] = true if milliseconds < self["TrivialDurationThresholdMilliseconds"]
         self['DurationWithoutChildrenMilliseconds'] = milliseconds - @children_duration
-        
+
         if @parent
           @parent.children_duration += milliseconds
         end
 
-      end     
+      end
     end
   end
-  
+
 end

data/Ruby/lib/mini_profiler/sql_timer_struct.rb

@@ -8,7 +8,7 @@ module Rack
       def initialize(query, duration_ms, page, parent, skip_backtrace = false, full_backtrace = false)
 
         stack_trace = nil 
-        unless skip_backtrace 
+        unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
           # Allow us to filter the stack trace
           stack_trace = ""
            # Clean up the stack trace if there are options to do so

data/Ruby/lib/mini_profiler/storage/abstract_store.rb

@@ -1,7 +1,7 @@
 module Rack
   class MiniProfiler
     class AbstractStore
-      
+
       def save(page_struct)
         raise NotImplementedError.new("save is not implemented")
       end
@@ -23,9 +23,10 @@ module Rack
       end
 
       def diagnostics(user)
-        raise NotImplementedError.new("diagnostics not implemented") 
+        # this is opt in, no need to explode if not implemented
+        ""
       end
-    
+
     end
   end
 end

data/Ruby/lib/mini_profiler/storage/redis_store.rb

@@ -3,7 +3,7 @@ module Rack
     class RedisStore < AbstractStore
 
       EXPIRES_IN_SECONDS = 60 * 60 * 24
-     
+
       def initialize(args = nil)
         @args = args || {}
         @prefix = @args.delete(:prefix) || 'MPRedisStore'
@@ -12,7 +12,7 @@ module Rack
       end
 
       def save(page_struct)
-        redis.setex "#{@prefix}#{page_struct['Id']}", @expires_in_seconds, Marshal::dump(page_struct) 
+        redis.setex "#{@prefix}#{page_struct['Id']}", @expires_in_seconds, Marshal::dump(page_struct)
       end
 
       def load(id)
@@ -41,7 +41,7 @@ unviewed_ids: #{get_unviewed_ids(user)}
 "
       end
 
-      private 
+      private
 
       def redis
         return @redis_connection if @redis_connection

data/Ruby/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = 'e777c6e0fdfb9a725e857c8ca3eab18f'.freeze
+    VERSION = '55905d0d15f4dc1e14b29260abce19b2'.freeze
   end
 end

data/Ruby/lib/patches/sql_patches.rb

@@ -200,7 +200,12 @@ if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0" #
 
       data = "#{request_context[:method].upcase} #{request_context[:uri]}"
       if request_context[:method] == :post and request_context[:data]
-        data << "\n#{Rack::Utils.unescape(request_context[:data])}"
+        if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
+          # it's xml, unescaping isn't needed
+          data << "\n#{request_context[:data]}"
+        else
+          data << "\n#{Rack::Utils.unescape(request_context[:data])}"
+        end
       end
       result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(data, elapsed_time))
 

data/rack-mini-profiler.gemspec

@@ -1,11 +1,12 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.26"
+	s.version = "0.1.31"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."
 	s.email = "sam.saffron@gmail.com"
 	s.homepage = "http://miniprofiler.com"
+  s.license = "MIT"
 	s.files = [
 		'rack-mini-profiler.gemspec',
 	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.31
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -89,7 +89,6 @@ files:
 - Ruby/lib/html/includes.js
 - Ruby/lib/html/list.js
 - Ruby/lib/html/jquery.1.7.1.js
-- Ruby/lib/html/flamegraph.html
 - Ruby/lib/html/includes.css
 - Ruby/lib/mini_profiler/context.rb
 - Ruby/lib/mini_profiler/page_timer_struct.rb
@@ -103,20 +102,21 @@ files:
 - Ruby/lib/mini_profiler/gc_profiler.rb
 - Ruby/lib/mini_profiler/client_timer_struct.rb
 - Ruby/lib/mini_profiler/sql_timer_struct.rb
+- Ruby/lib/mini_profiler/gc_profiler_ruby_head.rb
 - Ruby/lib/mini_profiler/config.rb
 - Ruby/lib/mini_profiler/custom_timer_struct.rb
 - Ruby/lib/mini_profiler/version.rb
 - Ruby/lib/mini_profiler/timer_struct.rb
 - Ruby/lib/mini_profiler/profiler.rb
 - Ruby/lib/mini_profiler/request_timer_struct.rb
-- Ruby/lib/mini_profiler/flame_graph.rb
 - Ruby/lib/patches/net_patches.rb
 - Ruby/lib/patches/sql_patches.rb
 - Ruby/lib/rack-mini-profiler.rb
 - Ruby/README.md
 - Ruby/CHANGELOG
 homepage: http://miniprofiler.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.

data/Ruby/lib/html/flamegraph.html

@@ -1,325 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
-<script src="http://cdnjs.cloudflare.com/ajax/libs/d3/3.0.8/d3.min.js"></script>
-<!-- <script src="http://cdnjs.cloudflare.com/ajax/libs/sugar/1.3.8/sugar.min.js"></script> -->
-<meta charset=utf-8 />
-<title>Flame Graph of Page</title>
-<style>
-  .info {height: 40px;}
-  .legend div {
-    display: block;
-    float: left;
-    width: 150px;
-    margin: 0 8px 8px;
-    padding: 4px;
-    height: 50px;
-  }
-</style>
-</head>
-<body>
-  <div class="graph"></div>
-  <div class="info"></div>
-  <div class="legend"></div>
-  
-  <script>
-
-var data = /*DATA*/;
-var maxX = 0;
-var maxY = 0;
-
-debounce = function(func, wait, trickle) {
-  var timeout;
-
-  timeout = null;
-  return function() {
-    var args, context, currentWait, later;
-    context = this;
-    args = arguments;
-    later = function() {
-      timeout = null;
-      return func.apply(context, args);
-    };
-
-    if (timeout && trickle) {
-      // already queued, let it through
-      return;
-    }
-
-    if (typeof wait === "function") {
-      currentWait = wait();
-    } else {
-      currentWait = wait;
-    }
-
-    if (timeout) {
-      clearTimeout(timeout);
-    }
-
-    timeout = setTimeout(later, currentWait);
-    return timeout;
-  };
-};
-
-
-var guessGem = function(frame)
-{
-  var split = frame.split('/gems/'); 
-  if(split.length == 1) {
-    split = frame.split('/app/');
-    if(split.length == 1) {
-      split = frame.split('/lib/');
-    }
-
-    split = split[Math.max(split.length-2,0)].split('/');
-    return split[split.length-1];
-  }
-  else 
-  {
-    return split[split.length -1].split('/')[0];
-  }
-}
-
-var guessMethod = function(frame) {
-  var split = frame.split('`');
-  if(split.length == 2) {
-    return split[1].split("'")[0];
-  }
-  return '?';
-}
-
-var guessFile = function(frame) {
-  var split = frame.split(".rb:");
-  if(split.length == 2) {
-    split = split[0].split('/');
-    return split[split.length - 1];
-  }
-  return "";
-}
-
-$.each(data, function(){
-   maxX = Math.max(maxX, this.x + this.width);
-   maxY = Math.max(maxY, this.y);
-   this.shortName = /* guessGem(this.frame) + " " + guessFile(this.frame) + " "  */ guessMethod(this.frame);
-});
-
-var width = $(window).width();
-var height = $(window).height() / 1.2;
-
-$('.graph').width(width).height(height);
-
-var xScale = d3.scale.linear()
-	.domain([0, maxX])
-    .range([0, width]);
-
-var yScale = d3.scale.linear()
-    .domain([0, maxY])
-    .range([0,height]);
-
-var realHeight = 0;
-var debouncedHeightCheck = debounce(function(){
-  if (realHeight > 15) {
-    svg.selectAll('text').attr('display','show');
-  } else {
-    svg.selectAll('text').attr('display','none');
-  }
-}, 200);
-
-function zoom() 
-{
-  svg.attr("transform", "translate(" + d3.event.translate + ")" + " scale(" + d3.event.scale + ")"); 
-
-  realHeight = yScale(1) * d3.event.scale;
-  debouncedHeightCheck();
-}    
-
-var svg = d3.select(".graph")
-                    .append("svg")
-                    .attr("width", "100%")
-                    .attr("height", "100%")
-                    .attr("pointer-events", "all")
-                    .append('svg:g')
-                    .call(d3.behavior.zoom().on("zoom", zoom))
-                    .append('svg:g');
-
-
-// so zoom works everywhere
-svg.append("rect")
-    .attr("x",function(d) { return xScale(0); })
-    .attr("y",function(d) { return yScale(0);})
-    .attr("width", function(d){return xScale(maxX);})
-    .attr("height", yScale(maxY))
-    .attr("fill", "white");
-
-var color = function() {
-  var r = parseInt(205 + Math.random() * 50);
-  var g = parseInt(Math.random() * 230);
-  var b = parseInt(Math.random() * 55);
-  return "rgb(" + r + "," + g + "," + b + ")";
-}
-var info = {}; 
-
-// http://stackoverflow.com/questions/1960473/unique-values-in-an-array 
-Array.prototype.getUnique = function() {
-    var o = {}, a = []
-    for (var i = 0; i < this.length; i++) o[this[i]] = 1
-    for (var e in o) a.push(e)
-    return a
-}
-
-var samplePercent = function(samples){
-  return "(" + samples + 
-    " sample" + (samples == 1 ? "" : "s") + " - " + 
-    ((samples / maxX) * 100).toFixed(2) + "%)";
-}
-
-var mouseover =  function(d) {
-  var i = info[d.frame];
-  $('.info').text( d.frame + " " + samplePercent(i.samples.length));
-  d3.selectAll(i.nodes)
-     .attr('opacity',0.5);
-};
-
-var mouseout = function(d) {
-  var i = info[d.frame];
-  $('.info').text("");
-  d3.selectAll(i.nodes)
-     .attr('opacity',1);
-};
-
-// http://stackoverflow.com/a/7419630
-var rainbow = function(numOfSteps, step) {
-    // This function generates vibrant, "evenly spaced" colours (i.e. no clustering). This is ideal for creating easily distiguishable vibrant markers in Google Maps and other apps.
-    // Adam Cole, 2011-Sept-14
-    // HSV to RBG adapted from: http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
-    var r, g, b;
-    var h = step / numOfSteps;
-    var i = ~~(h * 6);
-    var f = h * 6 - i;
-    var q = 1 - f;
-    switch(i % 6){
-        case 0: r = 1, g = f, b = 0; break;
-        case 1: r = q, g = 1, b = 0; break;
-        case 2: r = 0, g = 1, b = f; break;
-        case 3: r = 0, g = q, b = 1; break;
-        case 4: r = f, g = 0, b = 1; break;
-        case 5: r = 1, g = 0, b = q; break;
-    }
-    var c = "#" + ("00" + (~ ~(r * 255)).toString(16)).slice(-2) + ("00" + (~ ~(g * 255)).toString(16)).slice(-2) + ("00" + (~ ~(b * 255)).toString(16)).slice(-2);
-    return (c);
-}
-
-// assign some colors, analyze samples per gem 
-var gemStats = {} 
-
-$.each(data, function(){
-
-  var gem = guessGem(this.frame);
-  var stat = gemStats[gem];
-
-  if(!stat) {
-    gemStats[gem] = stat = {samples: [], frames: []};
-  }
-
-  stat.frames.push(this.frame);
-  for(var j=0; j < this.width; j++){
-    stat.samples.push(this.x + j);
-  }
-});
-
-var totalGems = 0;
-$.each(gemStats, function(){totalGems++;});
-
-
-var currentIndex = 0;
-$.each(gemStats, function(k,stat){
-
-  stat.color = rainbow(totalGems, currentIndex);
-  stat.samples = stat.samples.getUnique();
-
-  for(var x=0; x < stat.frames.length; x++) {
-    info[stat.frames[x]] = {nodes: [], samples: [], color: stat.color};
-  }
-
-  currentIndex += 1;
-});
-
-
-// see: http://bl.ocks.org/mundhradevang/1387786
-function fontSize(d,i) {
-  var size = yScale(1) / 3;
-  // var words = d.shortName.split(' ');
-  var word = d.shortName; // words[0];
-  var width = xScale(d.width+100);
-  var height = yScale(1);
-  var length = 0;
-  d3.select(this).style("font-size", size + "px").text(word);
-  while(((this.getBBox().width >= width) || (this.getBBox().height >= height)) && (size > 12))
-   {
-    size -= 0.1;
-    d3.select(this).style("font-size", size + "px");
-   }
-
-   d3.select(this).attr("dy", size);
-}
-
-svg.selectAll("g")
-	.data(data)
-	.enter()
-    .append("g")
-    .each(function(){
-      d3.select(this)
-      .append("rect")
-      .attr("x",function(d) { return xScale(d.x-1); })
-      .attr("y",function(d) { return yScale(maxY - d.y);})
-      .attr("width", function(d){return xScale(d.width);})
-      .attr("height", yScale(1))
-      .attr("fill", function(d){
-        var i = info[d.frame];
-        if(!i) {
-          info[d.frame] = i = {nodes: [], samples: [], color: color()};
-        }
-        i.nodes.push(this);
-        for(var j=0; j < d.width; j++){
-          i.samples.push(d.x + j);
-        }
-        return i.color;
-      })
-      .on("mouseover", mouseover)
-      .on("mouseout", mouseout);
-
-      d3.select(this)
-        .append("text")
-        .attr("x",function(d) { return xScale(d.x - 0.98); })
-        .attr("y",function(d) { return yScale(maxY - d.y);})
-        .on("mouseover", mouseover)
-        .on("mouseout", mouseout)
-        .each(fontSize)
-        .attr("display", "none");
-
-    });
-    
-
-// Samples may overlap on the same line
-for (var r in info) {
-  if (info[r].samples) {
-    info[r].samples = info[r].samples.getUnique();
-  }
-};
-
-
-// render the legend
-$.each(gemStats, function(k,v){
-  var node = $("<div></div>")
-    .css("background-color", v.color)
-    .text(k + " " + samplePercent(v.samples.length)) ;
-  $('.legend').append(node);
-});
-
-
-
-  </script>
-</body>
-</html>
-