ruby_rich 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568e2001bde24749d1410dadda7e77090963eedc48e9ad9e6d77f036e245a51f
-  data.tar.gz: 99a40412ae33eb985e7b0e1d4dc0516b8539ca32eb79ae7ec881b673d350ecc5
+  metadata.gz: 852764b68219de1ce528f772a55c3e454b3556c35aa9f0c0e89c29f31c2293ba
+  data.tar.gz: e2827430cb5dada9ae7d8ca1cb59d9fbca4df95790404c1bcb893e7323864b95
 SHA512:
-  metadata.gz: 187311b6561fcfea7c51af5ab44bd8b8dcbead8fabd5108d9356b07eacf82f0994ef5c6c64e00db1764a7cd8a546feb6df17c2ab119f21e11898a924a485499e
-  data.tar.gz: ff1f361748e077f0ad6f59c30b22a8502e83a2196e7ab23a2365ee67362283036f0fb1e3da4eea102cdacfcea1c8c1ab1c08b15e8841c0da1b270182e0497e4b
+  metadata.gz: 95388b58b409347a55ebd1ef3dded1d3520810c7f31292bb83e14dd73192f356ec453b5688dd9dc122ae1e626ff365d6738c2d9a4de799adf53df2b2cced8916
+  data.tar.gz: 342ed768c7a9f04fadc1da1ec1d775fbbbdf482fc446f55ed69b4eb880159118cd36f6860c11964ddcc7371e70bcc35adcca0203183fcc558a604bd43786091e

data/lib/ruby_rich/markdown.rb

@@ -221,27 +221,28 @@ module RubyRich
 
         return "" if header_rows.empty? || body_rows.empty?
 
-        headers = header_rows.last
+        headers, fitted_body_rows = fit_table_rows(header_rows.last, body_rows)
         begin
           tbl = RubyRich::Table.new(
             headers: headers,
-            border_style: @table_border_style
+            border_style: @table_border_style || :simple
           )
-          body_rows.each do |row|
+          fitted_body_rows.each do |row|
             padded = row + Array.new([0, headers.length - row.length].max, "")
             tbl.add_row(padded[0...headers.length])
           end
           "#{tbl.render}\n\n"
         rescue
-          # fallback: 纯文本表格
+          # fallback: plain text table
           result = "\n"
           result += header_rows.last.join(" | ")
           result += "\n#{"-" * [result.strip.length, 20].min}\n"
           body_rows.each { |row| result += row.join(" | ") + "\n" }
-          "#{result}\n"
+          return "#{result}\n"
         end
       end
 
+      # Extract cell text from a table row element.
       def collect_row_cells(tr)
         tr.children.select { |c| [:th, :td].include?(c.type) }
           .map { |c| inline_content(c) }
@@ -255,6 +256,116 @@ module RubyRich
         inline_content(el)
       end
 
+      # ---- 表格宽度自适应 ----
+
+      # Fit table cell content to terminal width by normalising column counts,
+      # calculating natural widths, constraining to available space, and wrapping
+      # cell text.
+      def fit_table_rows(header_row, body_rows)
+        column_count = [header_row.length, *body_rows.map(&:length)].max.to_i
+        normalized_header = header_row + Array.new([0, column_count - header_row.length].max, "")
+        normalized_body = body_rows.map { |row| row + Array.new([0, column_count - row.length].max, "") }
+        natural_widths = table_natural_widths(normalized_header, normalized_body)
+        column_widths = constrain_table_widths(natural_widths)
+
+        headers = normalized_header.each_with_index.map { |cell, index| wrap_table_cell(table_cell_text(cell), column_widths[index]) }
+        rows = normalized_body.map do |row|
+          row.each_with_index.map { |cell, index| wrap_table_cell(table_cell_text(cell), column_widths[index]) }
+        end
+
+        [headers, rows]
+      end
+
+      # Maximum display width per column.
+      def table_natural_widths(header_row, body_rows)
+        rows = [header_row] + body_rows
+        return [] if rows.empty?
+
+        rows.transpose.map do |cells|
+          cells.map { |cell| cell_display_width(table_cell_text(cell)) }.max.to_i
+        end
+      end
+
+      # Strip ANSI escape sequences from a cell value.
+      def table_cell_text(cell)
+        cell.to_s.gsub(/\e\[[0-9;:]*m/, "")
+      end
+
+      # Shrink column widths proportionally to fit the terminal width.
+      def constrain_table_widths(natural_widths)
+        return natural_widths if natural_widths.empty?
+
+        border_overhead = (natural_widths.length * 3) + 1
+        max_table_width = [[(@width || 80).to_i - 1, 20].max, border_overhead + natural_widths.length].max
+        available_content_width = [max_table_width - border_overhead, natural_widths.length].max
+        widths = natural_widths.map { |width| [width, 1].max }
+        return widths if widths.sum <= available_content_width
+
+        min_width = available_content_width < natural_widths.length * 3 ? 1 : 3
+        while widths.sum > available_content_width
+          index = widths.each_with_index.select { |width, _| width > min_width }.max_by(&:first)&.last
+          break unless index
+
+          widths[index] -= 1
+        end
+        widths
+      end
+
+      # Wrap cell text to fit a given display width, splitting across newlines
+      # and wrapping long lines.
+      def wrap_table_cell(text, width)
+        width = [width.to_i, 1].max
+        text.to_s.split("\n", -1).flat_map do |line|
+          wrap_table_line(line, width)
+        end.join("\n")
+      end
+
+      # Wrap a single line of text to the given display width, preserving any
+      # ANSI escape sequences (re-emitted on each wrapped segment).
+      def wrap_table_line(line, width)
+        return [""] if line.empty?
+
+        lines = []
+        current = +""
+        current_width = 0
+        in_escape = false
+        escape = +""
+
+        line.each_char do |char|
+          if in_escape
+            escape << char
+            if char == "m"
+              current << escape
+              escape = +""
+              in_escape = false
+            end
+            next
+          elsif char.ord == 27
+            escape << char
+            in_escape = true
+            next
+          end
+
+          char_width = Unicode::DisplayWidth.of(char)
+          if current_width.positive? && current_width + char_width > width
+            lines << current
+            current = +""
+            current_width = 0
+          end
+          current << char
+          current_width += char_width
+        end
+
+        lines << current unless current.empty?
+        lines.empty? ? [""] : lines
+      end
+
+      # Display width of text after stripping ANSI escape sequences, taking the
+      # maximum across lines (for multi-line cells).
+      def cell_display_width(text)
+        text.to_s.gsub(/\e\[[0-9;:]*m/, "").split("\n").map(&:display_width).max.to_i
+      end
+
       # ---- HTML 元素处理 ----
 
       def convert_html_element(el)
@@ -409,4 +520,4 @@ module RubyRich
       self.class.render(markdown_text, @options)
     end
   end
-end
+end

data/lib/ruby_rich/transcript.rb

@@ -412,6 +412,8 @@ module RubyRich
     private
 
     def render_entry(entry, index)
+      return entry.content.to_s.split("\n", -1) if entry.metadata[:plain]
+
       case entry.type
       when :user
         render_plain_message(entry.content, first_prefix: "#{AnsiCode.color(:blue, true)}●#{AnsiCode.reset} ", rest_prefix: "  ")

data/lib/ruby_rich/version.rb

@@ -1,3 +1,3 @@
 module RubyRich
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/lib/ruby_rich/viewport.rb

@@ -1,11 +1,21 @@
 # frozen_string_literal: true
 
+require "base64"
+
 module RubyRich
   class Viewport
     attr_accessor :width, :height, :scroll_top
     attr_reader :content, :selected_text
 
-    def initialize(content = "", scrollbar: true, auto_scroll: false, scrollbar_style: :blue)
+    # drag_mode controls what left-click drag does in the content area:
+    #   :viewport  – drag scrolls the viewport (default, backward-compatible)
+    #   :selection – drag selects text
+    DRAG_MODES = [:viewport, :selection].freeze
+
+    def initialize(content = "",
+                   scrollbar: true, auto_scroll: false,
+                   scrollbar_style: :blue, auto_copy: true,
+                   drag_mode: :viewport)
       @content = content
       @scrollbar = scrollbar
       @auto_scroll = auto_scroll
@@ -22,6 +32,8 @@ module RubyRich
       @selection_end = nil
       @selected_text = ""
       @focused = true
+      @auto_copy = auto_copy
+      @drag_mode = DRAG_MODES.include?(drag_mode) ? drag_mode : :viewport
       @rendered_lines_cache_key = nil
       @rendered_lines_cache = nil
     end
@@ -88,10 +100,14 @@ module RubyRich
         true
       when :mouse_down
         return copy_selection if event_data[:button] == :right
-
-        start_scrollbar_drag(event_data, layout) || start_viewport_drag(event_data, layout)
+        if @drag_mode == :selection
+          start_scrollbar_drag(event_data, layout) || start_selection(event_data, layout)
+        else
+          start_scrollbar_drag(event_data, layout) || start_viewport_drag(event_data, layout)
+        end
       when :mouse_drag
-        drag_scrollbar(event_data, layout) || drag_viewport(event_data, layout) || drag_selection(event_data, layout)
+        drag_scrollbar(event_data, layout) ||
+          (@drag_mode == :selection ? drag_selection(event_data, layout) : (drag_viewport(event_data, layout) || drag_selection(event_data, layout)))
       when :mouse_up
         stop_scrollbar_drag || stop_viewport_drag || stop_selection
       else
@@ -415,7 +431,7 @@ module RubyRich
 
       @selecting = false
       @selected_text = extract_selected_text
-      copy_selection
+      copy_selection if @auto_copy
       true
     end
 
@@ -477,6 +493,7 @@ module RubyRich
           escape << char
           if char == "m"
             result << escape
+            result << AnsiCode.inverse if active
             escape = +""
             in_escape = false
           end
@@ -531,18 +548,61 @@ module RubyRich
       text.gsub(/\e\[[0-9;:]*m/, "")
     end
 
+    # Copy text to the system clipboard, trying every available method in
+    # sequence and falling back to the OSC 52 terminal clipboard so that
+    # remote (SSH) sessions also work.
     def copy_to_clipboard(text)
-      if RubyRich::Terminal.windows?
-        copy_to_windows_clipboard(text)
-      elsif ENV["WAYLAND_DISPLAY"]
-        IO.popen("wl-copy", "w") { |io| io.write(text) }
-      elsif ENV["DISPLAY"]
-        IO.popen("xclip -selection clipboard", "w") { |io| io.write(text) }
-      elsif RUBY_PLATFORM.match?(/darwin/)
-        IO.popen("pbcopy", "w") { |io| io.write(text) }
+      text = text.to_s
+      return false if text.empty?
+      return true if RubyRich::Terminal.windows? && try_windows_clipboard(text)
+
+      clipboard_commands.each do |command|
+        return true if write_clipboard_command(command, text)
+      end
+
+      copy_to_terminal_clipboard(text)
+    end
+
+    # Ordered list of [command, *args] arrays to try for clipboard access.
+    def clipboard_commands
+      commands = []
+      commands << ["wl-copy"] if ENV["WAYLAND_DISPLAY"]
+      if ENV["DISPLAY"]
+        commands << ["xclip", "-selection", "clipboard"]
+        commands << ["xsel", "--clipboard", "--input"]
       end
+      commands << ["pbcopy"] if RUBY_PLATFORM.match?(/darwin/)
+      commands
+    end
+
+    # Attempt to write text to a given clipboard command via a pipe.
+    # Returns true when the subprocess exits successfully.
+    def write_clipboard_command(command, text)
+      IO.popen(command, "w") { |io| io.write(text) }
+      $?&.success? == true
     rescue IOError, SystemCallError
-      nil
+      false
+    end
+
+    # Try the OS-specific Windows clipboard helper and return true when it
+    # succeeds (any IO/Syscall error is treated as failure).
+    def try_windows_clipboard(text)
+      copy_to_windows_clipboard(text)
+      true
+    rescue IOError, SystemCallError
+      false
+    end
+
+    # OSC 52 terminal clipboard – the only fallback that works over SSH.
+    # Encoded payload is emitted on stdout for the hosting terminal to
+    # capture.
+    def copy_to_terminal_clipboard(text)
+      encoded = Base64.strict_encode64(text.encode(Encoding::UTF_8))
+      $stdout.print("\e]52;c;#{encoded}\a")
+      $stdout.flush
+      true
+    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError, IOError, SystemCallError
+      false
     end
 
     def copy_to_windows_clipboard(text)
@@ -559,4 +619,4 @@ module RubyRich
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rich
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - zhuang biaowei