dial 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61252b82f8769e8c0724a9cb40a8771afc59df61de01847add599037939b1e7d
-  data.tar.gz: 3944fe8e444853a4dfe4f2fb474bf6ed6a4b30814d55dc127df986e99c08bcf6
+  metadata.gz: 4267ea5bc603e20d21e2cc7956154d210a7aad2441a4088c517adee6f9e630a5
+  data.tar.gz: 57de7d2c3bf2cd8055c3e180ff745b95b8541176f0e8aea6ec05a69f5d1175c5
 SHA512:
-  metadata.gz: cdbc7c51f7392b280a56f56d232204c93ee77e436ee6891f7f88e9d9c39570b77b85af3ff07dc15a54c854757053be0ab8c85d7adb6c21ed23f438c43c0d4da7
-  data.tar.gz: 8b8b5400414355f6012d87b490b719ab3b79cfacc229705e752e8822162cc383979e8898711f76b0b1393c497ec0c5a0cd4a344f9050ab1832e1317b314c30bd
+  metadata.gz: 82995a0e0d7898af69ea939db4081214844e5b5de7f911be3c6e61ce51d9446d4abeda7dccd0be882c5efabd49267cdcfd2a042ae9c066b1c163f3e68ec1a0ee
+  data.tar.gz: f5b75425302efda23211c8a87ef94f543d9b253ccb5965d04067db2f81c05c9ad1d2432d222419ccd6ed08dfa90d7243f42452a695c3faaa79f7c5aa5d8bdab3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.1.6] - 2025-01-25
+
+- Fix redeclaration of JS constants
+
+## [0.1.5] - 2025-01-24
+
+- UI: Fix overflow and add vertical scroll
+
 ## [0.1.4] - 2024-12-27
 
 - Use vernier memory usage and rails hooks by default

data/README.md

@@ -12,18 +12,24 @@ Check out the demo:
 
 ## Installation
 
-1. Install the gem and add it to your Rails application's Gemfile by executing:
+1. Add the gem to your Rails application's Gemfile (adjust the `require` option to match your server of choice):
 
-```bash
-bundle add dial
+```ruby
+# require in just the server process
+gem "dial", require: !!($PROGRAM_NAME =~ /puma/)
 ```
 
-2. Mount the engine in your `config/routes.rb` file:
+2. Install the gem:
+
+```bash
+bundle install
+```
 
+3. Mount the engine in your `config/routes.rb` file:
 
 ```ruby
 # this will mount the engine at /dial
-mount Dial::Engine, at: "/"
+mount Dial::Engine, at: "/" if Object.const_defined? "Dial::Engine"
 ```
 
 ## Development

data/dial.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", ">= 7", "< 8.2"
   spec.add_dependency "activerecord", ">= 7", "< 8.2"
   spec.add_dependency "actionpack", ">= 7", "< 8.2"
-  spec.add_dependency "vernier", "~> 1.5"
-  spec.add_dependency "prosopite", "~> 1.4"
-  spec.add_dependency "pg_query", "~> 5.1"
+  spec.add_dependency "vernier"
+  spec.add_dependency "prosopite"
+  spec.add_dependency "pg_query"
 end

data/lib/dial/constants.rb

@@ -6,7 +6,7 @@ module Dial
   REQUEST_TIMING_HEADER = "dial_request_timing"
 
   PROFILE_OUT_STALE_SECONDS = 60 * 60
-  PROFILE_OUT_RELATIVE_DIRNAME = "tmp/dial/profile/"
+  PROFILE_OUT_RELATIVE_DIRNAME = "tmp/dial/profiles/"
 
   PROSOPITE_IGNORE_QUERIES = [/schema_migrations/]
   PROSOPITE_LOG_RELATIVE_PATHNAME = "log/dial/prosopite.log"

data/lib/dial/middleware/panel.rb

@@ -21,7 +21,16 @@ module Dial
               <span>#{formatted_ruby_version}</span>
             </div>
 
+            <hr>
+
             <div id="dial-details">
+              <details>
+                <summary>N+1s</summary>
+                <div class="section query-logs">
+                  #{formatted_query_logs query_logs}
+                </div>
+              </details>
+
               <hr>
 
               <details>
@@ -31,12 +40,7 @@ module Dial
                 </div>
               </details>
 
-              <details>
-                <summary>N+1s</summary>
-                <div class="section query-logs">
-                  #{formatted_query_logs query_logs}
-                </div>
-              </details>
+              <hr>
 
               <details>
                 <summary>RubyVM stat</summary>
@@ -45,6 +49,8 @@ module Dial
                 </div>
               </details>
 
+              <hr>
+
               <details>
                 <summary>GC stat</summary>
                 <div class="section">
@@ -52,6 +58,8 @@ module Dial
                 </div>
               </details>
 
+              <hr>
+
               <details>
                 <summary>GC stat heap</summary>
                 <div class="section">
@@ -70,6 +78,8 @@ module Dial
       def style
         <<~CSS
           #dial {
+            max-height: 50%;
+            max-width: 50%;
             z-index: 9999;
             position: fixed;
             bottom: 0;
@@ -91,6 +101,7 @@ module Dial
 
             #dial-details {
               display: none;
+              overflow-y: auto;
             }
 
             .section {
@@ -104,6 +115,7 @@ module Dial
 
               details {
                 margin-top: 0;
+                margin-bottom: 0.25rem;
               }
             }
 
@@ -114,6 +126,7 @@ module Dial
             hr {
               width: -moz-available;
               margin: 0.65rem 0 0 0;
+              background-color: black;
             }
 
             details {
@@ -131,12 +144,24 @@ module Dial
 
       def script
         <<~JS
-          const dialPreview = document.getElementById("dial-preview");
-          const dialDetails = document.getElementById("dial-details");
+          var dialPreview = document.getElementById("dial-preview");
+          var dialDetails = document.getElementById("dial-details");
+
           dialPreview.addEventListener("click", () => {
-            const collapsed = ["", "none"].includes(dialDetails.style.display);
+            var collapsed = ["", "none"].includes(dialDetails.style.display);
             dialDetails.style.display = collapsed ? "block" : "none";
           });
+
+          document.addEventListener("click", (event) => {
+            if (!dialPreview.contains(event.target) && !dialDetails.contains(event.target)) {
+              dialDetails.style.display = "none";
+
+              var detailsElements = dialDetails.querySelectorAll("details");
+              detailsElements.forEach(detail => {
+                detail.removeAttribute("open");
+              });
+            }
+          });
         JS
       end
 
@@ -178,7 +203,6 @@ module Dial
       def formatted_server_timing server_timing
         if server_timing.any?
           server_timing
-            # TODO: Nested sorting
             .sort_by { |_, timing| -timing }
             .map { |event, timing| "<span><b>#{event}:</b> #{timing}</span>" }.join
         else
@@ -187,17 +211,21 @@ module Dial
       end
 
       def formatted_query_logs query_logs
-        query_logs.map do |(queries, stack_lines)|
-          <<~HTML
-            <details>
-              <summary>#{queries.shift}</summary>
-              <div class="section query-logs">
-                #{queries.map { |query| "<span>#{query}</span>" }.join}
-                #{stack_lines.map { |stack_line| "<span>#{stack_line}</span>" }.join}
-              </div>
-            </details>
-          HTML
-        end.join
+        if query_logs.any?
+          query_logs.map do |(queries, stack_lines)|
+            <<~HTML
+              <details>
+                <summary>#{queries.shift}</summary>
+                <div class="section query-logs">
+                  #{queries.map { |query| "<span>#{query}</span>" }.join}
+                  #{stack_lines.map { |stack_line| "<span>#{stack_line}</span>" }.join}
+                </div>
+              </details>
+            HTML
+          end.join
+        else
+          "NA"
+        end
       end
 
       def formatted_ruby_vm_stat ruby_vm_stat

data/lib/dial/middleware.rb

@@ -93,32 +93,10 @@ module Dial
     def clear_query_logs!
       [].tap do |query_logs|
         File.open(query_log_pathname, "r+") do |file|
-          entry = reading_section = query_count = nil
+          entry = section = count = nil
           file.each_line do |line|
-            case line
-            when /N\+1 queries detected/
-              entry = [[], []]
-              reading_section = :queries
-              query_count = 0
-            when /Call stack/
-              reading_section = :call_stack
-              if query_count > 5
-                entry.first << "+ #{query_count - 5} more queries"
-              end
-            else
-              case reading_section
-              when :queries
-                query_count += 1
-                entry.first << line.strip if query_count <= 5
-              when :call_stack
-                if line.strip.empty?
-                  query_logs << entry
-                  reading_section = nil
-                else
-                  entry.last << line.strip
-                end
-              end
-            end
+            entry, section, count = process_query_log_line line, entry, section, count
+            query_logs << entry if entry && section.nil?
           end
 
           file.truncate 0
@@ -127,6 +105,30 @@ module Dial
       end
     end
 
+    def process_query_log_line line, entry, section, count
+      case line
+      when /N\+1 queries detected/
+        [[[],[]], :queries, 0]
+      when /Call stack/
+        entry.first << "+ #{count - 5} more queries" if count > 5
+        [entry, :call_stack, count]
+      else
+        case section
+        when :queries
+          count += 1
+          entry.first << line.strip if count <= 5
+          [entry, :queries, count]
+        when :call_stack
+          if line.strip.empty?
+            [entry, nil, count]
+          else
+            entry.last << line.strip
+            [entry, section, count]
+          end
+        end
+      end
+    end
+
     def query_log_pathname
       @_query_log_dir_pathname ||= ::Rails.root.join PROSOPITE_LOG_RELATIVE_PATHNAME
     end

data/lib/dial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dial
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dial
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Joshua Young
 bindir: bin
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 2025-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -73,44 +73,44 @@ dependencies:
   name: vernier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: prosopite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg_query
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
 email:
 - djry1999@gmail.com
 executables: []