active-record-query-count 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74868de3cd6aa45193be102108bb86b55dc7ec196e1a604c66ffc750ac30ee1
-  data.tar.gz: 5852828907c5f1704ea19721fe285edcfe98202861c9f81f759fc73474462d4d
+  metadata.gz: 3e9f34b85f506639383a20f5abe438e1f52938a77cafd40189c5c60f9d380f3c
+  data.tar.gz: 1f70e660ded4a8414ab1f3cc4b921a68837a83c9100f3fc73f257c63834b280b
 SHA512:
-  metadata.gz: df7c9406bd9ffb4eafb799aa24637a068f77f7b4258c157ad30ca2f87e79485df494084922b990edf54e53593a1dccbabae634f3cb14822484de6bfcd7fee37e
-  data.tar.gz: 380c18c78e63cd3f899e42f3c07e993f40db1aa17e27b74f13f6bbd599cbdc28430599bd6e6dc4519c981b8e2afb0f36dd86088be6c3960ea107ac27328c6a48
+  metadata.gz: 3eb642147b61276500c618f26fc91b86463f5fbec7f9d03a7dba6ac504c2dc7419aff6943dd539be414b68da1cc16ae60344248e758cf2960ca08f3029e2bba9
+  data.tar.gz: cec9bbf99b2ba114ddf172717ca4282a168cb75462588006a7e6d8b20b211bef3cf0868d5e7ce137748db688da700ed4fecf0bea89f28de2b8fa209ec9751cd9

data/assets/style.css

@@ -4,10 +4,9 @@
     width: 100%;
     border-collapse: collapse;
     margin-top: 20px;
-
     height: 100%;
-    overflow:auto;
-    display: block; /* Ensure the table behaves as a block element */
+    overflow: auto;
+    display: block;
     box-sizing: border-box;
   }
   th, td {
@@ -17,11 +16,12 @@
   th {
     background-color: #f2f2f2;
   }
-  tr:nth-child(even) {
-    background-color: #f9f9f9;
+  tr.main-row.even, tr.sub-row.even {
+    background-color: #f2f2f2;
   }
-  .sub-row {
-    background-color: #f9f9f9;
+
+  tr.main-row.odd, tr.sub-row.odd {
+    background-color: #ffffff;
   }
 
   .center-container {
@@ -39,4 +39,4 @@
   #queryTable {
     display: table;
   }
-}
+}

data/assets/template_base_query_counter.html.erb

@@ -3,9 +3,10 @@
 </style>
 <div id='query_counter_report_gem'>
   <h2>Query Count Report</h2>
-  <p>Total query count on process: <%= total_query_count %></p>
-  <p>The table will show only tables with more than <%= ::ActiveRecordQueryCount::Configuration.ignore_table_count %> queries</p>
-  <p>Only the top  <%= ::ActiveRecordQueryCount::Configuration.max_locations_per_table %> locations with the most occurrences will be shown.</p>
+  <p>Total number of queries in this process: <%= total_query_count %></p>
+  <p>Total time spent on queries in this process (ms): <%= total_duration_time %></p>
+  <p>Only tables with <%= ::ActiveRecordQueryCount::Configuration.ignore_table_count %> or more queries will be displayed.</p>
+  <p>The top <%= ::ActiveRecordQueryCount::Configuration.max_locations_per_table %> locations with the highest occurrences will be shown for each table.</p>
   <button id="toggleButton" onclick="toggleView()">Show Chart View</button>
   <button id="toggleColumnButton" onclick="toggleColumnContent()">Show SQL</button>
 
@@ -19,14 +20,15 @@
       <th id="columnHeader">File Path</th>
       <th>Method</th>
       <th>Location Count</th>
+      <th>Total Duration(ms)</th>
     </tr>
-    <% filter_data(data).each do |table, info| %>
-      <tr>
+    <% filter_data(data).each_with_index do |(table, info), index| %>
+      <tr class="main-row <%= index.even? ? 'even' : 'odd' %>">
         <td rowspan="<%= info[:location].size + 1 %>"><%= table %></td>
         <td rowspan="<%= info[:location].size + 1 %>"><%= info[:count] %></td>
       </tr>
       <% info[:location].each do |loc, detail| %>
-        <tr class="sub-row">
+        <tr class="sub-row <%= index.even? ? 'even' : 'odd' %>">
           <% match = loc&.match(/^(?<file_path>.*):in.*`(?<method>.*)'$/) %>
           <% file_path = match ? match[:file_path] : loc %>
           <% method = match ? match[:method] : nil %>
@@ -36,6 +38,7 @@
           </td>
           <td class="method-column"><%= method %></td>
           <td><%= detail[:count] %></td>
+          <td><%= detail[:duration] %></td>
         </tr>
       <% end %>
     <% end %>

data/lib/active_record_query_count/compare/comparator.rb

@@ -21,7 +21,7 @@ module ActiveRecordQueryCount
         raise 'Exactly two code blocks are required' if @scripts_loaded != 2
 
         ActiveRecordQueryCount::Printer::HtmlCompare.new(data_1: results.slice(results.keys[0]),
-                                               data_2: results.slice(results.keys[1])).print
+                                                         data_2: results.slice(results.keys[1])).print
       end
     end
 

data/lib/active_record_query_count/printer/base.rb

@@ -11,6 +11,11 @@ module ActiveRecordQueryCount
       INJECT_TEMPLATE_PATH = File.join(parent_dir, 'assets', 'template_for_inject.html.erb')
 
       def filter_data data
+        data.each_value do |info|
+          info[:location].each_value do |detail|
+            detail[:duration] = detail[:duration].truncate(2)
+          end
+        end
         data = data.select { |_, v| v[:count] >= Configuration.ignore_table_count }
         data = data.sort_by { |_, v| -v[:count] }.each do |_category, info|
           info[:location] = info[:location].sort_by do |_, detail|

data/lib/active_record_query_count/printer/console.rb

@@ -21,6 +21,7 @@ module ActiveRecordQueryCount
           info[:location].each do |loc, details|
             puts "    - File location: #{loc}"
             puts "        Query count: #{details[:count].to_s.colorize(:blue)}"
+            puts "        Total Duration(ms): #{details[:duration]}"
           end
           puts
         end

data/lib/active_record_query_count/printer/html.rb

@@ -14,13 +14,21 @@ module ActiveRecordQueryCount
       end
 
       def chart_data
-        @chart_data ||= generate_chart_data(data)
+        @chart_data ||= generate_chart_js_data(data)
       end
 
       def total_query_count
         @total_query_count ||= data.values.sum { |v| v[:count] }
       end
 
+      def total_duration_time
+        @total_duration_time ||= data.sum do |_, info|
+          info[:location].sum do |_, detail|
+            detail[:duration]
+          end
+        end.truncate(2)
+      end
+
       def inject_in_html
         ERB.new(inject_template_content).result(binding)
       end
@@ -36,13 +44,13 @@ module ActiveRecordQueryCount
 
       private
 
-      def generate_chart_data(data)
+      def generate_chart_js_data(data)
         chart_data = { labels: [], data: [], locations: {} }
         data.each do |table, info|
           chart_data[:labels] << table
           chart_data[:data] << info[:count]
           chart_data[:locations][table] = info[:location].map do |loc, detail|
-            { location: loc, count: detail[:count] }
+            { location: loc, count: detail[:count], duration: detail[:duration] }
           end
         end
         chart_data

data/lib/active_record_query_count/printer/html_compare.rb

@@ -25,7 +25,7 @@ module ActiveRecordQueryCount
         tables = data_1.keys | data_2.keys
         total_query_count_1 = data_1.values.sum { |v| v[:count] }
         total_query_count_2 = data_2.values.sum { |v| v[:count] }
-        chart_data = generate_chart_data_compare(data_1, data_2)
+        chart_data = generate_chart_js_data_compare(data_1, data_2)
         # end
         html_dest = generate_html(binding)
         open_file(html_dest)
@@ -33,7 +33,7 @@ module ActiveRecordQueryCount
 
       private
 
-      def generate_chart_data_compare(data_1, data_2)
+      def generate_chart_js_data_compare(data_1, data_2)
         labels = (data_1.keys | data_2.keys).sort
         chart_data = { labels: [], data_1: {}, data_2: {}, locations: {} }
         chart_data[:data_1][:name] = @script_1_name

data/lib/active_record_query_count/recording/tracker.rb

@@ -19,13 +19,15 @@ module ActiveRecordQueryCount
     def subscribe
       return unless subscription.nil?
 
-      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record') do |_a, _b, _c, _d, payload|
+      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record') do |_a, start, finish, _d, payload|
         caller_from_sql = caller
         sql = payload[:sql]
         match = sql.match(REGEX_TABLE_SQL)
         if match.present? && match[:table]
           actual_location = Rails.backtrace_cleaner.clean(caller_from_sql).first
           active_record_query_tracker[match[:table]][:count] += 1
+          active_record_query_tracker[match[:table]][:location][actual_location][:duration] ||= 0
+          active_record_query_tracker[match[:table]][:location][actual_location][:duration] += (finish - start) * 1000
           active_record_query_tracker[match[:table]][:location][actual_location][:count] += 1
           active_record_query_tracker[match[:table]][:location][actual_location][:sql] = sql
         end

data/lib/active_record_query_count/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordQueryCount
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: active-record-query-count
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jose Lara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +76,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +180,16 @@ dependencies:
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +265,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.2
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Display an overview of the quantity of queries being made and their origins