Merge branch 'master' into filtering

Author: CamJN

CHANGELOG

@@ -23,3 +23,11 @@
 - 0.0.6
 - Better analysis with stackprof on ruby 2.1
 - New window displaying the backtrace when clicking on element
+
+13-May-2016
+
+- 0.9.5
+- Corrected issues with stackprof based profiling
+- Update d3
+- When clicking on a frame there is a window that shows more info
+- Highlighting a gem highlights all the areas it is used

lib/flamegraph/d3.min.js

@@ -268,7 +268,7 @@ <h3>Frame Info</h3>
 	var nodes = [];
 	$.each(frames, function(i,f) {
 	var i = info[f];
-	nodes = nodes.concat(i.nodes);  
+	nodes = nodes.concat(i.nodes);
 	});
 	return nodes;
 };
@@ -314,7 +314,7 @@ <h3>Frame Info</h3>
 
   var linkify = function(path){
     var split = path.split("/")[0].split("-");
-    if(["activerecord","actionpack","railties","activesupport", "rails"].indexOf(split[0]) > -1) {
+    if(["actionview","activerecord","actionpack","railties","activesupport", "rails"].indexOf(split[0]) > -1) {
       var github = "https://github.com/rails/rails/blob/";
       var file = path.split(":")[0].split("/");
       if(split[0] === "rails") {
@@ -525,7 +525,6 @@ <h3>Frame Info</h3>
 });
 
 
-
   </script>
 </body>
 </html>

lib/flamegraph/flamegraph.html

@@ -13,7 +13,7 @@ def graph_html(embed_resources)
         embed("jquery.min.js","d3.min.js","lodash.min.js")
       else
         '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.0.8/d3.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/1.3.1/lodash.min.js"></script>'
       end
 

lib/flamegraph/renderer.rb

@@ -1,3 +1,3 @@
 module Flamegraph
-  VERSION = "0.1.0"
+  VERSION = "0.9.5"
 end