rails_performance 0.0.1.10 → 0.0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d280495ce11ed162cc6fecc78c795cc3d8c9bf7f27cb3e2b7b4a4394fd6d1a9
-  data.tar.gz: 14a8dd0d48d334d5b03ccfd8a05a1baa302aee887e3a7b35cb53af952fabc898
+  metadata.gz: 939d826d3e398d89839a7bbdd673fbeb1b89bfdbb27ff8b0a096c2bb236096ba
+  data.tar.gz: 579db652ed8fe43d1c91284ab07b9f4668f9aa79a87cd40a65f1b290f71d7da1
 SHA512:
-  metadata.gz: 799250422e38ebf1f9b9363162a83b0d7bd2c0d7f656c5394d422199e63c0d1ac6fc2873fc4da20ed22254e8149ec1d5303c3f9e24cd75d0c181509476075a67
-  data.tar.gz: f2df526afb15698f0b0814e4036635e0fb24f54c6869a6f2f4a0532b873a363b1b0b4c02140daaa89ab9e1a7f743a2fed22807ce295bf4b124ddea39950c88a2
+  metadata.gz: f15e0fcc4ecd75401140e69f37e2a7fae382392ca5890ba5d5c7fb4194d4888662fc04e2575b6f1f8565a60a0fe42d0635915ea343e70ddae6efb9deec99c863
+  data.tar.gz: 538a65badcc5daec51f971be14962b543abd62c718e7bbd1e630304b1e306aae5df47b9be1260108c4a7733352bac91a0b623479e8ef6dfb8a2c62ab4f563fd2

data/app/assets/images/home.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?><svg height="48" id="home" viewBox="0 0 48 48" width="48" xmlns="http://www.w3.org/2000/svg"><defs><style>
+      .vi-primary {
+        fill: #FF6E6E;
+      }
+
+      .vi-primary, .vi-accent {
+        stroke: #fff;
+        stroke-linecap: round;
+        stroke-width: 0;
+        fill-rule: evenodd;
+      }
+
+      .vi-accent {
+        fill: #0C0058;
+      }
+    </style></defs><path class="vi-primary" d="M5,24L24,5,43,24H38V40H10V24H5Z"/><path class="vi-accent" d="M19,40V26H29V40H19Z"/></svg>

data/app/controllers/rails_performance_controller.rb

@@ -12,32 +12,29 @@ class RailsPerformanceController < ActionController::Base
   end
 
   def crashes
-    @datasource                = RP::DataSource.new(prepare_query({status_eq: 500}))
-    db                         = @datasource.db
-    @crash_report              = RP::Reports::CrashReport.new(db)
-    @crash_report_data         = @crash_report.data
+    @datasource   = RP::DataSource.new(prepare_query({status_eq: 500}))
+    db            = @datasource.db
+    @report       = RP::Reports::CrashReport.new(db)
+    @data         = @report.data
   end
 
   def requests
-    @datasource                = RP::DataSource.new(prepare_query)
-    db                         = @datasource.db
-
-    @global_report             = RP::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :db_runtime_slowest)
-    @global_report_data        = @global_report.data
+    @datasource = RP::DataSource.new(prepare_query)
+    db          = @datasource.db
+    @report     = RP::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count)
+    @data       = @report.data
   end
 
   def breakdown
     @datasource = RP::DataSource.new(prepare_query)
     db          = @datasource.db
-
-    @breakdown_report      = RP::Reports::BreakdownReport.new(db, title: "Breakdown Report")
-    @breakdown_report_data = @breakdown_report.data
+    @report     = RP::Reports::BreakdownReport.new(db, title: "Breakdown Report")
+    @data       = @report.data
   end
 
   def recent
     @datasource = RP::DataSource.new(prepare_query)
     db          = @datasource.db
-
     @report     = RP::Reports::RecentRequestsReport.new(db)
     @data       = @report.data
   end

data/app/helpers/rails_performance_helper.rb

@@ -6,6 +6,25 @@ module RailsPerformanceHelper
     value.nan? ? nil : value.round(2)
   end
 
+  def ms(value)
+    result = round_it(value)
+    result ? "#{result} ms" : '-'
+  end
+
+  def short_path(path, length: 60)
+    tag.span title: path do
+      truncate(path, length: length)
+    end
+  end
+
+  def link_to_path(e)
+    if e[:method] == 'GET'
+      link_to short_path(e[:path]), e[:path], target: '_blank'
+    else
+      short_path(e[:path])
+    end
+  end
+
   def statistics_link(title, report, group)
     options = case report.group
     when :controller_action_format
@@ -41,9 +60,9 @@ module RailsPerformanceHelper
     end
   end
 
-  def stats_icon
+  def icon(name)
     # https://www.iconfinder.com/iconsets/vivid
-    raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../assets/images/stat.svg"))
+    raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../assets/images/#{name}.svg"))
   end
 
   def insert_css_file(file)

data/app/views/rails_performance/breakdown.html.erb

@@ -1,8 +1,8 @@
-<title><%= @breakdown_report.title %></title>
+<title><%= @report.title %></title>
 
 <div class="card">
   <div class="card-content">
-    <h2 class="subtitle"><%= @breakdown_report.title %></h2>
+    <h2 class="subtitle"><%= @report.title %></h2>
     <table class="table is-fullwidth is-hoverable is-narrow">
       <thead>
         <tr>
@@ -18,23 +18,17 @@
         </tr>
       </thead>
       <tbody>
-        <% @breakdown_report_data.each do |e| %>
+        <% @data.each do |e| %>
           <tr>
             <td><%= l e[:datetime], format: :short %></td>
             <td><%= e[:controller] + '#' + e[:action]  %></td>
             <td><%= e[:method] %></td>
-            <td>
-              <% if e[:method] == 'GET' %>
-                <%= link_to e[:path], e[:path], target: '_blank' %>
-              <% else %>
-                <%= e[:path] %>
-              <% end %>
-            </td>
+            <td><%= link_to_path(e) %></td>
             <td><%= e[:format] %></td>
             <td><%= status_tag e[:status] %></td>
-            <td><%= round_it e[:duration] %> ms</td>
-            <td><%= round_it e[:view_runtime] %> ms</td>
-            <td><%= round_it e[:db_runtime] %> ms</td>
+            <td><%= ms e[:duration] %></td>
+            <td><%= ms e[:view_runtime] %></td>
+            <td><%= ms e[:db_runtime] %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/rails_performance/crashes.html.erb

@@ -6,8 +6,8 @@
         <tr>
           <th>Datetime</th>
           <th>Controller#Action</th>
-          <th>Format</th>
           <th>Method</th>
+          <th>Format</th>
           <th>Path</th>
           <th>Status</th>
           <th>Duration</th>
@@ -16,23 +16,17 @@
         </tr>
       </thead>
       <tbody>
-        <% @crash_report_data.each do |e| %>
+        <% @data.each do |e| %>
           <tr>
-            <td><%= l e[:datetime], format: :short %></td>
+            <td><%= format_datetime e[:datetime] %></td>
             <td><%= e[:controller] + '#' + e[:action] %></td>
-            <td><%= e[:format] %></td>
             <td><%= e[:method] %></td>
-            <td>
-              <% if e[:method] == 'GET' %>
-                <%= link_to e[:path], e[:path], target: '_blank' %>
-              <% else %>
-                <%= e[:path] %>
-              <% end %>
-            </td>
+            <td><%= e[:format] %></td>
+            <td><%= link_to_path(e) %></td>
             <td><%= status_tag e[:status] %></td>
-            <td><%= round_it e[:duration] %> ms</td>
-            <td><%= round_it e[:view_runtime] %> ms</td>
-            <td><%= round_it e[:db_runtime] %> ms</td>
+            <td><%= ms e[:duration] %></td>
+            <td><%= ms e[:view_runtime] %></td>
+            <td><%= ms e[:db_runtime] %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/rails_performance/recent.html.erb

@@ -8,8 +8,8 @@
         <tr>
           <th>Datetime</th>
           <th>Controller#Action</th>
-          <th>Format</th>
           <th>Method</th>
+          <th>Format</th>
           <th>Path</th>
           <th>Status</th>
           <th>Duration</th>
@@ -22,19 +22,13 @@
           <tr>
             <td><%= format_datetime e[:datetime] %></td>
             <td><%= e[:controller] + '#' + e[:action] %></td>
-            <td><%= e[:format] %></td>
             <td><%= e[:method] %></td>
-            <td>
-              <% if e[:method] == 'GET' %>
-                <%= link_to e[:path], e[:path], target: '_blank' %>
-              <% else %>
-                <%= e[:path] %>
-              <% end %>
-            </td>
+            <td><%= e[:format] %></td>
+            <td><%= link_to_path(e) %></td>
             <td><%= status_tag e[:status] %></td>
-            <td><%= round_it e[:duration] %> ms</td>
-            <td><%= round_it e[:view_runtime] %> ms</td>
-            <td><%= round_it e[:db_runtime] %> ms</td>
+            <td><%= ms e[:duration] %></td>
+            <td><%= ms e[:view_runtime] %></td>
+            <td><%= ms e[:db_runtime] %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/rails_performance/requests.html.erb

@@ -21,24 +21,24 @@
         </tr>
       </thead>
       <tbody>
-        <% @global_report_data.each do |e| %>
+        <% @data.each do |e| %>
           <% groups = e[:group].split("|") %>
           <% c, a = groups[0].split("#") %>
           <tr>
             <td>
-              <%= statistics_link groups[0], @global_report, e[:group] %>
+              <%= statistics_link groups[0], @report, e[:group] %>
               <%= link_to rails_performance.rails_performance_breakdown_path(controller_eq: c, action_eq: a), class: 'stats_icon', target: '_blank' do %>
-                <%= raw(stats_icon) %>
+                <%= icon("stat") %>
               <% end %>
             </td>
-            <td><%= statistics_link groups[1]&.upcase, @global_report, e[:group] %></td>
+            <td><%= statistics_link groups[1]&.upcase, @report, e[:group] %></td>
             <td><%= e[:count] %></td>
-            <td><%= round_it e[:duration_average] %> ms</td>
-            <td><%= round_it e[:view_runtime_average] %> ms</td>
-            <td><%= round_it e[:db_runtime_average] %> ms</td>
-            <td><%= round_it e[:duration_slowest] %> ms</td>
-            <td><%= round_it e[:view_runtime_slowest] %> ms</td>
-            <td><%= round_it e[:db_runtime_slowest] %> ms</td>
+            <td><%= ms e[:duration_average] %></td>
+            <td><%= ms e[:view_runtime_average] %></td>
+            <td><%= ms e[:db_runtime_average] %></td>
+            <td><%= ms e[:duration_slowest] %></td>
+            <td><%= ms e[:view_runtime_slowest] %></td>
+            <td><%= ms e[:db_runtime_slowest] %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/shared/_header.html.erb

@@ -26,6 +26,9 @@
         <div class="buttons">
           <%#= link_to 'Export to CSV', '#', target: '_blank', class: "button is-primary" %>
           <%= link_to 'Documentation', 'https://github.com/igorkasyanchuk/rails_performance', target: '_blank', class: "button is-light" %>
+          <%= link_to '/', target: '_blank', class: "button is-light home_icon" do %>
+            <%= icon('home') %>
+          <% end %>
         </div>
       </div>
     </div>

data/app/views/stylesheets/style.css

@@ -3,6 +3,11 @@
   height: 16px;
 }
 
+.home_icon svg {
+  width: 24px;
+  height: 24px;
+}
+
 .chart {
   height: 255px;
 }

data/lib/rails_performance/reports/requests_report.rb

@@ -20,7 +20,7 @@ module RailsPerformance
             view_runtime_slowest: view_runtimes.max,
             db_runtime_slowest:   db_runtimes.max,
           }
-        end.sort{|a, b| b[sort] <=> a[sort]}
+        end.sort_by{|e| -e[sort].to_f} # to_f because could ne NaN or nil
       end
     end
   end

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.10'
+  VERSION = '0.0.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.10
+  version: 0.0.1.11
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -91,6 +91,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/rails_performance_manifest.js
+- app/assets/images/home.svg
 - app/assets/images/stat.svg
 - app/controllers/rails_performance_controller.rb
 - app/helpers/rails_performance_helper.rb