rails_mini_profiler 0.4.0 → 0.5.0

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,20 @@
+<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,
+                class: 'clear-action',
+                data: { confirm: "This will delete all requests. Are you sure?" }) do %>
+      <%= button_tag('Delete All') %>
+    <% 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: 'dropdown-search-button', 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>
+      <% %w[>100ms >250ms].each do |duration| %>
+        <%= label_tag nil, class: "dropdown-entry" do %>
+          <%= radio_button_tag 'duration', duration, params.fetch(:duration, []).include?(duration),
+                               class: "",
+                               data: { target: "filters.filter" } %>
+          <%= duration %>
+        <% 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/show.html.erb

@@ -1,4 +1,4 @@
-<section class="request-details">
+<section class="page-header">
   <h1> <%= @profiled_request.request_path %> </h1>
 
   <ul class="request-details-data">

data/lib/rails_mini_profiler/configuration.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'rails_mini_profiler/configuration/storage'
+require 'rails_mini_profiler/configuration/user_interface'
+
 module RailsMiniProfiler
   # The main Rails Mini Profiler configuration object
   #

data/lib/rails_mini_profiler/engine.rb

@@ -11,14 +11,6 @@ module RailsMiniProfiler
       app.middleware.use(RailsMiniProfiler::Middleware)
     end
 
-    initializer 'rails_mini_profiler.assets.precompile', group: :all do |app|
-      app.config.assets.precompile += %w[
-        rails_mini_profiler.js
-        rails_mini_profiler/application.css
-        vendor/assets/images
-      ]
-    end
-
     config.generators do |g|
       g.test_framework :rspec
     end
@@ -26,5 +18,17 @@ module RailsMiniProfiler
     initializer 'rails_mini_profiler_add_static assets' do |app|
       app.middleware.insert_before(ActionDispatch::Static, ActionDispatch::Static, "#{root}/public")
     end
+
+    # If sprockets is not being used then there is no need to hook into asset compilation. Calling config.assets
+    # without Sprockets installed breaks compilation.
+    if defined?(Sprockets::Rails)
+      initializer 'rails_mini_profiler.assets.precompile', group: :all do |app|
+        app.config.assets.precompile += %w[
+          rails_mini_profiler.js
+          rails_mini_profiler/application.css
+          vendor/assets/images
+        ]
+      end
+    end
   end
 end

data/lib/rails_mini_profiler/middleware.rb

@@ -5,7 +5,7 @@ module RailsMiniProfiler
     def initialize(app)
       @app = app
       @config = RailsMiniProfiler.configuration
-      Tracers.setup! { |trace| track_trace(trace) }
+      Tracing::Subscriptions.setup! { |trace| track_trace(trace) }
     end
 
     def call(env)
@@ -33,8 +33,8 @@ module RailsMiniProfiler
     def track_trace(event)
       return if traces.nil?
 
-      trace = Tracers.build_trace(event)
-      traces.append(trace)
+      trace = RailsMiniProfiler::Tracing::TraceFactory.create(event)
+      traces.append(trace) unless trace.is_a?(RailsMiniProfiler::Tracing::NullTrace)
     end
 
     private

data/lib/rails_mini_profiler/tracing/controller_tracer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  module Tracing
+    class ControllerTracer < Tracer
+      def trace
+        @event[:payload] = @event[:payload]
+                             .slice(:view_runtime, :db_runtime)
+                             .reject { |_k, v| v.blank? }
+                             .transform_values { |value| value&.round(2) }
+        super
+      end
+    end
+  end
+end

data/lib/rails_mini_profiler/tracing/null_trace.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  module Tracing
+    class NullTrace < Trace; end
+  end
+end

data/lib/rails_mini_profiler/tracing/sequel_tracer.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  module Tracing
+    class SequelTracer < Tracer
+      def trace
+        return NullTrace.new if ignore?
+
+        payload = @event[:payload].slice(:name, :sql, :binds, :type_casted_binds)
+        typecasted_binds = payload[:type_casted_binds]
+        # Sometimes, typecasted binds are a proc. Not sure why. In those instances, we extract the typecasted
+        # values from the proc by executing call.
+        typecasted_binds = typecasted_binds.call if typecasted_binds.respond_to?(:call)
+        payload[:binds] = transform_binds(payload[:binds], typecasted_binds)
+        payload.delete(:type_casted_binds)
+        payload.reject { |_k, v| v.blank? }
+        @event[:payload] = payload
+        super
+      end
+
+      private
+
+      def transform_binds(binds, type_casted_binds)
+        binds.each_with_object([]).with_index do |(binding, object), i|
+          name = binding.name
+          value = type_casted_binds[i]
+          object << { name: name, value: value }
+        end
+      end
+
+      def ignore?
+        payload = @event[:payload]
+        !SqlTracker.new(name: payload[:name], query: payload[:sql]).track?
+      end
+    end
+  end
+end

data/lib/rails_mini_profiler/tracing/sequel_tracker.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RailsMiniProfiler
+  module Tracing
+    class SqlTracker
+      TRACKED_SQL_COMMANDS = %w[SELECT INSERT UPDATE DELETE].freeze
+      UNTRACKED_NAMES = %w[SCHEMA].freeze
+      UNTRACKED_TABLES = %w[
+        SCHEMA_MIGRATIONS
+        SQLITE_MASTER
+        ACTIVE_MONITORING_METRICS
+        SQLITE_TEMP_MASTER
+        SQLITE_VERSION
+        AR_INTERNAL_METADATA
+      ].freeze
+
+      def initialize(query:, name:)
+        @query = query.to_s.upcase
+        @name = name.to_s.upcase
+      end
+
+      def track?
+        query.start_with?(*TRACKED_SQL_COMMANDS) &&
+          !name.start_with?(*UNTRACKED_NAMES) &&
+          !untracked_tables?
+      end
+
+      private
+
+      attr_reader :query, :name
+
+      def untracked_tables?
+        UNTRACKED_TABLES.any? { |table| query.include?(table) }
+      end
+    end
+  end
+end