active-record-query-count 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9f34b85f506639383a20f5abe438e1f52938a77cafd40189c5c60f9d380f3c
-  data.tar.gz: 1f70e660ded4a8414ab1f3cc4b921a68837a83c9100f3fc73f257c63834b280b
+  metadata.gz: e8f4f85949a25187a16d8510bf3ece2cedaf3e7b6f5afa2cceb61b4fe2ba4ed0
+  data.tar.gz: 5d1c8592e7510b5682332938be07dcae4fc5037db30f068290b581dbe6a9bf54
 SHA512:
-  metadata.gz: 3eb642147b61276500c618f26fc91b86463f5fbec7f9d03a7dba6ac504c2dc7419aff6943dd539be414b68da1cc16ae60344248e758cf2960ca08f3029e2bba9
-  data.tar.gz: cec9bbf99b2ba114ddf172717ca4282a168cb75462588006a7e6d8b20b211bef3cf0868d5e7ce137748db688da700ed4fecf0bea89f28de2b8fa209ec9751cd9
+  metadata.gz: 128aa7d04ca75df1908b5f4deb4ce4c8e702039359d88240356b228ea4a133ec0544390b53d75c517c75e569d8ff9e66ad255181210de1751d0c099ae17fb556
+  data.tar.gz: 61714b8d8d2c7f78ed76f96a5ec98a44fc93e1bfdf88089ccced42b096e9e768da0a99259da9f0461c595a87bc5c7e98335a49b61c8b85693e7b623d407adbab

data/README.md

@@ -1,14 +1,14 @@
 # ActiveRecordQueryCount
 
-`ActiveRecordQueryCount` is a Ruby gem designed to help you visualize and track SQL queries executed by your ActiveRecord models on a block of code.
+`ActiveRecordQueryCount` is a Ruby gem designed to help you visualize and track the SQL queries executed by your ActiveRecord models within a block of code.
 
-By subscribing to ActiveSupport notifications, it provides detailed insights into the quantity of queries being run, including the tables involved and the locations in your code where the queries are generated.
+By subscribing to ActiveSupport notifications, it provides detailed insights into the number of queries being run, the time taken by the code at specific locations (by adding the time each query took in that place), the tables involved, and the locations in your code where the queries were generated.
 
-There are three things this gem allows you to do:
+This gem offers three key features:
 
-1. See an overview of all the queries that a code block executes and their origin locations in a graph, a table, or in the console.
-2. Benchmark two blocks of code to view the difference in SQL counts at different locations, with a graph or a table.
-3. See an overview of the current request on a controller action with a button on the top left corner of the screen.
+1. View an overview of all queries executed by a block of code, including the time taken and their origin locations, presented in a graph, an HTML table, or directly in the console.
+2. Benchmark two blocks of code to compare SQL query counts at different locations, with results displayed in a graph or table.
+3. Get an overview of SQL queries for the current request in a controller action, accessible via a button in the top-left corner of the screen.
 
 ## Installation
 

data/lib/active-record-query-count.rb

@@ -1,17 +1,26 @@
-require 'active_support/notifications'
-require_relative 'active_record_query_count/version'
-require_relative 'active_record_query_count/configuration'
-require_relative 'active_record_query_count/printer/base'
-require_relative 'active_record_query_count/printer/console'
-require_relative 'active_record_query_count/printer/html'
-require_relative 'active_record_query_count/recording/base'
-require_relative 'active_record_query_count/recording/tracker'
-require_relative 'active_record_query_count/compare/comparator'
-require_relative 'active_record_query_count/middleware'
-require_relative 'active_record_query_count/printer/html_compare'
-
 module ActiveRecordQueryCount
+  autoload :VERSION,       'active_record_query_count/version'
+  autoload :Configuration, 'active_record_query_count/configuration'
+  autoload :Middleware,    'active_record_query_count/middleware'
+
+  module Printer
+    autoload :Base,        'active_record_query_count/printer/base'
+    autoload :Console,     'active_record_query_count/printer/console'
+    autoload :Html,        'active_record_query_count/printer/html'
+    autoload :HtmlCompare, 'active_record_query_count/printer/html_compare'
+  end
+
+  module Recording
+    autoload :Base,    'active_record_query_count/recording/base'
+    autoload :Tracker, 'active_record_query_count/recording/tracker'
+  end
+
+  module Compare
+    autoload :Comparator, 'active_record_query_count/compare/comparator'
+  end
+
   extend Recording::Base
+
   if defined?(Rails::Railtie)
     class QueryCountRailtie < Rails::Railtie
       initializer 'active_record_query_count.configure_rails_initialization' do |app|
@@ -26,7 +35,7 @@ module ActiveRecordQueryCount
     end
 
     def tracker
-      Thread.current[:query_counter_data] ||= Tracker.new
+      Thread.current[:query_counter_data] ||= Recording::Tracker.new
     end
 
     def compare

data/lib/active_record_query_count/configuration.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveRecordQueryCount

data/lib/active_record_query_count/printer/base.rb

@@ -1,3 +1,4 @@
+require 'json'
 module ActiveRecordQueryCount
   module Printer
     class Base
@@ -35,6 +36,7 @@ module ActiveRecordQueryCount
       end
 
       def open_file html_dest
+        require 'launchy'
         if ENV['WSL_DISTRIBUTION']
           Launchy.open("file://wsl%24/#{ENV['WSL_DISTRIBUTION']}#{html_dest}")
         else

data/lib/active_record_query_count/printer/console.rb

@@ -1,5 +1,3 @@
-require 'colorize'
-
 module ActiveRecordQueryCount
   module Printer
     class Console < Base
@@ -9,6 +7,7 @@ module ActiveRecordQueryCount
       end
 
       def print
+        require 'colorize'
         data = filter_data(@data)
         puts '[ActiveRecordQueryCount] Query count per table:'.colorize(:blue)
         puts "Total query count: #{data.values.sum { |v| v[:count] }}\n\n"

data/lib/active_record_query_count/printer/html.rb

@@ -1,8 +1,4 @@
 require 'erb'
-require 'tempfile'
-require 'launchy'
-require 'pry-byebug'
-require 'json'
 
 module ActiveRecordQueryCount
   module Printer

data/lib/active_record_query_count/printer/html_compare.rb

@@ -1,8 +1,4 @@
 require 'erb'
-require 'tempfile'
-require 'launchy'
-require 'pry-byebug'
-require 'json'
 
 module ActiveRecordQueryCount
   module Printer

data/lib/active_record_query_count/recording/tracker.rb

@@ -1,42 +1,46 @@
+require 'active_support/notifications'
+
 module ActiveRecordQueryCount
-  class Tracker
-    REGEX_TABLE_SQL = /FROM\s+"(?<table>[^"]+)"/
-    attr_accessor :active_record_query_tracker, :subscription
+  module Recording
+    class Tracker
+      REGEX_TABLE_SQL = /FROM\s+"(?<table>[^"]+)"/
+      attr_accessor :active_record_query_tracker, :subscription
 
-    def initialize
-      reset_query_count
-    end
+      def initialize
+        reset_query_count
+      end
 
-    # This assums that in the same location of the code it will always be the same sql query
-    def reset_query_count
-      @active_record_query_tracker = Hash.new do |hash, key|
-        hash[key] = { count: 0, location: Hash.new do |loc_hash, loc_key|
-                                            loc_hash[loc_key] = { count: 0, sql: nil }
-                                          end }
+      # This assums that in the same location of the code it will always be the same sql query
+      def reset_query_count
+        @active_record_query_tracker = Hash.new do |hash, key|
+          hash[key] = { count: 0, location: Hash.new do |loc_hash, loc_key|
+                                              loc_hash[loc_key] = { count: 0, sql: nil }
+                                            end }
+        end
       end
-    end
 
-    def subscribe
-      return unless subscription.nil?
+      def subscribe
+        return unless subscription.nil?
 
-      @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
+        @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
         end
       end
-    end
 
-    def unsubscribe
-      ActiveSupport::Notifications.unsubscribe(@subscription)
-      @subscription = nil
+      def unsubscribe
+        ActiveSupport::Notifications.unsubscribe(@subscription)
+        @subscription = nil
+      end
     end
   end
 end

data/lib/active_record_query_count/version.rb

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

data/scripts_for_testing/script_compare_html.rb

@@ -1,4 +1,4 @@
-require_relative '../lib/active-record-query-count'
+require 'active-record-query-count'
 require 'pry-byebug'
 
 data_1 = File.read('scripts_for_testing/example_script_unoptimize.yaml')

data/scripts_for_testing/script_printer_html.rb

@@ -1,5 +1,5 @@
-require_relative '../lib/active-record-query-count'
 require 'pry-byebug'
+require 'active-record-query-count'
 
 data = File.read('scripts_for_testing/example_script_unoptimize.yaml')
 data = YAML.safe_load(data, permitted_classes: [Proc, Symbol])

data/scripts_for_testing/scripts_console.rb.rb

@@ -1,5 +1,5 @@
-require_relative '../lib/active-record-query-count'
 require 'pry-byebug'
+require 'active-record-query-count'
 
 data = File.read('scripts_for_testing/example_script_unoptimize.yaml')
 data = YAML.safe_load(data, permitted_classes: [Proc, Symbol])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-record-query-count
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jose Lara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,44 +34,62 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.5
+        version: 1.18.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.16.5
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'
@@ -275,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.15
 signing_key: 
 specification_version: 4
 summary: Display an overview of the quantity of queries being made and their origins