speedup-rails 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20b0e2c53cfa6c365ee4130ec61313c490dab7f
-  data.tar.gz: 3c71390f34b1e23c53a6d351f2a4455886277ce7
+  metadata.gz: a79adaf0346b1581840b1cbc3d88f33e31f31b0e
+  data.tar.gz: 877452dc9f81628257b2e844c0f6a53025d368bf
 SHA512:
-  metadata.gz: 9df81c075bda9ecce97d80336232ff0d1690651e6ff102125ea2941ea29c7e66b767fb0f68c519ea4bdeff683f91142eb0198b84cb28789ba0d470200dccc535
-  data.tar.gz: c73178b30a4f83c81085562090f4122bc3c5154449c12d188f11d1bc76000f9a4cd5a5c5bb5c3ee60ddad83b631a6601d0ccb82468a4fff31c4d3f987dd8033a
+  metadata.gz: 5d94ee85e7b3efbd8461ccb7b78bf86b871a115d5437cd488874b1337a5cebb25347cabb88c2d5f0cfb145373b3bf6575e798dca1b659bd066d450ecf28867e9
+  data.tar.gz: 8a626e5ceb3d20502ddcc69d9fb1e1985bbd160eacd6779720f95be6ac39a95e011326ea3480f72a8bc35d9fea070afa4f7daa9f47ff2719db9f916dd22b213a

data/app/helpers/speedup_rails/application_helper.rb

@@ -2,6 +2,7 @@ module SpeedupRails
   module ApplicationHelper
 
     def render_ms(value)
+      return nil unless value
       ((value * 100).round.to_f / 100).to_s + ' ms'
     end
 

data/app/views/speedup_rails/collectors/_bullet.html.erb

@@ -1,5 +1,8 @@
+<div class="icon_container">
+  <%= image_tag('speedup_rails/icons.png', alt: '', style: 'clip: rect(0, 20px, 20px, 0px); left: 0;') %>
+</div>
 <span class="speedup_rails_<%= key %>" data-key="<%= key %>">
-  <%= image_tag('speedup_rails/alert.jpg', alt: '') %><%= data.count %> problems
+  <%= data.count %> problems
 </span>
 <% if data.any? %>
 <div class="additional_info">

data/app/views/speedup_rails/collectors/_partials.html.erb

@@ -1,13 +1,21 @@
+<div class="icon_container">
+  <%= image_tag('speedup_rails/icons.png', alt: '', style: 'clip: rect(0, 60px, 20px, 40px); left: -40px;') %>
+</div>
 <span class="speedup_rails_<%= key %>" data-key="<%= key %>">
-  <%= image_tag('speedup_rails/file-icon.png', alt: '') %><%= data.count %> partials (<%= render_ms(request_data[:view_duration]) %>)
+  <%= data.count %> partials
+  <% unless redirect %>
+    (<%= render_ms(request_data[:view_duration]) %>)
+  <% end %>
 </span>
-<div class="additional_info">
-  <div class="partials">
-    <% data.each do |template| %>
-      <div>
-        <span class="duration <%= template[:duration] > 100 ? 'duration-warning' : 'duration-info' %>"><%= render_ms(template[:duration]) %></span>
-        <span class="template"><%= template[:identifier] %></span>
-      </div>
-    <% end %>
+<% if data.any? %>
+  <div class="additional_info">
+    <div class="partials">
+      <% data.each do |template| %>
+        <div>
+          <span class="duration <%= template[:duration] > 100 ? 'duration-warning' : 'duration-info' %>"><%= render_ms(template[:duration]) %></span>
+          <span class="template"><%= template[:identifier] %></span>
+        </div>
+      <% end %>
+    </div>
   </div>
-</div>
+<% end %>

data/app/views/speedup_rails/collectors/_queries.html.erb

@@ -1,5 +1,8 @@
+<div class="icon_container">
+  <%= image_tag('speedup_rails/icons.png', alt: '', style: 'clip: rect(0, 40px, 20px, 20px); left: -20px;') %>
+</div>
 <span class="speedup_rails_<%= key %>" data-key="<%= key %>">
-  <%= image_tag('speedup_rails/database.png', alt: '') %><%= data.count %> queries (<%= render_ms(data.sum{|t| t[:duration] }) %>)
+  <%= data.count %> queries (<%= render_ms(data.sum{|t| t[:duration] }) %>)
 </span>
 <div class="additional_info">
   <div class="queries">
@@ -7,7 +10,25 @@
       <div>
         <span class="duration <%= query[:duration] > 10 ? 'duration-warning' : 'duration-info' %>"><%= render_ms(query[:duration])%></span>
         <span class="query"><%= query[:query] %></span>
+        <div class="backtrace">
+          <% query[:backtrace].each do |line| %>
+            <span class="backtrace_line"><%= line %><br/></span>
+          <% end %>
+        </div>
       </div>
     <% end %>
   </div>
 </div>
+
+<script type="text/javascript">
+  var traces = document.getElementById("speedup_collectorinfo_<%= key %>").getElementsByClassName('backtrace')
+  for (var j = traces.length - 1; j >= 0; j--) {
+    traces[j].onclick = function() {
+      var i;
+      var x = this.getElementsByClassName("backtrace_line");
+      for (i = 0; i < x.length; i++) {
+          x[i].style.display = "inline";
+      }
+    };
+  };
+</script>

data/app/views/speedup_rails/collectors/_request.html.erb

@@ -1,5 +1,14 @@
+<div class="icon_container">
+  <%= image_tag('speedup_rails/icons.png', alt: '', style: 'clip: rect(0, 80px, 20px, 60px); left: -60px;') %>
+</div>
 <span class="speedup_rails_<%= key %>" data-key="<%= key %>">
-
-  <%= image_tag('speedup_rails/input.png', alt: '') %> <%= data[:controller] %>#<%= data[:action] %>
-  <%= image_tag('speedup_rails/time.png', alt: '') %> <%= (data[:duration] * 100).round.to_f / 100 %> ms
+  <%= data[:controller] %>#<%= data[:action] %>
+</span>
+</li>
+<li id="speedup_collectorinfo_request2">
+<div class="icon_container">
+  <%= image_tag('speedup_rails/icons.png', alt: '', style: 'clip: rect(0, 100px, 20px, 80px); left: -80px;') %>
+</div>
+<span class="speedup_rails_<%= key %>" data-key="<%= key %>">
+  <%= (data[:duration] * 100).round.to_f / 100 %> ms
 </span>

data/app/views/speedup_rails/results/show.html.erb

@@ -1,8 +1,8 @@
 <ul class="speedup_main_bar speedup_main_bar_<%= @redirect %><%= ' redirect' if @redirect %>">
   <% @collectors.each do |col| %>
     <% next unless col.render? %>
-    <li>
-      <%= render "speedup_rails/collectors/#{col.key}", data: @request[col.key] || [], key: col.key, request_data: @request[:request] %>
+    <li id="speedup_collectorinfo_<%= col.key %>">
+      <%= render "speedup_rails/collectors/#{col.key}", data: @request[col.key] || [], key: col.key, request_data: @request[:request], redirect: @redirect %>
     </li>
   <% end %>
 </ul>

data/lib/speedup/collectors/collector.rb

@@ -85,6 +85,10 @@ module Speedup
 
       protected
 
+        def clean_trace
+          Rails.backtrace_cleaner.clean(caller[2..-1])
+        end
+
         def setup_subscribes
           # pass
         end

data/lib/speedup/collectors/queries_collector.rb

@@ -12,7 +12,7 @@ module  Speedup
       end
 
       def event_to_data(evt)
-        {time: evt.time, duration: evt.duration, name: evt.payload[:name], query: evt.payload[:sql]}
+        {time: evt.time, duration: evt.duration, name: evt.payload[:name], query: evt.payload[:sql], backtrace: clean_trace}
       end
 
     end

data/lib/speedup/collectors/rubyprof_collector.rb

@@ -29,7 +29,7 @@ module Speedup
           result = RubyProf.stop if enabled?
 
           # Print a flat profile to text
-          printer = RubyProf::GraphHtmlPrinter.new(result)
+          printer = RubyProf::CallStackPrinter.new(result)
           ::File.open(@results_dir.join( Speedup.request.id ), 'wb') do |file|
             printer.print(file)
           end

data/lib/speedup/middleware.rb

@@ -86,6 +86,12 @@ module Speedup
         @redirects.each_with_index do |req_id, idx|
           str << " loadRequestData('#{SpeedupRails::Engine.routes.url_helpers.result_path(req_id, redirect: idx)}');"
         end
+        str << "if( typeof jQuery !== 'undefined' ) {
+              jQuery(document).ajaxComplete(function(evt, xhr, settings){
+                if(! settings.url.match('#{SpeedupRails::Engine.routes.url_helpers.result_path('')}') )
+                  loadRequestData('#{SpeedupRails::Engine.routes.url_helpers.result_path('REQUEST_ID')}'.replace('REQUEST_ID', xhr.getResponseHeader('X-Request-Id')));
+              });
+            }"
         str << '</script>'
         str
       end
@@ -100,7 +106,7 @@ module Speedup
                 bottom: 5px;
                 right: 5px;
                 min-width: 250px;
-                z-index: 100;
+                z-index: 8;
               }
               #speedup_rails_bar .redirect {
                 color: #444;
@@ -115,8 +121,17 @@ module Speedup
                 overflow: auto;
                 font: normal normal 12px/21px Tahoma, sans-serif;
               }
-              #speedup_rails_bar > ul { list-style: none; clear: left; margin: 0; padding: 0; margin-left: 4px; }
-              #speedup_rails_bar > ul > li { float: left; overflow: visible; }
+              #speedup_rails_bar > ul.speedup_main_bar {
+                list-style: none;
+                clear: left;
+                margin: 0;
+                padding: 0;
+                margin-left: 4px;
+                overflow: visible;
+                position: relative;
+                height: 22px;
+              }
+              #speedup_rails_bar > ul > li { float: left; padding-left: 5px; }
               #speedup_rails_bar .additional_info {
                 position: absolute;
                 bottom: 100%;
@@ -124,15 +139,17 @@ module Speedup
                 padding: 5px;
                 display: none;
                 height: 500px;
+                max-width: 200%;
+                overflow: scroll;
               }
-              #speedup_rails_bar > ul > li:hover .additional_info { display: block; max-width: 200%; }
-              #speedup_rails_bar li > span { padding: 0 4px; }
-              #speedup_rails_bar img {
-                vertical-align: middle;
+              #speedup_rails_bar > ul > li:hover .additional_info { display: block; }
+              #speedup_rails_bar li > span { padding: 0 2px; margin-left: 20px; }
+              #speedup_rails_bar .icon_container {
                 position: relative;
-                top: -1px;
-                margin-right: 3px;
-                width: 18px;
+              }
+              #speedup_rails_bar .icon_container img {
+                position: absolute;
+                max-width: 100px;
               }
               #speedup_rails_bar .additional_info > div > div {
                 border-bottom: 1px solid #c9c9c9;
@@ -146,6 +163,14 @@ module Speedup
               #speedup_rails_bar .additional_info .duration.duration-warning {
                 color: red;
               }
+              #speedup_rails_bar .additional_info .backtrace {
+                font-size: 95%;
+                margin: 5px 0 0 20px;
+                line-height: 1.4em;
+              }
+              #speedup_rails_bar .additional_info .backtrace .backtrace_line:not(:first-child) {
+                display: none;
+              }
             </style>
           END_STYLES
         end

data/lib/speedup/version.rb

@@ -1,3 +1,3 @@
 module Speedup
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedup-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/assets/images/speedup_rails/alert.jpg
 - app/assets/images/speedup_rails/database.png
 - app/assets/images/speedup_rails/file-icon.png
+- app/assets/images/speedup_rails/icons.png
 - app/assets/images/speedup_rails/input.png
 - app/assets/images/speedup_rails/time.png
 - app/assets/javascripts/speedup_rails/application.js