ruby_rich 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009a5bcd619dc3fa975c6ab3b01d1494e002ccc760b6e8ac335026f63860671e'
-  data.tar.gz: 205f8d0f1cdab77854a564c43761c30113f2989216ba2ed91b7ac66e77f2387f
+  metadata.gz: c81d8c96218da776dce71a58d8c6ab5065c106a0a6818ea7d73f16fb877e4e5c
+  data.tar.gz: f01f062343bcc4187861d2a984db97d624d2d810fd90f5f5720b446ad16fecaa
 SHA512:
-  metadata.gz: bedd0da9ee879bcca97fc9faf3c597cf857a05b6b8cca59004e9fbaefdbbee13b885b89902d4909a2b5718d7877201780f44418be7e2f3044f65c9840e40fe58
-  data.tar.gz: ac828f4bb8e7552b6a1b7310a0ba7be97d256710ce7f4aca3c523e0493b41e458fb722b33afafe01b90ab568338f14f6d56a3d546b29d191131986b07690acab
+  metadata.gz: c43c87d6fe89f77962a9a4ddfd5148b5ff97c1c81e5435ff39eac99ecdfa36efb270818db5aef4869b6d4feb947c7b859721d8f08aafea82a2fb582b4d0ca265
+  data.tar.gz: 6aa8944f0096c5af0ed9172a2e6fc85a97f97662b3ce7f54a3d55cf035686fba3a4ab98ed70f52411b3a2dfa320d2bc943e47ed3cbed7075965c5e5147ae0794

data/lib/ruby_rich/columns.rb

@@ -0,0 +1,244 @@
+module RubyRich
+  class Columns
+    class Column
+      attr_accessor :content, :width, :align, :padding, :title
+
+      def initialize(width: nil, align: :left, padding: 1, title: nil)
+        @content = []
+        @width = width
+        @align = align
+        @padding = padding
+        @title = title
+      end
+
+      def add(text)
+        @content << text.to_s
+        self
+      end
+
+      def <<(text)
+        add(text)
+      end
+
+      def clear
+        @content.clear
+        self
+      end
+
+      def lines
+        @content
+      end
+
+      def height
+        @content.length
+      end
+    end
+
+    attr_reader :columns, :total_width, :gutter_width
+
+    def initialize(total_width: 80, gutter_width: 2)
+      @columns = []
+      @total_width = total_width
+      @gutter_width = gutter_width
+    end
+
+    # 添加列
+    def add_column(width: nil, align: :left, padding: 1, title: nil)
+      column = Column.new(width: width, align: align, padding: padding, title: title)
+      @columns << column
+      
+      # 如果没有指定宽度，自动计算平均宽度
+      calculate_column_widths if width.nil?
+      
+      column
+    end
+
+    # 删除列
+    def remove_column(index)
+      @columns.delete_at(index) if index >= 0 && index < @columns.length
+      calculate_column_widths
+    end
+
+    # 清空所有列的内容
+    def clear_all
+      @columns.each(&:clear)
+      self
+    end
+
+    # 渲染列布局
+    def render(show_headers: true, show_borders: false, equal_height: true)
+      return "" if @columns.empty?
+
+      calculate_column_widths
+      lines = []
+
+      # 渲染标题行
+      if show_headers && @columns.any? { |col| col.title }
+        header_line = render_header_line(show_borders)
+        lines << header_line unless header_line.empty?
+        
+        if show_borders
+          separator_line = render_separator_line
+          lines << separator_line
+        end
+      end
+
+      # 准备内容行
+      max_height = equal_height ? @columns.map(&:height).max : 0
+      
+      # 填充较短的列以达到相同高度
+      if equal_height && max_height > 0
+        @columns.each do |column|
+          while column.height < max_height
+            column.add("")
+          end
+        end
+      end
+
+      # 渲染内容行
+      content_height = @columns.map(&:height).max || 0
+      content_height.times do |row_index|
+        line = render_content_line(row_index, show_borders)
+        lines << line
+      end
+
+      # 渲染底部边框
+      if show_borders
+        bottom_line = render_separator_line
+        lines << bottom_line
+      end
+
+      lines.join("\n")
+    end
+
+    # 按比例设置列宽
+    def set_ratios(*ratios)
+      return if ratios.length != @columns.length
+
+      total_ratio = ratios.sum.to_f
+      available_width = @total_width - (@gutter_width * (@columns.length - 1))
+      
+      @columns.each_with_index do |column, index|
+        column.width = (available_width * ratios[index] / total_ratio).to_i
+      end
+      
+      self
+    end
+
+    # 设置等宽列
+    def equal_widths
+      calculate_column_widths
+      self
+    end
+
+    private
+
+    def calculate_column_widths
+      return if @columns.empty?
+
+      # 计算可用宽度（总宽度减去间隔）
+      available_width = @total_width - (@gutter_width * (@columns.length - 1))
+      
+      # 为每列分配相等的宽度
+      base_width = available_width / @columns.length
+      remainder = available_width % @columns.length
+      
+      @columns.each_with_index do |column, index|
+        column.width = base_width + (index < remainder ? 1 : 0)
+      end
+    end
+
+    def render_header_line(show_borders)
+      line_parts = []
+      
+      @columns.each_with_index do |column, index|
+        header_text = column.title || ""
+        
+        # 根据列的对齐方式格式化标题
+        formatted_header = format_text(header_text, column.width, column.align)
+        
+        if show_borders
+          formatted_header = "│ #{formatted_header} │"
+        end
+        
+        line_parts << formatted_header
+        
+        # 添加间隔（除了最后一列）
+        if index < @columns.length - 1 && !show_borders
+          line_parts << " " * @gutter_width
+        end
+      end
+      
+      line_parts.join("")
+    end
+
+    def render_content_line(row_index, show_borders)
+      line_parts = []
+      
+      @columns.each_with_index do |column, index|
+        content_text = column.lines[row_index] || ""
+        
+        # 根据列的对齐方式格式化内容
+        formatted_content = format_text(content_text, column.width, column.align)
+        
+        if show_borders
+          formatted_content = "│ #{formatted_content} │"
+        end
+        
+        line_parts << formatted_content
+        
+        # 添加间隔（除了最后一列）
+        if index < @columns.length - 1 && !show_borders
+          line_parts << " " * @gutter_width
+        end
+      end
+      
+      line_parts.join("")
+    end
+
+    def render_separator_line
+      line_parts = []
+      
+      @columns.each_with_index do |column, index|
+        separator = "─" * (column.width + 2)  # +2 for padding
+        line_parts << "├#{separator}┤"
+        
+        if index < @columns.length - 1
+          line_parts << "┬"
+        end
+      end
+      
+      line_parts.join("")
+    end
+
+    def format_text(text, width, align)
+      # 移除 ANSI 转义序列计算实际显示宽度
+      display_text = text.gsub(/\e\[[0-9;]*m/, '')
+      
+      if display_text.length > width
+        # 截断过长的文本
+        truncated = display_text[0, width - 3] + "..."
+        # 保持原有的 ANSI 样式
+        if text.include?("\e[")
+          style_start = text.match(/\e\[[0-9;]*m/)&.to_s || ""
+          truncated = style_start + truncated + "\e[0m"
+        end
+        truncated
+      else
+        # 根据对齐方式填充空格
+        padding_needed = width - display_text.length
+        
+        case align
+        when :center
+          left_padding = padding_needed / 2
+          right_padding = padding_needed - left_padding
+          " " * left_padding + text + " " * right_padding
+        when :right
+          " " * padding_needed + text
+        else # :left
+          text + " " * padding_needed
+        end
+      end
+    end
+  end
+end

data/lib/ruby_rich/console.rb

@@ -37,10 +37,23 @@ module RubyRich
       @styles[name] = attributes
     end
 
-    def print(*objects, sep: ' ', end_char: "\n")
-      line_text = objects.map(&:to_s).join(sep)
-      add_line(line_text)
-      render
+    def print(*objects, sep: ' ', end_char: "\n", immediate: false)
+      line_text = objects.map do |obj|
+        if obj.is_a?(String) && obj.include?('[')
+          # 处理 Rich markup 标记
+          RichText.markup(obj)
+        else
+          obj.to_s
+        end
+      end.join(sep)
+      
+      if immediate
+        add_line(line_text)
+        render
+      else
+        # 简单输出，不使用 Console 的缓冲和渲染系统
+        Kernel.puts line_text
+      end
     end
 
     def log(message, *objects, sep: ' ', end_char: "\n")
@@ -78,7 +91,9 @@ module RubyRich
         char = io.getch
         # 优先处理回车键（ASCII 13 = \r，ASCII 10 = \n）
         if char == "\r" || char == "\n"
-          return {:name=>:enter}
+          # 检查是否有后续输入（粘贴内容会有多个字符）
+          has_more = IO.select([io], nil, nil, 0)
+          return has_more ? {:name => :string, :value => char} : {:name=>:enter}
         end
         # 单独处理 Tab 键（ASCII 9）
         if char == "\t"

data/lib/ruby_rich/markdown.rb

@@ -0,0 +1,343 @@
+require 'redcarpet'
+
+module RubyRich
+  class Markdown
+    # 简化的 Markdown 渲染器，将 Markdown 转换为带 ANSI 颜色的终端输出
+    class TerminalRenderer < Redcarpet::Render::Base
+      def initialize(options = {})
+        @options = {
+          width: 80,
+          indent: '  '
+        }.merge(options)
+        super()
+        
+        # 表格状态
+        reset_table_state
+      end
+
+      def reset_table_state
+        @table_state = {
+          in_table: false,
+          headers: [],
+          current_row: [],
+          rows: []
+        }
+      end
+
+      # 段落
+      def paragraph(text)
+        wrap_text(text) + "\n\n"
+      end
+
+      # 标题
+      def header(text, level)
+        case level
+        when 1
+          "\e[1m\e[96m#{text}\e[0m\n" + "\e[96m#{'=' * text.length}\e[0m\n\n"
+        when 2
+          "\e[1m\e[94m#{text}\e[0m\n" + "\e[94m#{'-' * text.length}\e[0m\n\n"
+        when 3
+          "\e[1m\e[93m### #{text}\e[0m\n\n"
+        else
+          "\e[1m\e[90m#{'#' * level} #{text}\e[0m\n\n"
+        end
+      end
+
+      # 代码块
+      def block_code(code, language)
+        # 简单的代码格式，不使用语法高亮避免循环依赖
+        "\e[100m\e[37m" + indent_lines(code.strip) + "\e[0m\n\n"
+      end
+
+      # 行内代码
+      def codespan(code)
+        "\e[47m\e[30m #{code} \e[0m"
+      end
+
+      # 引用
+      def block_quote(quote)
+        lines = quote.strip.split("\n")
+        quoted_lines = lines.map { |line| "\e[90m│ \e[37m#{line.strip}" }
+        quoted_lines.join("\n") + "\e[0m\n\n"
+      end
+
+      # 列表项
+      def list_item(text, list_type)
+        marker = list_type == :ordered ? '1.' : '•'
+        "\e[96m#{marker}\e[0m #{text.strip}\n"
+      end
+
+      # 无序列表
+      def list(contents, list_type)
+        contents + "\n"
+      end
+
+      # 强调
+      def emphasis(text)
+        "\e[3m#{text}\e[23m"
+      end
+
+      # 加粗
+      def double_emphasis(text)
+        "\e[1m#{text}\e[22m"
+      end
+
+      # 删除线
+      def strikethrough(text)
+        "\e[9m#{text}\e[29m"
+      end
+
+      # 链接
+      def link(link, title, content)
+        if title && !title.empty?
+          "\e[94m\e[4m#{content}\e[24m\e[0m \e[90m(#{link} - #{title})\e[0m"
+        else
+          "\e[94m\e[4m#{content}\e[24m\e[0m \e[90m(#{link})\e[0m"
+        end
+      end
+
+      # 图片
+      def image(link, title, alt_text)
+        if title && !title.empty?
+          "\e[95m[Image: #{alt_text}]\e[0m \e[90m(#{link} - #{title})\e[0m"
+        else
+          "\e[95m[Image: #{alt_text}]\e[0m \e[90m(#{link})\e[0m"
+        end
+      end
+
+      # 水平线
+      def hrule
+        "\e[90m" + "─" * @options[:width] + "\e[0m\n\n"
+      end
+
+      # 表格渲染 - 智能分割方法
+      def table(header, body)
+        return "" if header.nil? && body.nil?
+        
+        begin
+          # 尝试智能分割表格内容
+          headers = []
+          rows = []
+          
+          if header && !header.strip.empty?
+            # 从header中提取列标题
+            header_content = header.strip
+            # 尝试按常见模式分割（大写字母开头的单词）
+            headers = split_table_content_intelligently(header_content)
+          end
+          
+          if body && !body.strip.empty?
+            body_lines = body.strip.split("\n").reject(&:empty?)
+            body_lines.each do |line|
+              row_data = split_table_content_intelligently(line.strip)
+              rows << row_data unless row_data.all?(&:empty?)
+            end
+          end
+          
+          # 如果成功解析出了数据，使用RubyRich表格
+          if !headers.empty? && !rows.empty?
+            table = RubyRich::Table.new(
+              headers: headers,
+              border_style: @options[:table_border_style] || :simple
+            )
+            
+            rows.each do |row|
+              # 确保行长度与标题长度一致
+              padded_row = row + Array.new([0, headers.length - row.length].max, "")
+              table.add_row(padded_row[0...headers.length])
+            end
+            
+            return table.render + "\n\n"
+          end
+          
+        rescue => e
+          # 如果出错，继续使用fallback
+        end
+        
+        # Fallback: 简单显示
+        result = "\n"
+        if header && !header.strip.empty?
+          result += "#{header.strip}\n"
+          result += "-" * [header.strip.length, 20].min + "\n"
+        end
+        if body && !body.strip.empty?
+          result += body.strip + "\n"
+        end
+        result + "\n"
+      end
+
+      def table_row(content)
+        content + "\n"
+      end
+
+      def table_cell(content, alignment)
+        content
+      end
+
+      # 换行
+      def linebreak
+        "\n"
+      end
+
+      private
+
+      def wrap_text(text, width = nil)
+        width ||= @options[:width]
+        return text if text.length <= width
+        
+        words = text.split(' ')
+        lines = []
+        current_line = ''
+        
+        words.each do |word|
+          if (current_line + ' ' + word).length <= width
+            current_line += current_line.empty? ? word : ' ' + word
+          else
+            lines << current_line unless current_line.empty?
+            current_line = word
+          end
+        end
+        
+        lines << current_line unless current_line.empty?
+        lines.join("\n")
+      end
+
+      def indent_lines(text)
+        text.split("\n").map { |line| @options[:indent] + line }.join("\n")
+      end
+
+      def parse_table_content(content)
+        lines = content.strip.split("\n").map(&:strip).reject(&:empty?)
+        return [] if lines.empty?
+        
+        rows = []
+        lines.each do |line|
+          # 跳过分隔符行（如 |------|--------|）
+          next if line.match?(/^\|[\s\-\|:]+\|?$/)
+          
+          # 解析表格行
+          if line.start_with?('|') && line.end_with?('|')
+            cells = line[1..-2].split('|').map(&:strip)
+            rows << cells unless cells.empty?
+          elsif line.include?('|')
+            cells = line.split('|').map(&:strip)
+            rows << cells unless cells.empty?
+          end
+        end
+        
+        rows
+      end
+
+      def render_table_with_ruby_rich(rows)
+        return "" if rows.empty?
+        
+        # 使用第一行作为表头
+        headers = rows.first
+        data_rows = rows[1..-1] || []
+        
+        # 创建RubyRich表格，使用简单边框样式来匹配markdown风格
+        table = RubyRich::Table.new(
+          headers: headers,
+          border_style: @options[:table_border_style] || :simple
+        )
+        
+        # 添加数据行
+        data_rows.each do |row|
+          # 确保行长度与标题长度一致
+          padded_row = row + Array.new([0, headers.length - row.length].max, "")
+          table.add_row(padded_row)
+        end
+        
+        table.render + "\n\n"
+      rescue => e
+        # 如果表格渲染失败，使用简单的文字格式
+        fallback_table_render(rows)
+      end
+
+      def fallback_table_render(rows)
+        return "" if rows.empty?
+        
+        result = []
+        rows.each_with_index do |row, index|
+          result << "| " + row.join(" | ") + " |"
+          if index == 0 # 在标题下添加分隔线
+            result << "|" + ("-" * (row.join(" | ").length + 2)) + "|"
+          end
+        end
+        
+        result.join("\n") + "\n\n"
+      end
+
+      def split_table_content_intelligently(content)
+        return [] if content.nil? || content.strip.empty?
+        
+        # 策略1：更智能的分割 - 先尝试找到数字字母边界
+        split_points = []
+        content.each_char.with_index do |char, index|
+          if index > 0 && index < content.length - 1
+            prev_char = content[index - 1]
+            # 在字母后跟数字，或数字后跟字母的地方分割
+            if (prev_char =~ /[A-Za-z]/ && char =~ /\d/) ||
+               (prev_char =~ /\d/ && char =~ /[A-Za-z]/)
+              split_points << index
+            end
+          end
+        end
+        
+        if split_points.any?
+          parts = []
+          last_pos = 0
+          split_points.each do |pos|
+            parts << content[last_pos...pos] if pos > last_pos
+            last_pos = pos
+          end
+          parts << content[last_pos..-1] if last_pos < content.length
+          result = parts.reject(&:empty?)
+          return result if result.length >= 2
+        end
+        
+        # 策略2：如果没有数字字母边界，按大写字母分割（但要小心短词）
+        words = content.scan(/[A-Z][a-z]+|[A-Z]{2,}/)
+        if words.length >= 2 && words.all? { |w| w.length >= 2 }
+          return words
+        end
+        
+        # 策略3：按连续的字母和数字分组
+        parts = content.scan(/[A-Za-z]+|\d+/)
+        if parts.length >= 2
+          return parts
+        end
+        
+        # 策略4：按空格分割
+        space_parts = content.split(/\s+/).reject(&:empty?)
+        if space_parts.length >= 2
+          return space_parts
+        end
+        
+        # 最后的fallback：返回原始内容
+        [content]
+      end
+    end
+
+    def self.render(markdown_text, options = {})
+      renderer = TerminalRenderer.new(options)
+      markdown_processor = Redcarpet::Markdown.new(renderer, {
+        fenced_code_blocks: true,
+        tables: true,
+        autolink: true,
+        strikethrough: true,
+        space_after_headers: true
+      })
+      
+      markdown_processor.render(markdown_text)
+    end
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def render(markdown_text)
+      self.class.render(markdown_text, @options)
+    end
+  end
+end

data/lib/ruby_rich/panel.rb

@@ -134,10 +134,15 @@ module RubyRich
       # Split text into tokens of ANSI codes and regular text
       tokens = text.scan(/(\e\[[0-9;]*m)|(.)/)
                    .map { |m| m.compact.first }
-      
+      start_color = nil
       tokens.each do |token|
         # Calculate width for regular text, ANSI codes have 0 width
         if token.start_with?("\e[")
+          if token == "\e[0m"
+            start_color = nil
+          else
+            start_color = token
+          end
           token_width = 0
         else
           token_width = token.chars.sum { |c| Unicode::DisplayWidth.of(c) }
@@ -148,7 +153,7 @@ module RubyRich
           current_width += token_width
         else
           result << current_line
-          current_line = token
+          current_line = start_color.to_s+token
           current_width = token_width
         end
       end