speedup-rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044447ec3251c52f24c7a0b4e64042e3901ec607
-  data.tar.gz: ab4985167d7d03b7fc692cf62435cc6768962068
+  metadata.gz: e20b0e2c53cfa6c365ee4130ec61313c490dab7f
+  data.tar.gz: 3c71390f34b1e23c53a6d351f2a4455886277ce7
 SHA512:
-  metadata.gz: 52c26516e25e567c43005676df1b586ee636f8834edbb76efadc48c8e0425c813dfde50e3474150a491c6748bfeebd25453e4864108fe0f2f41831f3795d4dc2
-  data.tar.gz: 53167a44a1dbf30f7b142ac879511db5d3b3af651acdd7d9f1855a7a14cd22abe9b7015b14694c7c9180699887e397b0f34878d51355754ff362377206ee34a8
+  metadata.gz: 9df81c075bda9ecce97d80336232ff0d1690651e6ff102125ea2941ea29c7e66b767fb0f68c519ea4bdeff683f91142eb0198b84cb28789ba0d470200dccc535
+  data.tar.gz: c73178b30a4f83c81085562090f4122bc3c5154449c12d188f11d1bc76000f9a4cd5a5c5bb5c3ee60ddad83b631a6601d0ccb82468a4fff31c4d3f987dd8033a

data/Rakefile

@@ -8,7 +8,7 @@ require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SpeedUpRails'
+  rdoc.title    = 'SpeedupRails'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

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

@@ -1,8 +1,12 @@
-<%= image_tag('speedup_rails/alert.jpg', alt: '') %><%= data.count %> problems
-<% content_for(:speed_up_additional_bars) do %>
+<span class="speedup_rails_<%= key %>" data-key="<%= key %>">
+  <%= image_tag('speedup_rails/alert.jpg', alt: '') %><%= data.count %> problems
+</span>
+<% if data.any? %>
+<div class="additional_info">
   <div class="<%= key %>">
   <% data.each do |problem| %>
     <div><%= problem[:caller].gsub(/\n/, '<br />').html_safe %></div>
   <% end %>
   </div>
-<% end if data.any? %>
+</div>
+<% end %>

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

@@ -1,11 +1,13 @@
-<%= image_tag('speedup_rails/file-icon.png', alt: '') %><%= data.count %> partials (<%= render_ms(data.sum{|t| t[:duration] }) %>)
-<% content_for(:speed_up_additional_bars) do %>
+<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]) %>)
+</span>
+<div class="additional_info">
   <div class="partials">
     <% data.each do |template| %>
       <div>
-        <span class="duration"><%= render_ms(template[:duration]) %></span>
+        <span class="duration <%= template[:duration] > 100 ? 'duration-warning' : 'duration-info' %>"><%= render_ms(template[:duration]) %></span>
         <span class="template"><%= template[:identifier] %></span>
       </div>
     <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,11 +1,13 @@
-<%= image_tag('speedup_rails/database.png', alt: '') %><%= data.count %> queries
-<% content_for(:speed_up_additional_bars) do %>
+<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] }) %>)
+</span>
+<div class="additional_info">
   <div class="queries">
     <% data.each do |query| %>
       <div>
-        <span class="duration"><%= (query[:duration] * 100).round.to_f / 100 %> ms</span>
+        <span class="duration <%= query[:duration] > 10 ? 'duration-warning' : 'duration-info' %>"><%= render_ms(query[:duration])%></span>
         <span class="query"><%= query[:query] %></span>
       </div>
     <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,3 +1,5 @@
+<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
+  <%= 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
+</span>

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

@@ -1 +1,3 @@
-<%= link_to 'ruby-prof', rubyprof_result_path(@request_id) %>
+<span class="speedup_rails_<%= key %>" data-key="<%= key %>">
+  <%= link_to 'ruby-prof', rubyprof_result_path(@request_id) %>
+</span>

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

@@ -1,36 +1,8 @@
-<% info_class = 'additional_info' + ( @redirect ? "-#{@redirect}" : '' ) %>
 <ul class="speedup_main_bar speedup_main_bar_<%= @redirect %><%= ' redirect' if @redirect %>">
   <% @collectors.each do |col| %>
     <% next unless col.render? %>
     <li>
-      <span class="speedup_rails_<%= col.key %>" data-key="<%= col.key %>">
-        <%= render "speedup_rails/collectors/#{col.key}", data: @request[col.key] || [], key: col.key %>
-      </span>
+      <%= render "speedup_rails/collectors/#{col.key}", data: @request[col.key] || [], key: col.key, request_data: @request[:request] %>
     </li>
   <% end %>
 </ul>
-<div class="additional_info <%= info_class %>">
-  <% if content_for?(:speed_up_additional_bars) %>
-    <%= yield :speed_up_additional_bars %>
-  <% end %>
-</div>
-
-<script type="text/javascript">
-  elements = document.querySelectorAll("#speedup_rails_bar .speedup_main_bar_<%= @redirect %> > li > span");
-  function handlerOver() {
-    elem = document.querySelector('#speedup_rails_bar .<%= info_class %> .' + this.dataset.key );
-    if( elem ) {
-      elem.style.display = 'block';
-      elem.style.bottom = '' + ( window.innerHeight - this.offsetParent.offsetTop + 2) + 'px';
-    }
-  }
-  function handlerOut() {
-    elem = document.querySelector('#speedup_rails_bar .<%= info_class %> .' + this.dataset.key );
-    if( elem )
-      elem.style.display = 'none';
-  }
-  for( i = 0; i < elements.length; ++i) {
-    elements[i].onmouseover = handlerOver;
-    elements[i].onmouseout = handlerOut;
-  }
-</script>

data/lib/speedup/middleware.rb

@@ -95,18 +95,18 @@ module Speedup
         def styles
           <<-END_STYLES
             <style type="text/css">
-              #speedup_rails_bar,
-              #speedup_rails_bar .additional_info > div {
+              #speedup_rails_bar {
                 position: fixed;
                 bottom: 5px;
                 right: 5px;
                 min-width: 250px;
+                z-index: 100;
               }
               #speedup_rails_bar .redirect {
                 color: #444;
               }
               #speedup_rails_bar .speedup_main_bar,
-              #speedup_rails_bar .additional_info > div
+              #speedup_rails_bar .additional_info
               {
                 border: 1px solid #c9c9c9;
                 background-color: #EDEAE0;
@@ -117,6 +117,15 @@ module Speedup
               }
               #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 .additional_info {
+                position: absolute;
+                bottom: 100%;
+                right: 0;
+                padding: 5px;
+                display: none;
+                height: 500px;
+              }
+              #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;
@@ -125,16 +134,18 @@ module Speedup
                 margin-right: 3px;
                 width: 18px;
               }
-              #speedup_rails_bar .additional_info > div {
-                padding: 5px;
-                display: none;
-              }
               #speedup_rails_bar .additional_info > div > div {
                 border-bottom: 1px solid #c9c9c9;
               }
               #speedup_rails_bar .additional_info > div > div:last-child {
                 border-bottom: none;
               }
+              #speedup_rails_bar .additional_info .duration {
+                font-weight: bold;
+              }
+              #speedup_rails_bar .additional_info .duration.duration-warning {
+                color: red;
+              }
             </style>
           END_STYLES
         end
@@ -145,7 +156,7 @@ module Speedup
               speedup_rails_ajax( url , function(xhr) {
                 res = stripScript( xhr.responseText );
                 appendHtml(document.getElementById('speedup_rails_bar'), res[0]);
-                executeScript(res[1])
+                executeScript(res[1]);
               });
             }
             function appendHtml(el, str) {
@@ -171,7 +182,7 @@ module Speedup
                   var head = document.getElementsByTagName('head')[0];
                   var scriptElement = document.createElement('script');
                   scriptElement.setAttribute('type', 'text/javascript');
-                  scriptElement.innerText = scripts;
+                  scriptElement.innerHTML = scripts;
                   head.appendChild(scriptElement);
                   head.removeChild(scriptElement);
               }

data/lib/speedup/version.rb

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

data/spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+WebMock.allow_net_connect! #temporary fix
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -41,6 +43,6 @@ Rails.application.configure do
 
   # config.speedup.adapter = :memory
   # config.speedup.adapter = :influxdb, { database: 'speeduprails', username: 'ezrondre', password: 'agent', host: 'sandbox.influxdb.com' }
-  # config.speedup.adapter = :server, { url: 'http://localhost:8080', api_key: '4e557137390141bea520da8cb78e1ca2' }
+  # config.speedup.adapter = :server, { url: 'http://localhost:3030', api_key: 'ca8956557c40d4716cca5ac6278aa651' }
   # config.speedup.adapter = :file
 end