log_bench 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7bf1724c565d5848f6867b14ec19675a50594b369cb3d7729d117b310f4d399
-  data.tar.gz: cc2c21dc13a0981b11c92933ecbe967a6cf98b7a7ff21e27d322e156932e42a0
+  metadata.gz: dfbdd891667f8c0db91b6dc0afd5e7cb4562b941a300d31267dd6cbb973d8257
+  data.tar.gz: 04b3ca23a18b72f7d2798233c53a549788767f92bd40ac7a87214c95a9a1e3ea
 SHA512:
-  metadata.gz: 61423f51d81a4c5b30d963fb3da1ba4739aa0420b7b388e6b5fb01952cbb7c60eba2b3091ef520fefb81ab67310611d175d45bacb9d00f63199911cf3ab4cc44
-  data.tar.gz: 5a4c48ed233d247ca70d1aaa36f9eb676b598282dfb573055a3200d9002f7978f31c46a44f57e0e4270308a296523862f4670360ab8df3eabb530ac5f7365bcd
+  metadata.gz: 0d9d928b2d0c39c584426f8757855b1d51524e0ef0cc5822b84935ba2c228c3f80e5a22b201a1097f92dad422cfe06b1843ca83173307d59785f8345e27cc520
+  data.tar.gz: 0f7bcf9c8f9ceaa040ccb7e9b9b7b2d9a7f570cb1b7d03d2be4c5390dfb26137cc3d6cc358fea903d55c7fd89a2315276a725c8112e80e909d2352c0d75db489

data/lib/log_bench/app/copy_handler.rb

@@ -16,6 +16,26 @@ module LogBench
         end
       end
 
+      def find_companion_call_line(request, selected_entry_id)
+        # Get the detail lines for the current request
+        lines = renderer&.get_cached_detail_lines(request)
+        return nil unless lines
+
+        # Find all lines belonging to the selected entry
+        selected_lines = lines.select { |line| line[:entry_id] == selected_entry_id }
+
+        # Look for a call line (starts with "↳") in the same entry group
+        call_line = selected_lines.find do |line|
+          text = line[:text]&.gsub(/\e\[[0-9;]*m/, "")&.strip
+          text&.start_with?("↳")
+        end
+
+        if call_line
+          # Clean and return the call line content
+          call_line[:text].gsub(/\e\[[0-9;]*m/, "").strip
+        end
+      end
+
       private
 
       attr_accessor :state, :renderer
@@ -51,7 +71,7 @@ module LogBench
         request = state.current_request
         return unless request
 
-        # Get the detail lines for the current request
+        # Get the detail lines for the current request to find entry IDs
         lines = renderer&.get_cached_detail_lines(request)
         return unless lines
 
@@ -63,24 +83,63 @@ module LogBench
         selected_entry_id = entry_ids[state.detail_selected_entry]
         return unless selected_entry_id
 
-        # Find all lines belonging to the selected entry
+        # Find lines belonging to the selected entry and look for original_entry reference
         selected_lines = lines.select { |line| line[:entry_id] == selected_entry_id }
 
-        # Extract the text content, removing ANSI codes and padding
-        content = selected_lines.map do |line|
-          text = line[:text] || ""
-          # Remove ANSI escape codes and trim padding
-          text.gsub(/\e\[[0-9;]*m/, "").strip
-        end.reject(&:empty?)
-
-        # Check if this is a SQL query by looking for SQL keywords in the content
-        content_text = content.join(" ")
-        is_sql_query = sql_query?(content_text)
+        # Look for a line that has the original_entry reference
+        original_entry = nil
+        selected_lines.each do |line|
+          if line[:original_entry]
+            original_entry = line[:original_entry]
+            break
+          end
+        end
 
-        if is_sql_query
-          Clipboard.copy("```sql\n#{content.join("\n")}\n```")
+        if original_entry
+          # Use the original log entry content
+          content = original_entry.content
+          return unless content
+
+          # Remove ANSI escape codes for clean copying
+          clean_content = content.gsub(/\e\[[0-9;]*m/, "").strip
+
+          # Check if this is a SQL query and if there's a companion call line
+          is_sql_query = sql_query?(clean_content)
+
+          if is_sql_query
+            # Look for companion call line in the same entry group
+            call_line_content = find_companion_call_line(request, selected_entry_id)
+
+            if call_line_content
+              # Include both SQL query and call line
+              full_content = "#{clean_content}\n#{call_line_content}"
+              Clipboard.copy("```sql\n#{full_content}\n```")
+            else
+              # Just the SQL query
+              Clipboard.copy("```sql\n#{clean_content}\n```")
+            end
+          else
+            Clipboard.copy(clean_content)
+          end
         else
-          Clipboard.copy(content.join("\n"))
+          # Fallback to the old method - join wrapped lines but try to reconstruct original
+          content = selected_lines.map do |line|
+            text = line[:text] || ""
+            # Remove ANSI escape codes and trim padding
+            text.gsub(/\e\[[0-9;]*m/, "").strip
+          end.reject(&:empty?)
+
+          # Try to join the content intelligently
+          content_text = content.join(" ").gsub(/\s+/, " ").strip
+
+          # Check if this is a SQL query
+          is_sql_query = sql_query?(content_text)
+
+          if is_sql_query
+            Clipboard.copy("```sql\n#{content_text}\n```")
+          else
+            Clipboard.copy(content_text)
+          end
         end
       end
 

data/lib/log_bench/app/renderer/details.rb

@@ -439,16 +439,16 @@ module LogBench
               # Check if current log is a SQL/cache query followed by a call source line
               if [:sql, :cache].include?(current_log.type) && next_log && next_log.type == :sql_call_line
                 # Group the query and call source together with the same entry_id
-                render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 0)
-                render_padded_text_with_spacing(next_log.content, lines, entry_id, extra_empty_lines: 1, use_separator: true)
+                render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 0, original_entry: current_log)
+                render_padded_text_with_spacing(next_log.content, lines, entry_id, extra_empty_lines: 1, use_separator: true, original_entry: current_log)
                 i += 2  # Skip the next log since we processed it
               else
                 # Handle standalone logs
                 case current_log.type
                 when :sql, :cache
-                  render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 0)
+                  render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 0, original_entry: current_log)
                 else
-                  render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 1)
+                  render_padded_text_with_spacing(current_log.content, lines, entry_id, extra_empty_lines: 1, original_entry: current_log)
                 end
                 i += 1
               end
@@ -485,7 +485,7 @@ module LogBench
           matched_indices.sort.map { |index| related_logs[index] }
         end
 
-        def render_padded_text_with_spacing(text, lines, entry_id, extra_empty_lines: 1, use_separator: false)
+        def render_padded_text_with_spacing(text, lines, entry_id, extra_empty_lines: 1, use_separator: false, original_entry: nil)
           # Helper function that renders text with padding, breaking long text into multiple lines
           content_width = detail_win.maxx - 8  # Account for padding (4 spaces each side)
 
@@ -501,12 +501,17 @@ module LogBench
           end
 
           # Render each chunk as a separate line with padding
-          text_chunks.each do |chunk|
-            lines << if has_ansi
+          text_chunks.each_with_index do |chunk, index|
+            line_data = if has_ansi
               {text: "  #{chunk}  ", color: nil, raw_ansi: true, entry_id: entry_id}
             else
               {text: "  #{chunk}  ", color: nil, entry_id: entry_id}
             end
+
+            # Add original_entry reference to the first line of each entry
+            line_data[:original_entry] = original_entry if index == 0 && original_entry
+
+            lines << line_data
           end
 
           # Add extra empty lines after all chunks

data/lib/log_bench/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogBench
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_bench
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Benjamín Silva