ruby_rich 0.3.1 → 0.4.0

data/lib/ruby_rich/table.rb

@@ -2,36 +2,182 @@ require 'unicode/display_width'
 
 module RubyRich
   class Table
-    attr_accessor :headers, :rows, :align, :row_height
+    attr_accessor :rows, :align, :row_height, :border_style
+    attr_reader :headers
+
+    # 边框样式定义
+    BORDER_STYLES = {
+      none: {
+        top: '', bottom: '', left: '', right: '', 
+        horizontal: '-', vertical: '|',
+        top_left: '', top_right: '', bottom_left: '', bottom_right: '',
+        cross: '', top_cross: '', bottom_cross: '', left_cross: '', right_cross: ''
+      },
+      simple: {
+        top: '-', bottom: '-', left: '|', right: '|',
+        horizontal: '-', vertical: '|',
+        top_left: '+', top_right: '+', bottom_left: '+', bottom_right: '+',
+        cross: '+', top_cross: '+', bottom_cross: '+', left_cross: '+', right_cross: '+'
+      },
+      full: {
+        top: '─', bottom: '─', left: '│', right: '│',
+        horizontal: '─', vertical: '│',
+        top_left: '┌', top_right: '┐', bottom_left: '└', bottom_right: '┘',
+        cross: '┼', top_cross: '┬', bottom_cross: '┴', left_cross: '├', right_cross: '┤'
+      }
+    }.freeze
   
-    def initialize(headers: [], align: :left, row_height: 1)
+    def initialize(headers: [], align: :left, row_height: 1, border_style: :none)
       @headers = headers.map { |h| format_cell(h) }
       @rows = []
       @align = align
       @row_height = row_height
+      @border_style = border_style
     end
   
     def add_row(row)
       @rows << row.map { |cell| format_cell(cell) }
     end
+
+    def headers=(new_headers)
+      @headers = new_headers.map { |h| format_cell(h) }
+    end
   
     def render
+      return render_empty_table if @headers.empty? && @rows.empty?
+      
       column_widths = calculate_column_widths
       lines = []
-  
+      border_chars = BORDER_STYLES[@border_style] || BORDER_STYLES[:none]
+
+      # Render top border
+      if @border_style != :none && !@headers.empty?
+        lines << render_horizontal_border(column_widths, :top)
+      end
+
       # Render headers
-      lines << render_row(@headers, column_widths, bold: true)
-      lines << "-" * (column_widths.sum { |w| w + 3 } + 1)
-  
+      unless @headers.empty?
+        lines.concat(render_styled_row(@headers, column_widths, bold: true))
+        # Header separator line
+        lines << render_horizontal_border(column_widths, :middle)
+      end
+
       # Render rows
-      @rows.each do |row|
-        lines.concat(render_multiline_row(row, column_widths))
+      @rows.each_with_index do |row, index|
+        lines.concat(render_styled_multiline_row(row, column_widths))
       end
-  
+
+      # Render bottom border
+      if @border_style != :none && (!@headers.empty? || !@rows.empty?)
+        lines << render_horizontal_border(column_widths, :bottom)
+      end
+
       lines.join("\n")
     end
   
     private
+
+    def render_empty_table
+      if @border_style == :none
+        return "|  |\n-"
+      else
+        border_chars = BORDER_STYLES[@border_style]
+        return "#{border_chars[:top_left]}#{border_chars[:horizontal] * 2}#{border_chars[:top_right]}\n" +
+               "#{border_chars[:left]}  #{border_chars[:right]}\n" +
+               "#{border_chars[:bottom_left]}#{border_chars[:horizontal] * 2}#{border_chars[:bottom_right]}"
+      end
+    end
+
+    def render_horizontal_border(column_widths, position)
+      return "-" * (column_widths.sum { |w| w + 3 } + 1) if @border_style == :none
+      
+      border_chars = BORDER_STYLES[@border_style]
+      
+      # 计算每列的边框宽度（包括左右的空格）
+      segments = column_widths.map { |width| border_chars[:horizontal] * (width + 2) }
+      
+      case position
+      when :top
+        left_char = border_chars[:top_left]
+        right_char = border_chars[:top_right]
+        join_char = border_chars[:top_cross]
+      when :middle
+        left_char = border_chars[:left_cross]
+        right_char = border_chars[:right_cross]
+        join_char = border_chars[:cross]
+      when :bottom
+        left_char = border_chars[:bottom_left]
+        right_char = border_chars[:bottom_right]
+        join_char = border_chars[:bottom_cross]
+      else
+        left_char = border_chars[:left_cross]
+        right_char = border_chars[:right_cross]  
+        join_char = border_chars[:cross]
+      end
+      
+      left_char + segments.join(join_char) + right_char
+    end
+
+    def render_styled_row(row, column_widths, bold: false)
+      if @border_style == :none
+        return [render_row(row, column_widths, bold: bold)]
+      end
+      
+      border_chars = BORDER_STYLES[@border_style]
+      
+      row_content = row.map.with_index do |cell, i|
+        content = bold ? cell.render : align_cell(cell.render, column_widths[i])
+        aligned_content = align_cell(content, column_widths[i])
+        " #{aligned_content} "
+      end.join(border_chars[:vertical])
+      
+      ["#{border_chars[:left]}#{row_content}#{border_chars[:right]}"]
+    end
+
+    def render_styled_multiline_row(row, column_widths)
+      if @border_style == :none
+        return render_multiline_row(row, column_widths)
+      end
+      
+      border_chars = BORDER_STYLES[@border_style]
+      
+      # Prepare each cell's lines
+      row_lines = row.map.with_index do |cell, i|
+        # 获取单元格的样式序列
+        style_sequence = cell.render.match(/\e\[[0-9;]*m/)&.to_s || ""
+        reset_sequence = style_sequence.empty? ? "" : "\e[0m"
+        
+        # 分割成多行并保持样式
+        cell_content = cell.render.split("\n")
+        
+        # 为每一行添加样式
+        cell_content.map! { |line| 
+          line = line.gsub(/\e\[[0-9;]*m/, '') # 移除可能存在的样式序列
+          style_sequence + line + reset_sequence 
+        }
+        
+        # 填充到指定的行高
+        padded_content = cell_content + [" "] * [@row_height - cell_content.size, 0].max
+        
+        # 对每一行应用对齐，保持样式
+        padded_content.map { |line| align_cell(line, column_widths[i]) }
+      end
+
+      # Normalize row height
+      max_height = row_lines.map(&:size).max
+      row_lines.each do |lines|
+        width = column_widths[row_lines.index(lines)]
+        style_sequence = lines.first.match(/\e\[[0-9;]*m/)&.to_s || ""
+        reset_sequence = style_sequence.empty? ? "" : "\e[0m"
+        lines.fill(style_sequence + " " * width + reset_sequence, lines.size...max_height)
+      end
+
+      # Render each line of the row
+      (0...max_height).map do |line_index|
+        row_content = row_lines.map { |lines| " #{lines[line_index]} " }.join(border_chars[:vertical])
+        "#{border_chars[:left]}#{row_content}#{border_chars[:right]}"
+      end
+    end
   
     def format_cell(cell)      
       cell.is_a?(RubyRich::RichText) ? cell : RubyRich::RichText.new(cell.to_s)

data/lib/ruby_rich/text.rb

@@ -8,6 +8,43 @@ module RubyRich
       warning: { color: :yellow, bold: true }
     }
 
+    # Rich markup 标记映射
+    MARKUP_PATTERNS = {
+      # Basic colors
+      /\[red\](.*?)\[\/red\]/m => proc { |text| "\e[31m#{text}\e[0m" },
+      /\[green\](.*?)\[\/green\]/m => proc { |text| "\e[32m#{text}\e[0m" },
+      /\[yellow\](.*?)\[\/yellow\]/m => proc { |text| "\e[33m#{text}\e[0m" },
+      /\[blue\](.*?)\[\/blue\]/m => proc { |text| "\e[34m#{text}\e[0m" },
+      /\[magenta\](.*?)\[\/magenta\]/m => proc { |text| "\e[35m#{text}\e[0m" },
+      /\[cyan\](.*?)\[\/cyan\]/m => proc { |text| "\e[36m#{text}\e[0m" },
+      /\[white\](.*?)\[\/white\]/m => proc { |text| "\e[37m#{text}\e[0m" },
+      /\[black\](.*?)\[\/black\]/m => proc { |text| "\e[30m#{text}\e[0m" },
+      
+      # Bright colors
+      /\[bright_red\](.*?)\[\/bright_red\]/m => proc { |text| "\e[91m#{text}\e[0m" },
+      /\[bright_green\](.*?)\[\/bright_green\]/m => proc { |text| "\e[92m#{text}\e[0m" },
+      /\[bright_yellow\](.*?)\[\/bright_yellow\]/m => proc { |text| "\e[93m#{text}\e[0m" },
+      /\[bright_blue\](.*?)\[\/bright_blue\]/m => proc { |text| "\e[94m#{text}\e[0m" },
+      /\[bright_magenta\](.*?)\[\/bright_magenta\]/m => proc { |text| "\e[95m#{text}\e[0m" },
+      /\[bright_cyan\](.*?)\[\/bright_cyan\]/m => proc { |text| "\e[96m#{text}\e[0m" },
+      /\[bright_white\](.*?)\[\/bright_white\]/m => proc { |text| "\e[97m#{text}\e[0m" },
+      
+      # Text styles
+      /\[bold\](.*?)\[\/bold\]/m => proc { |text| "\e[1m#{text}\e[22m" },
+      /\[dim\](.*?)\[\/dim\]/m => proc { |text| "\e[2m#{text}\e[22m" },
+      /\[italic\](.*?)\[\/italic\]/m => proc { |text| "\e[3m#{text}\e[23m" },
+      /\[underline\](.*?)\[\/underline\]/m => proc { |text| "\e[4m#{text}\e[24m" },
+      /\[blink\](.*?)\[\/blink\]/m => proc { |text| "\e[5m#{text}\e[25m" },
+      /\[reverse\](.*?)\[\/reverse\]/m => proc { |text| "\e[7m#{text}\e[27m" },
+      /\[strikethrough\](.*?)\[\/strikethrough\]/m => proc { |text| "\e[9m#{text}\e[29m" },
+      
+      # Combined styles
+      /\[bold\s+(\w+)\](.*?)\[\/bold\s+\1\]/m => proc do |text, color_match|
+        color_code = color_to_ansi(color_match)
+        "\e[1m#{color_code}#{text}\e[0m"
+      end
+    }.freeze
+
     def self.set_theme(new_theme)
       @@theme.merge!(new_theme)
     end
@@ -34,11 +71,84 @@ module RubyRich
     end
 
     def render
-      "#{@styles.join}#{@text}#{AnsiCode.reset}"
+      processed_text = process_markup(@text)
+      "#{@styles.join}#{processed_text}#{AnsiCode.reset}"
+    end
+
+    # 处理 Rich markup 标记语言
+    def self.markup(text)
+      new(text).render_markup
+    end
+
+    def render_markup
+      process_markup(@text)
     end
 
     private
 
+    def process_markup(text)
+      result = text.dup
+      
+      # 处理组合样式 (如 [bold red])
+      result.gsub!(/\[(\w+)\s+(\w+)\](.*?)\[\/\1\s+\2\]/m) do |match|
+        style1, style2, content = $1, $2, $3
+        
+        # 确定哪个是样式，哪个是颜色
+        if is_color?(style2)
+          apply_combined_style(content, style1, style2)
+        elsif is_color?(style1)
+          apply_combined_style(content, style2, style1)
+        else
+          match # 无法处理的组合，返回原文
+        end
+      end
+      
+      # 处理基本样式和颜色
+      MARKUP_PATTERNS.each do |pattern, processor|
+        result.gsub!(pattern) do |match|
+          if pattern.source.include?('\\s+')
+            # 这是组合样式，已经在上面处理过了
+            match
+          else
+            processor.call($1)
+          end
+        end
+      end
+      
+      result
+    end
+
+    def apply_combined_style(content, style, color)
+      color_code = color_to_ansi(color)
+      style_code = style_to_ansi(style)
+      "#{style_code}#{color_code}#{content}\e[0m"
+    end
+
+    def is_color?(word)
+      %w[red green yellow blue magenta cyan white black bright_red bright_green bright_yellow bright_blue bright_magenta bright_cyan bright_white].include?(word)
+    end
+
+    def color_to_ansi(color)
+      color_map = {
+        'red' => "\e[31m", 'green' => "\e[32m", 'yellow' => "\e[33m",
+        'blue' => "\e[34m", 'magenta' => "\e[35m", 'cyan' => "\e[36m",
+        'white' => "\e[37m", 'black' => "\e[30m",
+        'bright_red' => "\e[91m", 'bright_green' => "\e[92m", 'bright_yellow' => "\e[93m",
+        'bright_blue' => "\e[94m", 'bright_magenta' => "\e[95m", 'bright_cyan' => "\e[96m",
+        'bright_white' => "\e[97m"
+      }
+      color_map[color] || ""
+    end
+
+    def style_to_ansi(style)
+      style_map = {
+        'bold' => "\e[1m", 'dim' => "\e[2m", 'italic' => "\e[3m",
+        'underline' => "\e[4m", 'blink' => "\e[5m", 'reverse' => "\e[7m",
+        'strikethrough' => "\e[9m"
+      }
+      style_map[style] || ""
+    end
+
     def add_style(code, error_message)
       if code
         @styles << code

data/lib/ruby_rich/tree.rb

@@ -0,0 +1,200 @@
+module RubyRich
+  class Tree
+    # 树形结构显示的字符集
+    TREE_CHARS = {
+      default: {
+        vertical: '│',
+        horizontal: '─',
+        branch: '├',
+        last: '└',
+        space: ' '
+      },
+      ascii: {
+        vertical: '|',
+        horizontal: '-',
+        branch: '+',
+        last: '+',
+        space: ' '
+      },
+      rounded: {
+        vertical: '│',
+        horizontal: '─',
+        branch: '├',
+        last: '└',
+        space: ' '
+      },
+      double: {
+        vertical: '║',
+        horizontal: '═',
+        branch: '╠',
+        last: '╚',
+        space: ' '
+      }
+    }.freeze
+
+    # 树节点类
+    class Node
+      attr_accessor :name, :children, :data, :expanded
+
+      def initialize(name, data: nil)
+        @name = name
+        @children = []
+        @data = data
+        @expanded = true
+      end
+
+      def add_child(child_node)
+        @children << child_node
+        child_node
+      end
+
+      def add(name, data: nil)
+        child = Node.new(name, data: data)
+        add_child(child)
+        child
+      end
+
+      def leaf?
+        @children.empty?
+      end
+
+      def has_children?
+        !@children.empty?
+      end
+    end
+
+    attr_reader :root, :style
+
+    def initialize(root_name = 'Root', style: :default)
+      @root = Node.new(root_name)
+      @style = style
+      @chars = TREE_CHARS[@style] || TREE_CHARS[:default]
+    end
+
+    # 从哈希构建树
+    def self.from_hash(hash, root_name = 'Root', style: :default)
+      tree = new(root_name, style: style)
+      build_from_hash(tree.root, hash)
+      tree
+    end
+
+    # 从文件路径构建树
+    def self.from_paths(paths, root_name = 'Root', style: :default)
+      tree = new(root_name, style: style)
+      
+      paths.each do |path|
+        parts = path.split('/')
+        current_node = tree.root
+        
+        parts.each do |part|
+          next if part.empty?
+          
+          # 查找是否已存在该子节点
+          existing_child = current_node.children.find { |child| child.name == part }
+          
+          if existing_child
+            current_node = existing_child
+          else
+            current_node = current_node.add(part)
+          end
+        end
+      end
+      
+      tree
+    end
+
+    # 添加节点到根节点
+    def add(name, data: nil)
+      @root.add(name, data: data)
+    end
+
+    # 渲染树形结构
+    def render(show_guides: true, colors: true)
+      lines = []
+      render_node(@root, '', true, lines, show_guides, colors)
+      lines.join("\n")
+    end
+
+    # 渲染为字符串（别名）
+    def to_s
+      render
+    end
+
+    private
+
+    def self.build_from_hash(node, hash)
+      hash.each do |key, value|
+        child = node.add(key.to_s)
+        if value.is_a?(Hash)
+          build_from_hash(child, value)
+        elsif value.is_a?(Array)
+          value.each_with_index do |item, index|
+            if item.is_a?(Hash)
+              item_child = child.add("[#{index}]")
+              build_from_hash(item_child, item)
+            else
+              child.add(item.to_s)
+            end
+          end
+        else
+          child.add(value.to_s) unless value.nil?
+        end
+      end
+    end
+
+    def render_node(node, prefix, is_last, lines, show_guides, colors)
+      # 根节点特殊处理
+      if node == @root
+        if colors
+          lines << "\e[1m\e[96m#{node.name}\e[0m"
+        else
+          lines << node.name
+        end
+        
+        node.children.each_with_index do |child, index|
+          is_child_last = (index == node.children.length - 1)
+          render_node(child, '', is_child_last, lines, show_guides, colors)
+        end
+        return
+      end
+
+      # 构建当前行的前缀和连接符
+      if show_guides
+        connector = is_last ? @chars[:last] : @chars[:branch]
+        current_prefix = prefix + connector + @chars[:horizontal] + @chars[:space]
+      else
+        current_prefix = prefix + @chars[:space] * 4
+      end
+
+      # 渲染当前节点
+      node_text = if colors
+        case
+        when node.leaf?
+          "\e[92m#{node.name}\e[0m"  # 绿色叶子节点
+        when node.has_children?
+          "\e[94m#{node.name}/\e[0m"  # 蓝色目录节点
+        else
+          node.name
+        end
+      else
+        node.leaf? ? node.name : "#{node.name}/"
+      end
+
+      lines << current_prefix + node_text
+
+      # 递归渲染子节点
+      if node.expanded && node.has_children?
+        next_prefix = if show_guides
+          prefix + (is_last ? @chars[:space] : @chars[:vertical]) + @chars[:space] * 3
+        else
+          prefix + @chars[:space] * 4
+        end
+
+        node.children.each_with_index do |child, index|
+          is_child_last = (index == node.children.length - 1)
+          render_node(child, next_prefix, is_child_last, lines, show_guides, colors)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_rich/version.rb

@@ -1,3 +1,3 @@
 module RubyRich
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/ruby_rich.rb

@@ -16,6 +16,11 @@ require_relative 'ruby_rich/text'
 require_relative 'ruby_rich/print'
 require_relative 'ruby_rich/panel'
 require_relative 'ruby_rich/dialog'
+require_relative 'ruby_rich/syntax'
+require_relative 'ruby_rich/markdown'
+require_relative 'ruby_rich/tree'
+require_relative 'ruby_rich/columns'
+require_relative 'ruby_rich/status'
 require_relative 'ruby_rich/ansi_code'
 require_relative 'ruby_rich/version'
 
@@ -34,7 +39,32 @@ module RubyRich
   end
 
   # 提供一个便捷方法来创建表格
-  def self.table
-    Table.new
+  def self.table(border_style: :none)
+    Table.new(border_style: border_style)
   end
-end 
+
+  # 提供一个便捷方法来进行语法高亮
+  def self.syntax(code, language = nil, theme: :default)
+    Syntax.highlight(code, language, theme: theme)
+  end
+
+  # 提供一个便捷方法来渲染 Markdown
+  def self.markdown(text, options = {})
+    Markdown.render(text, options)
+  end
+
+  # 提供一个便捷方法来创建树形结构
+  def self.tree(root_name = 'Root', style: :default)
+    Tree.new(root_name, style: style)
+  end
+
+  # 提供一个便捷方法来创建多列布局
+  def self.columns(total_width: 80, gutter_width: 2)
+    Columns.new(total_width: total_width, gutter_width: gutter_width)
+  end
+
+  # 提供一个便捷方法来创建状态指示器
+  def self.status(type, **options)
+    Status.indicator(type, **options)
+  end
+end