rails_mini_profiler 0 → 0.1.0

data/app/assets/stylesheets/rails_mini_profiler/profiled_requests.css

@@ -0,0 +1,180 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
+
+
+main {
+  width: 100%;
+
+  display: flex;
+  justify-content: center;
+}
+
+.main-section {
+  width: var(--main-width);
+}
+
+.placeholder {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 450px;
+}
+
+.placeholder-image {
+  height: 30%;
+  width: 30%;
+  -webkit-filter: grayscale(1) brightness(2.5);
+}
+
+.placeholder-text {
+  text-align: center;
+  color: var(--grey-400);
+}
+
+.profiled-requests-actions {
+  display: flex;
+  padding: 1rem 0;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.search-field {
+  padding: 0.5rem .5rem;
+  border-radius: .25em;
+
+  border: 1px solid var(--grey-400);
+  color: var(--grey-700) ;
+}
+
+.clear-action button {
+  background: var(--red-500);
+  color: white;
+}
+
+.table {
+  width: 100%;
+  /* Hack to get table row borders, see https://stackoverflow.com/a/2586780/2553104 */
+  border-collapse: collapse;
+  border-radius: 5px;
+  border: hidden 1px var(--border-color);
+  box-shadow: 0 0 0 1px var(--border-color);
+}
+
+.table thead tr {
+  color: var(--grey-400);
+}
+
+.table thead th {
+  font-weight: 400;
+}
+
+.table tr {
+  border: solid 1px var(--border-color);
+  color: var(--grey-700);
+  cursor: pointer;
+}
+
+.table tr:nth-child(even) {
+  background: var(--grey-50);
+}
+
+.table tbody tr:hover {
+  background: var(--grey-100);
+}
+
+.table th,
+.table td {
+  padding: 0.5rem 1rem;
+}
+
+.request-path {
+  max-width: 300px;
+
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.request-buttons {
+  z-index: 1;
+  text-align: right;
+}
+
+.request-buttons a {
+  text-decoration: none;
+  padding: 0 .25rem;
+  color: var(--grey-700);
+}
+
+.request-buttons a:active,
+.request-buttons a:focus-visible,
+.request-buttons a:hover {
+  color: var(--blue-500);
+}
+
+.request-buttons a.link-disabled {
+  cursor: default;
+  pointer-events: none;
+  text-decoration: none;
+  color: var(--grey-200);
+}
+
+.request-details-data {
+  display: flex;
+
+  margin: 0;
+  padding: 0;
+}
+
+.data-item {
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+  list-style: none;
+
+  margin-right: 3rem;
+  padding: 0;
+}
+
+.data-item small {
+  color: var(--grey-400);
+}
+
+.data-item span {
+  margin: .25rem 0;
+}
+
+[class*='request-status-2'],
+[class*='request-method-get'] {
+  color: white;
+  background: var(--green-400) !important;
+}
+
+[class*='request-status-4'],
+[class*='request-method-put'],
+[class*='request-method-patch'] {
+  color: white;
+  background: var(--yellow-400) !important;
+}
+
+[class*='request-status-5'],
+[class*='request-method-delete'] {
+  color: white;
+  background: var(--red-500) !important;
+}
+
+.request-details-actions {
+  margin: 0;
+  padding: 2em 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flamegraph-button button {
+  background: var(--grey-200);
+}

data/app/{javascript/stylesheets/traces.scss → assets/stylesheets/rails_mini_profiler/traces.css}

@@ -1,14 +1,19 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
+
 .trace-list {
-  padding: 0;
   margin: 0;
+  padding: 0;
 }
 
 .trace {
+  list-style: none;
   display: flex;
+  padding: .25em 0;
   align-items: center;
   justify-content: flex-start;
-  padding: 0.25em 0;
-  list-style: none;
 }
 
 .trace:nth-child(odd) {
@@ -17,11 +22,11 @@
 
 .trace .trace-bar {
   position: relative;
+  margin: 0;
   height: 16px;
   padding: 0;
-  margin: 0;
-  background: linear-gradient(to top right, var(--grey-500), var(--grey-400));
   cursor: pointer;
+  background: linear-gradient(to top right, var(--grey-500), var(--grey-400));
 }
 
 .instantiation-trace .trace-bar {
@@ -42,14 +47,14 @@
 }
 
 .trace-name {
-  overflow: hidden;
-  box-sizing: border-box;
-  padding: 0 0.5em;
   margin: 0;
-  color: var(--grey-400);
+  box-sizing: border-box;
+  padding: 0 .5em;
+  overflow: hidden;
   font-size: 14px;
   text-align: right;
   text-overflow: ellipsis;
+  color: var(--grey-400)
 }
 
 .trace-payload {
@@ -57,26 +62,26 @@
 }
 
 .sequel-trace-query {
-  overflow: auto;
-  max-height: 100px;
   padding: 1em 1em;
   background: var(--grey-100);
+  overflow: auto;
+  max-height: 100px;
   white-space: pre-wrap;
 }
 
 .sequel-trace-binds {
-  overflow: auto;
-  max-height: 100px;
-  padding: 0.5em 1em;
   margin: 0 0 1em 0;
-  background: var(--grey-50);
+  padding: .5em 0;
   font-size: 12px;
+  overflow: auto;
+  max-height: 100px;
   white-space: pre-wrap;
+  background: var(--grey-50);
 }
 
 .trace-table {
-  width: 100%;
-  border: hidden 1px var(--border-color);
   margin-top: 1em;
+  width: 100%;
   border-collapse: collapse;
+  border: hidden 1px var(--border-color);
 }

data/app/controllers/rails_mini_profiler/application_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module RailsMiniProfiler
-  class ApplicationController < ActionController::Base
-    include Pagy::Backend
-
-    rescue_from ActiveRecord::RecordNotFound, with: ->(error) { handle(error, 404) }
+  class ApplicationController < ::ApplicationController
+    rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
     before_action :check_current_user
 
@@ -19,11 +17,8 @@ module RailsMiniProfiler
 
     private
 
-    def handle(error, status = 500)
-      respond_to do |format|
-        format.html { redirect_back(fallback_location: profiled_requests_path, alert: error.to_s) }
-        format.json { render status: status, json: { message: error.to_s } }
-      end
+    def not_found(error)
+      redirect_back(fallback_location: profiled_requests_path, alert: error.to_s)
     end
 
     def check_current_user

data/app/controllers/rails_mini_profiler/profiled_requests_controller.rb

@@ -7,15 +7,16 @@ module RailsMiniProfiler
     before_action :set_profiled_request, only: %i[show destroy]
 
     def index
-      @profiled_requests = ProfiledRequest.where(user_id: user_id).order(id: :desc)
-      search = ProfiledRequestSearch.new(index_params, scope: @profiled_requests)
-      @pagy, @profiled_requests = pagy(search.results, items: configuration.ui.page_size)
+      @profiled_requests = ProfiledRequest
+                             .includes(:flamegraph)
+                             .where(user_id: user_id).order(id: :desc)
+      @profiled_requests = @profiled_requests.where('request_path LIKE ?', "%#{params[:path]}%") if params[:path]
       @profiled_requests = @profiled_requests.map { |request| present(request) }
     end
 
     def show
       @traces = @profiled_request.traces
-      @traces = @traces.where("#{payload_column} LIKE ?", "%#{params[:search]}%") if params[:search]
+      @traces = @traces.where('payload LIKE ?', "%#{params[:search]}%") if params[:search]
       @traces = @traces
                   .order(:start)
                   .map { |trace| present(trace, profiled_request: @profiled_request) }
@@ -29,21 +30,16 @@ module RailsMiniProfiler
 
     def destroy_all
       ProfiledRequest.transaction do
-        profiled_requests = ProfiledRequest.where(user_id: user_id)
-        profiled_requests = ProfiledRequestSearch.new(index_params, scope: profiled_requests).results
-        Flamegraph.joins(:profiled_request).merge(profiled_requests).delete_all
-        Trace.joins(:profiled_request).merge(profiled_requests).delete_all
-        profiled_requests.delete_all
+        requests_table_name = RailsMiniProfiler.storage_configuration.profiled_requests_table.to_sym
+        Flamegraph.joins(:profiled_request).where(requests_table_name => { user_id: user_id }).delete_all
+        Trace.joins(:profiled_request).where(requests_table_name => { user_id: user_id }).delete_all
+        ProfiledRequest.where(requests_table_name => { user_id: user_id }).delete_all
       end
-      redirect_to profiled_requests_url, notice: 'Profiled requests cleared', status: :see_other
+      redirect_to profiled_requests_url, notice: 'Profiled Requests cleared'
     end
 
     private
 
-    def index_params
-      params.permit(:path, :duration, id: [], method: [], media_type: [], status: [])
-    end
-
     def user_id
       @user_id ||= User.get(request.env)
     end
@@ -55,14 +51,5 @@ module RailsMiniProfiler
     def configuration
       @configuration ||= RailsMiniProfiler.configuration
     end
-
-    def payload_column
-      if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        # Cast json field to text to have access to the LIKE operator
-        'payload::text'
-      else
-        'payload'
-      end
-    end
   end
 end

data/app/helpers/rails_mini_profiler/application_helper.rb

@@ -2,22 +2,11 @@
 
 module RailsMiniProfiler
   module ApplicationHelper
-    include Pagy::Frontend
-
     def present(model, presenter_class = nil, **kwargs)
       klass = presenter_class || "#{model.class}Presenter".constantize
       presenter = klass.new(model, self, **kwargs)
       yield(presenter) if block_given?
       presenter
     end
-
-    def inline_svg(path, options = {})
-      if defined?(Webpacker::Engine)
-        path = "media/images/#{path}"
-        inline_svg_pack_tag(path, options)
-      else
-        inline_svg_tag(path, options)
-      end
-    end
   end
 end

data/app/models/rails_mini_profiler/application_record.rb

@@ -3,7 +3,7 @@
 module RailsMiniProfiler
   class ApplicationRecord < ActiveRecord::Base
     if RailsMiniProfiler.storage_configuration.database.present?
-      establish_connection(RailsMiniProfiler.storage_configuration.database)
+      establish_connection(RailsMiniProfiler.storage_configuration.database.present?)
     end
 
     self.abstract_class = true

data/app/models/rails_mini_profiler/controller_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class ControllerTrace < Trace
     store :payload, accessors: %i[view_runtime db_runtime]

data/app/models/rails_mini_profiler/flamegraph.rb

@@ -10,10 +10,6 @@
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_flamegraphs_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class Flamegraph < RailsMiniProfiler::ApplicationRecord
     self.table_name = RailsMiniProfiler.storage_configuration.flamegraphs_table

data/app/models/rails_mini_profiler/instantiation_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class InstantiationTrace < Trace
     store :payload, accessors: %i[record_count class_name]

data/app/models/rails_mini_profiler/profiled_request.rb

@@ -4,27 +4,21 @@
 #
 # Table name: rmp_profiled_requests
 #
-#  id                   :integer          not null, primary key
-#  user_id              :string
-#  start                :bigint
-#  finish               :bigint
-#  duration             :integer
-#  allocations          :bigint
-#  request_path         :string
-#  request_query_string :string
-#  request_method       :string
-#  request_headers      :json
-#  request_body         :text
-#  response_status      :integer
-#  response_body        :text
-#  response_headers     :json
-#  response_media_type  :string
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#
-# Indexes
-#
-#  index_rmp_profiled_requests_on_created_at  (created_at)
+#  id               :integer          not null, primary key
+#  user_id          :string
+#  start            :integer
+#  finish           :integer
+#  duration         :integer
+#  allocations      :integer
+#  request_path     :string
+#  request_method   :string
+#  request_headers  :json
+#  request_body     :json
+#  response_status  :integer
+#  response_body    :json
+#  response_headers :json
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 module RailsMiniProfiler
   class ProfiledRequest < RailsMiniProfiler::ApplicationRecord

data/app/models/rails_mini_profiler/render_partial_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class RenderPartialTrace < Trace
     store :payload, accessors: %i[identifier]

data/app/models/rails_mini_profiler/render_template_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class RenderTemplateTrace < Trace
     store :payload, accessors: %i[identifier]

data/app/models/rails_mini_profiler/rmp_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class RmpTrace < Trace
     class << self

data/app/models/rails_mini_profiler/sequel_trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class SequelTrace < Trace
     store :payload, accessors: %i[name sql binds]

data/app/models/rails_mini_profiler/trace.rb

@@ -7,19 +7,15 @@
 #  id                      :integer          not null, primary key
 #  rmp_profiled_request_id :bigint           not null
 #  name                    :string
-#  start                   :bigint
-#  finish                  :bigint
+#  start                   :integer
+#  finish                  :integer
 #  duration                :integer
-#  allocations             :bigint
+#  allocations             :integer
 #  payload                 :json
 #  backtrace               :json
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #
-# Indexes
-#
-#  index_rmp_traces_on_rmp_profiled_request_id  (rmp_profiled_request_id)
-#
 module RailsMiniProfiler
   class Trace < RailsMiniProfiler::ApplicationRecord
     self.table_name = RailsMiniProfiler.storage_configuration.traces_table

data/app/presenters/rails_mini_profiler/profiled_request_presenter.rb

@@ -15,14 +15,21 @@ module RailsMiniProfiler
     end
 
     def created_at
-      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) }
+      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_tag('rails_mini_profiler/graph.svg')
+        end
+      else
+        link_to(flamegraph_path(model.id), title: 'No Flamegraph present for this request', class: 'link-disabled') do
+          inline_svg_tag('rails_mini_profiler/graph.svg')
+        end
+      end
     end
 
     def flamegraph_button

data/app/views/layouts/rails_mini_profiler/application.html.erb

@@ -1,6 +1,17 @@
 <!DOCTYPE html>
 <html>
-<%= render 'rails_mini_profiler/shared/head' %>
+<head>
+  <title>Rails Mini Profiler</title>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%= javascript_include_tag "rails_mini_profiler" %>
+  <%= stylesheet_link_tag "rails_mini_profiler/application", media: "all" %>
+  <link rel="preconnect" href="https://fonts.gstatic.com">
+  <script src="https://unpkg.com/@popperjs/core@2"></script>
+  <script src="https://unpkg.com/tippy.js@6"></script>
+  <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap" rel="stylesheet">
+</head>
 <body>
 
 <%= render 'rails_mini_profiler/shared/navbar' %>

data/app/views/layouts/rails_mini_profiler/flamegraph.html.erb

@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html>
-<%= render 'rails_mini_profiler/shared/head' %>
+<head>
+  <title>Rails Mini Profiler</title>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%= javascript_include_tag "rails_mini_profiler" %>
+  <%= stylesheet_link_tag "rails_mini_profiler/application", media: "all" %>
+</head>
 <body>
 
 <main>