roda-debug_bar 0.2.1 → 0.3.0.pre.rc1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf180849090a2ccbbb53956154adee24d012387230c2ecf895cdda9dd69664f
-  data.tar.gz: 622d259d1aa55214e91b2ebf9d850e41814ef55d24ef6fdb722327fe9b2f02cb
+  metadata.gz: 15184bb57f4138f00506b033ca263fec092caf7449065e03b336d4ca8546e0db
+  data.tar.gz: a5502c77d34dfe0b90f76d1852c9b75667461125cb7420f5e354ffe2c21f8470
 SHA512:
-  metadata.gz: 1be406548ca3f14b70a481c24862495835c15ef1fd068c8444d835f71b6d77d8af5e0f7e679bb93d6cabf3157ca4e6f1d1014e6fc18b1566b7650f0010e39591
-  data.tar.gz: d19d1cb1f3524e8e0ad139dffbf37b38acaf1c4038f0a4302526ab5e5beebe370e1ad07847c144ac1ae1a70fdaa3c26a9ac50a4785ca3354d3b04c530226e087
+  metadata.gz: 64d66a9ae24bd2f321a0d3e1acc4e45d87aa699fc1d1b50d1ec8d1c5e77de594f6999d4b3945ce41751c84ffa3da5fdbec17134736d6d0b45de2a0634a9c6244
+  data.tar.gz: 78c82cf53c8a5b272b98b713fff0ec5ac0d8a87fd357c4f9508993ee9d961685e2670e4d9fcac3c5203e46f24be0536584ebf08d2236c341cb9948c446396701

data/lib/roda/debug_bar/html_formatter.rb

@@ -0,0 +1,120 @@
+module HTMLFormatter
+  class RubyHash
+
+    SCOPE = 'highlight ruby hash'
+
+    PUNCTUATION = 'p'
+    WHITESPACE = 'w'
+    INTEGER = 'mi'
+    FLOAT = 'mf'
+    STRING = 's2' # double-quoted
+    CONSTANT = 'kc'
+    SYMBOL = 'ss'
+
+    EXPANDABLE = 'exp'
+
+
+    def initialize
+      @index = 0
+    end
+
+    def self.parse(source, start_open: true)
+      instance = new
+      instance.parse(source, start_open: start_open)
+    end
+
+    def parse(source, start_open: true)
+      # Don't apply highlighting if it's a string
+      return source if source.is_a? String
+
+      html = parse_value(source)
+      open_states = [false] * @index
+      open_states[0] = true if start_open # open to first level
+      "<div x-data='{state: #{open_states}}' class='#{SCOPE} w-96'>#{html}</div>"
+    end
+
+    def parse_value(value)
+      case value
+      in Hash
+        parse_hash(value)
+      in Array
+        parse_array(value)
+      in _
+        parse_terminal(value)
+      end
+    end
+
+    def parse_hash(hash)
+      return '{}' if hash.empty?
+      i = @index
+      @index += 1
+      html  = "<button x-show='state[#{i}]' @click='state[#{i}] = false' class='focus:outline-none'><span class='#{EXPANDABLE}'>hash:#{hash.size} </span><span>{</span><span class='#{PUNCTUATION}'>▼</span></button>"
+      html += "<button x-show='!state[#{i}]' @click='state[#{i}] = true' class='focus:outline-none'><span class='#{EXPANDABLE}'>hash:#{hash.size} </span><span>{</span><span class='#{PUNCTUATION}'>▶</span><span class='#{EXPANDABLE}'></span><span>}</span></button>"
+      # html += "<dl x-show='state[#{i}]' class='grid grid-cols-2 ml-4'>"
+      html += "<dl x-show='state[#{i}]' class='ml-4'>"
+      hash.each do |key, value|
+        html += "<span class='flex'>"
+        html += "<dt class='#{SYMBOL}'>#{key}:&nbsp</dt>"
+        # html += "<span class='#{PUNCTUATION}'>=>&nbsp</span>"
+        html += "<dd>#{parse_value(value)}</dd>"
+        html += "</span>"
+      end
+      html += "</dl>"
+      html += "<p x-show='state[#{i}]'>}</p>"
+      html
+    end
+
+    def parse_array(array)
+      return '[]' if array.empty?
+      i = @index
+      @index += 1
+      html  = "<button x-show='state[#{i}]' @click='state[#{i}] = false' class='focus:outline-none'><span class='#{EXPANDABLE}'>array:#{array.size} </span><span>[</span><span class='#{PUNCTUATION}'>▼</span></button>"
+      html += "<button x-show='!state[#{i}]' @click='state[#{i}] = true' class='focus:outline-none'><span class='#{EXPANDABLE}'>array:#{array.size} </span><span>[</span><span class='#{PUNCTUATION}'>▶</span><span class='#{EXPANDABLE}'></span><span>]</span></button>"
+      html += "<ul x-show='state[#{i}]' class='ml-4'>"
+      array.each do |value|
+        html += "<li>#{parse_value(value)}</li>"
+      end
+      html += "</ul>"
+      html += "<p x-show='state[#{i}]'>]</p>"
+      html
+    end
+
+    def parse_terminal(value)
+      case value
+      in String
+        "<span class='#{STRING}'>\"#{value}\"</span>"
+      in Integer
+        "<span class='#{INTEGER}'>#{value}</span>"
+      in Float
+        "<span class='#{FLOAT}'>#{value}</span>"
+      in TrueClass
+        "<span class='#{CONSTANT}'>#{true}</span>"
+      in FalseClass
+        "<span class='#{CONSTANT}'>#{false}</span>"
+      in NilClass
+        "<span class='#{CONSTANT}'>#{nil}</span>"
+      in _
+        "<span class='unknown'>#{value}</span>"
+      end
+    end
+
+  end
+end
+
+
+
+
+
+
+
+# hash = {
+#   "foo" => "bar",
+#   "baz" => [1,2,3,4],
+#   "nested" => {
+#     "boo": 1,
+#     "bop": "ha"
+#   }
+# }
+
+# puts HTMLFormatter::RubyHash.parse(hash)
+# HTMLFormatter::SQL.parse

data/lib/roda/debug_bar/views/debug_bar/request.erb

@@ -1,28 +1,59 @@
 <%
 
-hash = [
-  { name: 'request_method', value: request.request_method },
-  { name: 'request_path', value: request.path },
-  { name: 'request_params', value: request.params }
-]
+STATUS_TEXTS ||= {
+  200 => "OK",
+  201 => "Created",
+  204 => "No Content",
+  301 => "Moved Permanently",
+  302 => "Found",
+  400 => "Bad Request",
+  401 => "Unauthorized",
+  403 => "Forbidden",
+  404 => "Not Found",
+  500 => "Internal Server Error",
+  502 => "Bad Gateway",
+  503 => "Service Unavailable"
+}.freeze
 
-request.env.each do |key, value|
-  hash << {name: key.downcase, value: value} if key.start_with?('HTTP_')
-end
+# According to Roda docs, response.status returns:
+# > The status code to use for the response.
+# > If none is given, will use 200 code for non-empty responses and a 404 code for empty responses.
+status = response.status || (response.body.empty? ? 404: 200)
 
-# hash << { name: 'request_headers', value: request.env.filter {|k, v| k.to_s.start_with? 'HTTP_' } }
-hash << { name: 'request_headers', value: request.env.to_json }
+# This is just to mimic Laravel's debug bar
+format = {'text/html' => 'html', 'application/json' => 'json'}.fetch(response.headers['content-type'], 'not set')
 
-hash << { name: 'response_headers', value: response.headers }
+hash = [
+  # { name: 'request_method', value: request.request_method },
+  { name: 'path_info', value: request.path },
+  { name: 'status_code', value: status },
+  { name: 'status_text', value: STATUS_TEXTS[status] },
+  { name: 'format', value: format },
+  { name: 'content_type', value: response.headers['content-type'] },
+  # { name: 'request_params', value: request.params },
+  { name: 'request_query', value: request.GET },
+  { name: 'request_request', value: request.POST },
+  { name: 'request_headers', value: request.env.filter { |v| v.start_with? 'HTTP_' }.transform_keys { |k| k.sub('HTTP_', '').downcase } },
+  { name: 'request_cookies', value: request.cookies },
+  { name: 'response_headers', value: response.headers },
+  { name: 'session_attributes', value: begin request.session rescue {} end }
+]
 
+require_relative "../../html_formatter"
 %>
 
 <div class="max-w mx-auto space-y-1 font-mono">
   <% hash.each do |elem| %>
-  <div class="px-4 py-2 odd:bg-white even:bg-ruby-50">
-    <span class="inline-block w-64"><%= elem[:name] %></span><span class=""><%= elem[:value] %></span>
+  <div class="flex px-4 py-1 odd:bg-white even:bg-ruby-50">
+    <span class="inline-block min-w-64"><%= elem[:name] %></span><span class=""><%= HTMLFormatter::RubyHash.parse(elem[:value]) %></span>
   </div>
   <% end %>
+
+  <%# rack_env should start closed, unlike the others %>
+  <div class="flex px-4 py-1 odd:bg-white even:bg-ruby-50">
+    <span class="inline-block min-w-64">rack_env</span><span class=""><%= HTMLFormatter::RubyHash.parse(request.env.transform_keys(&:downcase), start_open: false) %></span>
+  </div>
+
 </div>
 
 <!--

data/lib/roda/debug_bar/views/debug_bar.erb

@@ -52,6 +52,15 @@
       color: #9ca3af;
     }
 
+    .highlight.ruby.hash .exp {
+      color: #487bcd;
+    }
+
+    .highlight.ruby.hash .kc {
+      font-weight: bold;
+      color: #0086B3;
+    }
+
 
     /******* ruby routes tab *******/
 

data/lib/roda/plugins/debug_bar.rb

@@ -2,12 +2,11 @@ require "tty-logger"
 require "pathname"
 require_relative "../debug_bar/current"
 require_relative "../debug_bar/instance"
+require_relative "../debug_bar/html_formatter"
 require_relative "../../sequel/extensions/debug_bar"
 require_relative "../../sequel/plugins/debug_bar"
 require 'rouge'
 
-require 'json'
-
 class Roda
   module RodaPlugins
     module DebugBar

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DebugBar
-  VERSION = "0.2.1"
+  VERSION = "0.3.0-rc1.0"
 end

data/public/out.css

@@ -238,7 +238,7 @@ code:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)),
 kbd:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)),
 samp:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)),
 pre:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Liberation Mono", Courier New, monospace;
   /* 1 */
   font-feature-settings: normal;
   /* 2 */
@@ -644,10 +644,6 @@ video:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
   width: 1rem;
 }
 
-.w-64 {
-  width: 16rem;
-}
-
 .w-8\/12 {
   width: 66.666667%;
 }
@@ -660,6 +656,10 @@ video:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
   width: 100%;
 }
 
+.min-w-64 {
+  min-width: 16rem;
+}
+
 .flex-1 {
   flex: 1 1 0%;
 }
@@ -808,6 +808,11 @@ video:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
   padding-right: 1rem;
 }
 
+.py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+}
+
 .py-2 {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
@@ -843,7 +848,7 @@ video:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
 }
 
 .font-mono {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Liberation Mono", Courier New, monospace;
 }
 
 .text-sm {
@@ -899,11 +904,6 @@ video:where(.debug-bar,.debug-bar *):where(:not(.no-tailwind,.no-tailwind *)) {
   color: rgb(255 255 255 / var(--tw-text-opacity, 1));
 }
 
-.text-yellow-600 {
-  --tw-text-opacity: 1;
-  color: rgb(202 138 4 / var(--tw-text-opacity, 1));
-}
-
 .text-yellow-900 {
   --tw-text-opacity: 1;
   color: rgb(113 63 18 / var(--tw-text-opacity, 1));

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: roda-debug_bar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0.pre.rc1.0
 platform: ruby
 authors:
 - Avi Feher Sternlieb
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -114,6 +114,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/roda/debug_bar/current.rb
+- lib/roda/debug_bar/html_formatter.rb
 - lib/roda/debug_bar/instance.rb
 - lib/roda/debug_bar/views/debug_bar.erb
 - lib/roda/debug_bar/views/debug_bar/messages.erb
@@ -126,7 +127,6 @@ files:
 - lib/roda/debug_bar/views/debug_bar/views.erb
 - lib/roda/plugins/debug_bar.rb
 - lib/sequel/extensions/debug_bar.rb
-- lib/sequel/main.rb
 - lib/sequel/plugins/debug_bar.rb
 - lib/version.rb
 - public/out.css
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A debug bar for Roda
 test_files: []

data/lib/sequel/main.rb

@@ -1,36 +0,0 @@
-require 'sequel'
-require_relative 'plugins/debug_bar'
-
-# require 'sequel/plugins/after_initialize'
-
-DB = Sequel.sqlite('/Users/avi/code/2025/jan/roda-30day-clone/database/database.sqlite')
-
-
-Sequel::Model.plugin :debug_bar
-
-class Employer < Sequel::Model
-end
-
-# puts Employer.first.inspect
-
-# puts Employer.plugins.include?(:after_initialize)
-
-
-# Sequel::Model.plugin :after_initialize
-# Sequel::Model.plugin :debug_bar
-
-# class Employer < Sequel::Model
-#   plugin :debug_bar
-# end
-
-# Employer.plugin :after_initialize
-# Employer.plugin :debug_bar
-
-# puts Employer.first.inspect
-
-# a = Employer.create(name: 'alksgj')
-
-# # puts Employer.plugins.include?(:after_initialization)
-# puts Employer.plugins.include?(:debug_bar)
-
-# # puts Sequel::Model.plugins.include?(:debug_bar)