rails_mini_profiler 0.4.0 → 0.7.1

data/app/presenters/rails_mini_profiler/profiled_request_presenter.rb

@@ -15,21 +15,14 @@ module RailsMiniProfiler
     end
 
     def created_at
-      time_tag(model.created_at.in_time_zone(Time.zone))
-    end
-
-    def flamegraph_icon
-      return nil unless RailsMiniProfiler.configuration.flamegraph_enabled
-
-      if model.flamegraph.present?
-        link_to(flamegraph_path(model.id), title: 'Show Flamegraph') do
-          inline_svg('graph.svg')
-        end
-      else
-        link_to(flamegraph_path(model.id), title: 'No Flamegraph present for this request', class: 'link-disabled') do
-          inline_svg('graph.svg')
-        end
-      end
+      from_time = Time.now
+      created_at = model.created_at.in_time_zone(Time.zone)
+      distance = if from_time - created_at < 5.minutes
+                   'Now'
+                 else
+                   "#{distance_of_time_in_words(from_time, created_at)} ago"
+                 end
+      time_tag(created_at) { content_tag('span', distance) }
     end
 
     def flamegraph_button
@@ -37,8 +30,8 @@ module RailsMiniProfiler
 
       return nil unless model.flamegraph.present?
 
-      link_to(flamegraph_path(model.id), title: 'Show Flamegraph', class: 'flamegraph-button') do
-        content_tag('button', 'Flamegraph')
+      link_to(flamegraph_path(model.id), title: 'Show Flamegraph') do
+        content_tag('button', 'Flamegraph', class: 'btn-grey')
       end
     end
   end

data/app/presenters/rails_mini_profiler/render_partial_trace_presenter.rb

@@ -2,10 +2,14 @@
 
 module RailsMiniProfiler
   class RenderPartialTracePresenter < TracePresenter
+    def identifier
+      payload['identifier']
+    end
+
     def label
       root = Rails.root.to_s.split('/').to_set
-      identifier = model.identifier.split('/').to_set
-      (root ^ identifier).drop(2).join('/').reverse.truncate(30).reverse
+      id = identifier.split('/').to_set
+      (root ^ id).drop(2).join('/').reverse.truncate(30).reverse
     end
   end
 end

data/app/presenters/rails_mini_profiler/render_template_trace_presenter.rb

@@ -2,10 +2,14 @@
 
 module RailsMiniProfiler
   class RenderTemplateTracePresenter < TracePresenter
+    def identifier
+      payload['identifier']
+    end
+
     def label
       root = Rails.root.to_s.split('/').to_set
-      identifier = model.identifier.split('/').to_set
-      (root ^ identifier).drop(2).join('/').reverse.truncate(30).reverse
+      id = identifier.split('/').to_set
+      (root ^ id).drop(2).join('/').reverse.truncate(30).reverse
     end
 
     def description

data/app/presenters/rails_mini_profiler/sequel_trace_presenter.rb

@@ -6,14 +6,26 @@ module RailsMiniProfiler
       sql_description
     end
 
+    def name
+      payload['name']
+    end
+
+    def sql
+      payload['sql']
+    end
+
+    def binds
+      payload['binds']
+    end
+
     alias description label
 
-    def payload
+    def content
       return nil if transaction?
 
       content_tag('div') do
         content_tag('pre', class: 'trace-payload') do
-          content_tag(:div, model.sql, class: 'sequel-trace-query')
+          content_tag(:div, sql, class: 'sequel-trace-query')
         end + binding_content
       end
     end
@@ -57,9 +69,9 @@ module RailsMiniProfiler
     end
 
     def simple_binds
-      return [] if model.binds.nil? || model.binds.empty?
+      return [] if binds.nil? || binds.empty?
 
-      model.binds.each_with_object({}) do |hash, object|
+      binds.each_with_object({}) do |hash, object|
         name = hash['name']
         value = hash['value']
         object[name] = value

data/app/presenters/rails_mini_profiler/trace_presenter.rb

@@ -2,9 +2,12 @@
 
 module RailsMiniProfiler
   class TracePresenter < BasePresenter
-    def initialize(trace, view, profiled_request:)
+    def initialize(trace, view, context: {})
       super(trace, view)
-      @profiled_request = profiled_request
+      @start = context[:start]
+      @finish = context[:finish]
+      @total_duration = context[:total_duration]
+      @total_allocations = context[:total_allocations]
     end
 
     def label
@@ -15,7 +18,7 @@ module RailsMiniProfiler
       label
     end
 
-    def payload
+    def content
       nil
     end
 
@@ -38,7 +41,7 @@ module RailsMiniProfiler
     end
 
     def duration_percent
-      (model.duration.to_f / @profiled_request.duration * 100).round
+      (model.duration.to_f / @total_duration * 100).round
     end
 
     def allocations
@@ -46,16 +49,15 @@ module RailsMiniProfiler
     end
 
     def allocations_percent
-      (model.allocations.to_f / @profiled_request.allocations * 100).round
+      (model.allocations.to_f / @total_allocations * 100).round
     end
 
     def from_start
-      (model.start - @profiled_request.start).to_f / 100
+      (model.start - @start).to_f / 100
     end
 
     def from_start_percent
-      ((model.start - @profiled_request.start).to_f /
-        (@profiled_request.finish - @profiled_request.start)).to_f * 100
+      ((model.start - @start).to_f / (@finish - @start)).to_f * 100
     end
   end
 end

data/app/search/rails_mini_profiler/base_search.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  class BaseSearch
+    def initialize(params = nil, **kwargs)
+      config = self.class.config
+      options = params&.to_h || {}
+      options = options.merge(kwargs)
+      @scope = options.delete(:scope) || (config[:scope] && instance_eval(&config[:scope]))
+      @options = (options.delete(:options) || config[:options]).stringify_keys
+      @params = options.stringify_keys.slice(*@options.keys)
+    end
+
+    def results
+      @results ||= apply
+    end
+
+    def results?
+      results.any?
+    end
+
+    class << self
+      def scope(&block)
+        config[:scope] = block
+      end
+
+      def option(name, options = {}, &block)
+        name = name.to_s
+        handler = options[:with] || block
+
+        config[:options][name] = normalize_search_handler(handler, name)
+
+        define_method(name) { @search.param name }
+      end
+
+      def results(**kwargs)
+        new(**kwargs).results
+      end
+
+      def config
+        @config ||= { options: {} }
+      end
+
+      private
+
+      def normalize_search_handler(handler, name)
+        case handler
+        when Symbol
+          ->(scope, value) { method(handler).call scope, value }
+        when Proc
+          handler
+        else
+          ->(scope, value) { scope.where name => value unless value.blank? }
+        end
+      end
+    end
+
+    private
+
+    def apply
+      @params.inject(@scope) do |scope, (name, value)|
+        new_scope = instance_exec scope, value, &@options[name]
+        new_scope || scope
+      end
+    end
+  end
+end

data/app/search/rails_mini_profiler/profiled_request_search.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  class ProfiledRequestSearch < BaseSearch
+    option(:id) do |scope, value|
+      scope.where(id: value)
+    end
+
+    option(:path) do |scope, value|
+      scope.where('request_path LIKE ?', "%#{value}%")
+    end
+
+    option(:method) do |scope, value|
+      scope.where(request_method: value)
+    end
+
+    option(:media_type) do |scope, value|
+      scope.where(response_media_type: value)
+    end
+
+    option(:status) do |scope, value|
+      value = value.map(&:to_i)
+      min = value.min
+      max = value.max + 100
+      scope.where('response_status >= :lower', lower: min)
+        .where('response_status < :upper', upper: max)
+    end
+
+    option(:duration) do |scope, value|
+      scope.where('duration > :duration', duration: value)
+    end
+  end
+end

data/app/search/rails_mini_profiler/trace_search.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  class TraceSearch < BaseSearch
+    option(:name) do |scope, value|
+      scope.where(name: value)
+    end
+
+    option(:duration) do |scope, value|
+      scope.where('duration > :duration', duration: value)
+    end
+
+    option(:allocations) do |scope, value|
+      scope.where('allocations > :allocations', allocations: value)
+    end
+
+    option(:payload) do |scope, value|
+      payload_column = DatabaseAdapter.cast_to_text(:payload)
+      scope.where("#{payload_column} LIKE ?", "%#{value}%")
+    end
+
+    option(:backtrace) do |scope, value|
+      backtrace_column = Adapters::DatabaseAdapter.cast_to_text(:backtrace)
+      scope.where("#{backtrace_column} LIKE ?", "%#{value}%")
+    end
+  end
+end

data/app/views/rails_mini_profiler/badge.html.erb

@@ -25,13 +25,13 @@
       transition: opacity 0.3s;
   }
 
-  #rails-mini-profiler-badge-icon {
+  #logo-variant {
     height: 18px;
     width: 18px;
     padding-bottom: 2px;
   }
 </style>
 <a id="rails-mini-profiler-badge" href="<%= profiled_request_path(@profiled_request.id) %>" data-turbolinks="false" title="View performance data">
-  <%= inline_svg('logo_variant.svg', id: "rails-mini-profiler-badge-icon") %>
+  <%= inline_svg('logo_variant.svg') %>
   <%= (@profiled_request.duration.to_f / 100).round %>ms
 </a>

data/app/views/rails_mini_profiler/profiled_requests/index.html.erb

@@ -1,59 +1,9 @@
-<% if @profiled_requests.empty? %>
-  <section class="placeholder">
-    <%= inline_svg('logo_variant.svg', class: 'placeholder-image') %>
-    <div class="placeholder-text">
-      <h2> There is nothing here yet! </h2>
-      <p>Send some requests to your app for them to show up here</p>
-    </div>
-  </section>
-<% else %>
-  <h1>Profiled Requests</h1>
-  <div class="profiled-requests-actions">
-    <%= form_with id: 'profiled-request-search-form', url: profiled_requests_url, method: :get do |form| %>
-      <%= form.search_field :path, id: 'profiled-request-search', placeholder: 'Search Path...', class: 'search-field' %>
-    <% end %>
-    <%= link_to(destroy_all_profiled_requests_url,
-                method: :delete,
-                class: 'clear-action',
-                data: { confirm: "This will delete all requests. Are you sure?" }) do %>
-      <button>Clear Requests</button>
-    <% end %>
-  </div>
-  <table id="profiled-requests-table" class="table">
-    <thead>
-    <tr>
-      <th class="text-left">Path</th>
-      <th class="text-left">Method</th>
-      <th class="text-left">Status</th>
-      <th class="text-left">Media Type</th>
-      <th class="text-right">Duration</th>
-      <th class="text-left"></th>
-      <th class="text-left"></th>
-    </tr>
-    </thead>
 
-    <tbody>
-    <% @profiled_requests.each do |profiled_request| %>
-      <tr data-link="<%= profiled_request_path(profiled_request.id)%>">
-        <td class="request-path"><%= profiled_request.request_name %></td>
-        <td> <%= profiled_request.request_method %> </td>
-        <td> <%= profiled_request.response_status %> </td>
-        <td> <%= profiled_request.response_media_type %> </td>
-        <td class="text-right"><%= profiled_request.duration %> ms</td>
-        <td class=""><%= profiled_request.created_at %></td>
-        <td class="request-buttons">
-          <%= link_to(profiled_request_path(profiled_request.id), title: 'Show Details') do %>
-            <%= inline_svg('show.svg', options = {}) %>
-          <% end %>
-          <%= profiled_request.flamegraph_icon %>
-          <%= link_to(profiled_request_path(profiled_request.id), title: 'Delete Request', method: :delete) do %>
-            <%= inline_svg('delete.svg') %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-  <%== pagy_nav(@pagy) %>
-  <br>
-<% end %>
+<div
+  data-controller="filters selectable"
+  data-action="search-controller:submit@window->filters#apply">
+  <%= render "rails_mini_profiler/profiled_requests/shared/header/header" %>
+  <%= render "rails_mini_profiler/profiled_requests/shared/table/table" %>
+</div>
+<%== pagy_nav(@pagy) if @pagy.pages > 1 %>
+<br>

data/app/views/rails_mini_profiler/profiled_requests/shared/header/_header.erb

@@ -0,0 +1,19 @@
+<div class="page-header profiled-requests-header">
+  <div class="">
+    <h1>Profiled Requests</h1>
+  </div>
+  <div>
+    <%= button_tag('Delete Selected',
+                   disabled: params[:id].blank?,
+                   data: {
+                     controller: 'enable',
+                     'enable-target': 'enable',
+                     action: 'rmp:select:change@window->enable#change click->filters#post'
+                   }) -%>
+    <%= link_to(destroy_all_profiled_requests_url,
+                method: :delete,
+                data: { confirm: "This will delete all requests. Are you sure?" }) do %>
+      <%= button_tag('Delete All', class: 'btn-red') %>
+    <% end %>
+  </div>
+</div>

data/app/views/rails_mini_profiler/profiled_requests/shared/table/_placeholder.erb

@@ -0,0 +1,12 @@
+<tr class="no-row">
+  <td colspan="100%">
+    <div class="placeholder">
+      <%= inline_svg('logo_variant.svg', class: 'placeholder-image') %>
+      <div class="placeholder-text">
+        <h2>No Requests found!</h2>
+        <p>Send some requests to your app or modify your filters</p>
+      </div>
+      <%= link_to('Clear Filters', profiled_requests_path, class: 'placeholder-link') %>
+    </div>
+  </td>
+</tr>

data/app/views/rails_mini_profiler/profiled_requests/shared/table/_table.erb

@@ -0,0 +1,14 @@
+<table
+  id="profiled-requests-table"
+  class="table">
+  <%= render "rails_mini_profiler/profiled_requests/shared/table/table_head" %>
+  <tbody>
+  <% if @profiled_requests.empty? %>
+    <%= render "rails_mini_profiler/profiled_requests/shared/table/placeholder" %>
+  <% else %>
+    <% @profiled_requests.each do |profiled_request| %>
+      <%= render "rails_mini_profiler/profiled_requests/shared/table/table_row", profiled_request: profiled_request %>
+    <% end %>
+  <% end %>
+  </tbody>
+</table>

data/app/views/rails_mini_profiler/profiled_requests/shared/table/_table_head.erb

@@ -0,0 +1,125 @@
+<thead>
+<tr>
+  <th style="width: 20px;" class="text-left">
+    <%= label_tag nil do %>
+      <%= check_box_tag 'selected[]', nil,
+                        params.fetch(:selected, []).size == @pagy.items,
+                        class: "request-checkbox",
+                        data: {
+                          action: 'click->selectable#selectAll',
+                          'selectable-target': 'all'
+                        }
+      %>
+    <% end %>
+  </th>
+  <th style="width: 25%;" class="text-left" data-controller="dropdown">
+    <button data-action="click->dropdown#toggle click@window->dropdown#hide" data-dropdown-target="button" class="dropdown-toggle none">
+      Path <%= inline_svg('search.svg', class: 'table-filter-icon') %> </button>
+    <div data-controller="search" data-dropdown-target="menu" class="dropdown-container hidden">
+      <div class="dropdown-body">
+        <%= form_with url: profiled_requests_url, method: :get do |form| %>
+          <%= form.search_field :path,
+                                value: params[:path],
+                                placeholder: 'Search Path',
+                                class: 'dropdown-search-field',
+                                data: { 'filters-target': 'filter' } %>
+          <%= form.submit 'Search', class: 'btn-red', data: { action: 'click->search#submit' } -%>
+        <% end %>
+      </div>
+    </div>
+  </th>
+  <th style="width: 10%;" class="" data-controller="dropdown">
+    <button data-action="click->dropdown#toggle click@window->dropdown#hide" data-dropdown-target="button" class="dropdown-toggle none">
+      Method <%= inline_svg('filter.svg', class: 'table-filter-icon') %> </button>
+    <div data-controller="checklist" data-dropdown-target="menu" class="dropdown-container hidden">
+      <div class="dropdown-header">
+        Select Method...
+        <button class="clear-filters" data-action="checklist#checkNone">
+          Clear filter
+        </button>
+      </div>
+      <% %w[get put post delete].map(&:upcase).each do |method| %>
+        <%= label_tag nil, class: "dropdown-entry" do %>
+          <%= check_box_tag 'method[]', method, params.fetch(:method, []).include?(method),
+                            class: "",
+                            data: { 'filters-target': "filter" } %>
+          <%= method %>
+        <% end %>
+      <% end %>
+      <button class="dropdown-footer" data-action="filters#apply">
+        Apply
+      </button>
+    </div>
+  </th>
+  <th style="width: 10%;" class="" data-controller="dropdown">
+    <button data-action="click->dropdown#toggle click@window->dropdown#hide" data-dropdown-target="button" class="dropdown-toggle none">
+      Status <%= inline_svg('filter.svg', class: 'table-filter-icon') %> </button>
+    <div data-controller="checklist" data-dropdown-target="menu" class="dropdown-container hidden">
+      <div class="dropdown-header">
+        Select Status...
+        <button class="clear-filters" data-action="checklist#checkNone filters#apply">
+          Clear filter
+        </button>
+      </div>
+      <% %w[200 300 400 500].each do |status| %>
+        <%= label_tag nil, class: "dropdown-entry" do %>
+          <%= check_box_tag 'status[]', status, params.fetch(:status, []).include?(status),
+                            class: "",
+                            data: { 'filters-target': "filter" } %>
+          <%= status %>
+        <% end %>
+      <% end %>
+      <button class="dropdown-footer" data-action="filters#apply">
+        Apply
+      </button>
+    </div>
+  </th>
+  <th style="width: 15%;" class="" data-controller="dropdown">
+    <button data-action="click->dropdown#toggle click@window->dropdown#hide" data-dropdown-target="button" class="dropdown-toggle none">
+      Media Type <%= inline_svg('filter.svg', class: 'table-filter-icon') %> </button>
+    <div data-controller="checklist" data-dropdown-target="menu" class="dropdown-container hidden">
+      <div class="dropdown-header">
+        Select Media Type...
+        <button class="clear-filters" data-action="checklist#checkNone filters#apply">
+          Clear filter
+        </button>
+      </div>
+      <% %w[text/html application/json application/xml].each do |media_type| %>
+        <%= label_tag nil, class: "dropdown-entry" do %>
+          <%= check_box_tag 'media_type[]', media_type, params.fetch(:media_type, []).include?(media_type),
+                            class: "",
+                            data: { target: "filters.filter" } %>
+          <%= media_type %>
+        <% end %>
+      <% end %>
+      <button class="dropdown-footer" data-action="filters#apply">
+        Apply
+      </button>
+    </div>
+  </th>
+  <th style="width: 10%;" class="text-left" data-controller="dropdown">
+    <button data-action="click->dropdown#toggle click@window->dropdown#hide" data-dropdown-target="button" class="dropdown-toggle none">
+      Duration <%= inline_svg('filter.svg', class: 'table-filter-icon') %> </button>
+    <div data-controller="checklist" data-dropdown-target="menu" class="dropdown-container hidden">
+      <div class="dropdown-header">
+        Select Duration...
+        <button class="clear-filters" data-action="checklist#checkNone filters#apply">
+          Clear filter
+        </button>
+      </div>
+      <% [100_00, 250_00, 500_00].each do |duration| %>
+        <%= label_tag nil, class: "dropdown-entry" do %>
+          <%= radio_button_tag 'duration', duration.to_s , params.fetch(:duration, []).include?(duration.to_s),
+                               class: "",
+                               data: { target: "filters.filter" } %>
+          <%= "> #{duration / 100}ms" %>
+        <% end %>
+      <% end %>
+      <button class="dropdown-footer" data-action="filters#apply">
+        Apply
+      </button>
+    </div>
+  </th>
+  <th style="width: 15%;" class="text-left">Date</th>
+</tr>
+</thead>

data/app/views/rails_mini_profiler/profiled_requests/shared/table/_table_row.erb

@@ -0,0 +1,21 @@
+<tr data-link="<%= profiled_request_path(profiled_request.id) %>">
+  <td class="">
+    <%= label_tag nil do %>
+      <%= check_box_tag 'id[]', profiled_request.id,
+                        params.fetch(:selected, []).include?(profiled_request.id),
+                        class: "request-checkbox",
+                        data: {
+                          'selectable-target': 'selectable',
+                          'filters-target': 'filter',
+                           action: 'click->selectable#onSelected'
+                        },
+                        onclick: "event.stopPropagation();" %>
+    <% end %>
+  </td>
+  <td class="request-path"><%= profiled_request.request_name %></td>
+  <td class="text-left"> <%= profiled_request.request_method %> </td>
+  <td class="text-left"> <%= profiled_request.response_status %> </td>
+  <td class="text-left"> <%= profiled_request.response_media_type %> </td>
+  <td class="text-left"><%= profiled_request.duration %> ms</td>
+  <td class="text-left"><%= profiled_request.created_at %></td>
+</tr>

data/app/views/rails_mini_profiler/profiled_requests/{shared → show}/_trace.html.erb

@@ -7,8 +7,29 @@
         <button class="popover-close">x</button>
       </section>
       <section class="popover-body">
-        <%= trace.payload %>
-        <table class="trace-table">
+        <%= trace.content %>
+
+        <% if trace.backtrace %>
+          <section class="popover-footer">
+            <div
+              class="backtrace"
+              data-controller="clipboard"
+              data-clipboard-filter=".+?(?=:in)"
+              data-clipboard-copied-message="Copied" >
+              <pre data-clipboard-target="source"><%= trace.backtrace %></pre>
+              <button
+                title="Copy to clipboard"
+                type="button"
+                data-action="clipboard#copy"
+                data-clipboard-target="button"
+              >
+                <%= inline_svg('copy.svg') %>
+              </button>
+            </div>
+          </section>
+        <% end %>
+
+        <table class="trace-details-table">
           <thead>
           <tr>
             <th class="text-left"></th>
@@ -30,11 +51,7 @@
         </table>
       </section>
 
-      <% if trace.backtrace %>
-        <section class="popover-footer">
-          <pre><%= trace.backtrace %></pre>
-        </section>
-      <% end %>
+
     </div>
   </div>
 </li>

data/app/views/rails_mini_profiler/profiled_requests/show/_trace_list.erb

@@ -0,0 +1,12 @@
+<section class="trace-list">
+  <%= render "rails_mini_profiler/profiled_requests/show/trace_list_header" %>
+  <% if @traces.empty? %>
+    <%= render "rails_mini_profiler/profiled_requests/show/trace_list_placeholder" %>
+  <% else %>
+    <ol>
+      <% @traces.each do |trace| %>
+        <%= render "rails_mini_profiler/profiled_requests/show/trace", trace: trace %>
+      <% end %>
+    </ol>
+  <% end %>
+</section>