rails_mini_profiler 0.6.0 → 0.7.2

data/app/javascript/stylesheets/components/trace.scss

@@ -0,0 +1,93 @@
+.trace {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0.25em 0;
+  list-style: none;
+}
+
+.trace:nth-child(odd) {
+  background: var(--grey-100);
+}
+
+.trace .trace-bar {
+  position: relative;
+  height: 16px;
+  padding: 0;
+  margin: 0;
+  background: linear-gradient(to top right, var(--grey-500), var(--grey-400));
+  cursor: pointer;
+}
+
+.instantiation-trace .trace-bar {
+  background: linear-gradient(to top right, var(--green-400), var(--green-300));
+}
+
+.sequel-trace .trace-bar {
+  background: linear-gradient(to top right, var(--green-500), var(--green-400));
+}
+
+.controller-trace .trace-bar {
+  background: linear-gradient(to top right, var(--yellow-500), var(--yellow-400));
+}
+
+.render-template-trace .trace-bar,
+.render-partial-trace .trace-bar {
+  background: linear-gradient(to top right, var(--blue-500), var(--blue-400));
+}
+
+.trace-name {
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 0 0.5em;
+  margin: 0;
+  color: var(--grey-400);
+  font-size: 14px;
+  text-align: right;
+  text-overflow: ellipsis;
+}
+
+.trace-payload {
+  margin: 0;
+}
+
+.sequel-trace-query {
+  overflow: auto;
+  max-height: 100px;
+  padding: 1em 1em;
+  background: var(--grey-100);
+  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);
+  font-size: 12px;
+  white-space: pre-wrap;
+}
+
+.backtrace {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5em;
+  background: var(--grey-100);
+}
+
+.backtrace button {
+  overflow: auto;
+  height: 20px;
+  padding: 0;
+  margin: 0;
+  background: none;
+  color: var(--grey-500);
+}
+
+.backtrace button svg {
+  width: 20px;
+  height: 20px;
+}

data/app/javascript/stylesheets/profiled_requests.scss

@@ -1,15 +1,4 @@
-@import 'components/profiled_request_table/placeholder';
-@import 'components/profiled_request_table/profiled_request_table';
-
-main {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-}
-
-.main-section {
-  width: var(--main-width);
-}
+@import 'components/profiled_request_table';
 
 .search-field {
   box-sizing: border-box;
@@ -18,57 +7,11 @@ main {
   border-radius: 5px;
 }
 
-.request-details-data {
-  display: flex;
-  padding: 1rem 0;
-}
-
-.request-details-actions {
+.profiled-requests-header {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  padding: 0 0 1rem;
-  margin: 0;
-}
-
-.data-item {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  padding: 0;
-  margin-right: 3rem;
-  list-style: none;
-}
-
-.data-item small {
-  color: var(--grey-400);
-}
-
-.data-item span {
-  margin: 0.25rem 0;
-}
-
-[class*='request-status-2'],
-[class*='request-method-get'] {
-  background: var(--green-400) !important;
-  color: white;
-}
-
-[class*='request-status-4'],
-[class*='request-method-put'],
-[class*='request-method-patch'] {
-  background: var(--yellow-400) !important;
-  color: white;
-}
-
-[class*='request-status-5'],
-[class*='request-method-delete'] {
-  background: var(--red-500) !important;
-  color: white;
-}
-
-.flamegraph-button button {
-  background: var(--grey-200);
 }
 
 .clear-action button {
@@ -80,10 +23,3 @@ main {
     background: var(--red-600);
   }
 }
-
-.profiled-requests-header {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}

data/app/javascript/stylesheets/rails-mini-profiler.scss

@@ -1,10 +1,15 @@
 @import 'flashes';
 @import 'flamegraph';
-@import 'navbar';
 @import 'profiled_requests';
 @import 'traces';
+@import 'components/buttons';
+@import 'components/input';
+@import 'components/navbar';
 @import 'components/pagination';
-@import 'components/page_header/page_header';
+@import 'components/page_header';
+@import 'components/dropdown';
+@import 'components/placeholder';
+@import 'components/trace';
 @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap');
 
 @font-face {
@@ -55,6 +60,9 @@ html {
   --primary: var(--red-600);
   --border-color: var(--grey-200);
   --text-color: var(--grey-900);
+  --fw-normal: 400;
+  --fw-semibold: 600;
+  --fw-bold: 700;
 }
 
 * {
@@ -70,36 +78,14 @@ body {
   color: var(--text-color);
 }
 
-button,
-.button {
-  display: inline-block;
-  padding: 0.5em 0.5em;
-  border: none;
-  border-radius: 0.25rem;
-  cursor: pointer;
-  font-size: 1rem;
-  text-align: center;
-  text-decoration: none;
-
-  &:disabled {
-    background: var(--grey-200);
-    cursor: not-allowed;
-  }
-}
-
-button:hover {
-  box-shadow: 0 0.25rem 0.25rem 0 var(--grey-50);
+main {
+  display: flex;
+  width: 100%;
+  justify-content: center;
 }
 
-button.none {
-  padding: 0;
-  border: none;
-  background: none;
-  outline: none;
-
-  &:hover {
-    box-shadow: none;
-  }
+.main-section {
+  width: var(--main-width);
 }
 
 /* --------------------------------------- */

data/app/javascript/stylesheets/traces.scss

@@ -1,110 +1,78 @@
-.trace-list {
-  padding: 0;
-  margin: 2rem 0;
-}
-
-.trace {
+.profiled-request-details {
   display: flex;
   align-items: center;
-  justify-content: flex-start;
-  padding: 0.25em 0;
-  list-style: none;
+  justify-content: space-between;
+  padding-bottom: 2rem;
 }
 
-.trace:nth-child(odd) {
-  background: var(--grey-100);
+.request-details-data {
+  display: flex;
 }
 
-.trace .trace-bar {
-  position: relative;
-  height: 16px;
+.data-item {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
   padding: 0;
-  margin: 0;
-  background: linear-gradient(to top right, var(--grey-500), var(--grey-400));
-  cursor: pointer;
-}
-
-.instantiation-trace .trace-bar {
-  background: linear-gradient(to top right, var(--green-400), var(--green-300));
-}
-
-.sequel-trace .trace-bar {
-  background: linear-gradient(to top right, var(--green-500), var(--green-400));
+  margin-right: 3rem;
+  list-style: none;
 }
 
-.controller-trace .trace-bar {
-  background: linear-gradient(to top right, var(--yellow-500), var(--yellow-400));
+.data-item small {
+  color: var(--grey-400);
 }
 
-.render-template-trace .trace-bar,
-.render-partial-trace .trace-bar {
-  background: linear-gradient(to top right, var(--blue-500), var(--blue-400));
+.data-item span {
+  margin: 0.25rem 0;
 }
 
-.trace-name {
-  overflow: hidden;
-  box-sizing: border-box;
-  padding: 0 0.5em;
-  margin: 0;
-  color: var(--grey-400);
-  font-size: 14px;
-  text-align: right;
-  text-overflow: ellipsis;
+[class*='request-status-2'],
+[class*='request-method-get'] {
+  background: var(--green-400) !important;
+  color: white;
 }
 
-.trace-payload {
-  margin: 0;
+[class*='request-status-4'],
+[class*='request-method-put'],
+[class*='request-method-patch'] {
+  background: var(--yellow-400) !important;
+  color: white;
 }
 
-.sequel-trace-query {
-  overflow: auto;
-  max-height: 100px;
-  padding: 1em 1em;
-  background: var(--grey-100);
-  white-space: pre-wrap;
+[class*='request-status-5'],
+[class*='request-method-delete'] {
+  background: var(--red-500) !important;
+  color: white;
 }
 
-.sequel-trace-binds {
-  overflow: auto;
-  max-height: 100px;
-  padding: 0.5em 1em;
-  margin: 0 0 1em 0;
-  background: var(--grey-50);
-  font-size: 12px;
-  white-space: pre-wrap;
+.trace-list {
+  padding: 1rem;
+  border: 1px solid var(--grey-200);
+  border-radius: 5px;
 }
 
-.trace-table {
+.trace-details-table {
   width: 100%;
   border: hidden 1px var(--border-color);
   margin-top: 1em;
   border-collapse: collapse;
 }
 
-.backtrace {
+.trace-details-table tr th {
+  font-weight: var(--fw-semibold);
+}
+
+.trace-list-header {
   display: flex;
-  flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  padding: 0.5em;
-  background: var(--grey-100);
+  padding-bottom: 1rem;
 }
 
-.backtrace button {
-  width: 20px;
-  height: 20px;
-  padding: 0;
-  margin: 0;
-  background: none;
+.trace-list-filters {
+  display: flex;
+  width: 60%;
+  align-items: center;
+  justify-content: space-between;
   color: var(--grey-500);
-  transition: color 200ms ease-in-out;
-}
-
-.backtrace button.copied {
-  color: var(--green-400);
-}
-
-.backtrace button svg {
-  width: 20px;
-  height: 20px;
 }

data/app/models/rails_mini_profiler/flamegraph.rb

@@ -5,7 +5,7 @@
 # Table name: rmp_flamegraphs
 #
 #  id                      :integer          not null, primary key
-#  rmp_profiled_request_id :bigint           not null
+#  rmp_profiled_request_id :integer          not null
 #  data                    :binary
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null

data/app/models/rails_mini_profiler/profiled_request.rb

@@ -43,7 +43,7 @@ module RailsMiniProfiler
     def request=(request)
       self.request_body = request.body
       self.request_headers = request.headers
-      self.request_method = request.method
+      self.request_method = request.request_method
       self.request_path = request.path
       self.request_query_string = request.query_string
     end

data/app/models/rails_mini_profiler/trace.rb

@@ -5,12 +5,12 @@
 # Table name: rmp_traces
 #
 #  id                      :integer          not null, primary key
-#  rmp_profiled_request_id :bigint           not null
+#  rmp_profiled_request_id :integer          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
@@ -23,24 +23,9 @@
 module RailsMiniProfiler
   class Trace < RailsMiniProfiler::ApplicationRecord
     self.table_name = RailsMiniProfiler.storage_configuration.traces_table
-    self.inheritance_column = :name
 
     belongs_to :profiled_request,
                class_name: 'RailsMiniProfiler::ProfiledRequest',
                foreign_key: :rmp_profiled_request_id
-
-    class << self
-      def find_sti_class(name)
-        subclasses = {
-          'process_action.action_controller' => RailsMiniProfiler::ControllerTrace,
-          'sql.active_record' => RailsMiniProfiler::SequelTrace,
-          'instantiation.active_record' => RailsMiniProfiler::InstantiationTrace,
-          'rails_mini_profiler.total_time' => RailsMiniProfiler::RmpTrace,
-          'render_template.action_view' => RailsMiniProfiler::RenderTemplateTrace,
-          'render_partial.action_view' => RailsMiniProfiler::RenderPartialTrace
-        }
-        subclasses[name] || self
-      end
-    end
   end
 end

data/app/presenters/rails_mini_profiler/controller_trace_presenter.rb

@@ -6,10 +6,18 @@ module RailsMiniProfiler
       'Action Controller'
     end
 
-    def payload
+    def view_runtime
+      payload['view_runtime']
+    end
+
+    def db_runtime
+      payload['db_runtime']
+    end
+
+    def content
       content_tag('div') do
         content_tag('pre', class: 'trace-payload') do
-          content_tag(:div, "View Time: #{model.view_runtime} ms, DB Time: #{model.db_runtime} ms",
+          content_tag(:div, "View Time: #{view_runtime} ms, DB Time: #{db_runtime} ms",
                       class: 'sequel-trace-query')
         end
       end

data/app/presenters/rails_mini_profiler/instantiation_trace_presenter.rb

@@ -3,12 +3,24 @@
 module RailsMiniProfiler
   class InstantiationTracePresenter < TracePresenter
     def label
-      "#{model.class_name} Instantiation"
+      "#{class_name} Instantiation"
+    end
+
+    def class_name
+      payload['class_name']
+    end
+
+    def record_count
+      payload['record_count']
+    end
+
+    def db_runtime
+      payload['db_runtime']
     end
 
     def description
-      record_string = 'Record'.pluralize(model.record_count)
-      "Instantiated #{model.record_count} #{model.class_name} #{record_string}"
+      record_string = 'Record'.pluralize(record_count)
+      "Instantiated #{record_count} #{class_name} #{record_string}"
     end
   end
 end

data/app/presenters/rails_mini_profiler/profiled_request_presenter.rb

@@ -30,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/profiled_request_search.rb

@@ -27,7 +27,6 @@ module RailsMiniProfiler
     end
 
     option(:duration) do |scope, value|
-      value = value.tr('>', '').to_i * 100
       scope.where('duration > :duration', duration: value)
     end
   end