ruby_rich 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22f7fb9cb3aa52b99809ca646ca234aa1f098967a8cfd13caddb49d71b3e455a
-  data.tar.gz: adbd0feae9e0a6bb2f4b631b390a1a067b6426ab99fb94ce19c4f0b3923c55e3
+  metadata.gz: 5e70688e9f049e91cc514d529ece0fe5dfad219b45117a8da518d5252f93e0f9
+  data.tar.gz: 17d1c30049d5f295a51815e6b6c1e2e1900e6e6567dbb561ba433a7ccf57e4ee
 SHA512:
-  metadata.gz: abd1b8ecbcc18f755cd72182f59774fb2a28dcf763610c2486ba3f80f00671ee590a6c132692d1ad981d7d01fa66964204ac904ee710ac801ca03c7ccf3c9486
-  data.tar.gz: 3cd9279be0f8a2f47a451263ca6813ac1a6ba46490dc4db829f52336307e17edd0a8c3eefdd816ee79d07cb61d91b2ba6088cfe7f0eec59673f0f3dbebffbe96
+  metadata.gz: 7ebc794ba61ee56bd49e18b424cc2c9a821dd0b1581f26a4a1fa96147362ca8696446359d06d6cffc9f99f7e2dcc21fcc6ceef692235e799c827b3c8252ed805
+  data.tar.gz: 752acc4ba0e823af2e40ad2e338f341fa46a7f46d8769798d1112fca4b175e7f564d9e7813e67876b43ce1724a62a208043b59ba1932b1475dffbda44208dedc

data/lib/ruby_rich/ansi_code.rb

@@ -0,0 +1,195 @@
+module RubyRich
+  class AnsiCode
+    ANSI_CODES = {
+      reset: "\e[0m",
+      bold: "1",
+      faint: "2",
+      italic: "3",
+      underline: "4",
+      curly_underline: "4:3",
+      dotted_underline: "4:4",
+      dashed_underline: "4:5",
+      double_underline: "21",
+      blink: "5",
+      rapid_blink: "6",
+      inverse: "7",
+      invisible: "8",
+      strikethrough: "9",
+      fraktur: "20",
+      no_blink: "25",
+      no_inverse: "27",
+      overline: "53",
+      color: {
+        black: "30",
+        red: "31",
+        green: "32",
+        yellow: "33",
+        blue: "34",
+        magenta: "35",
+        cyan: "36",
+        white: "37"
+      },
+      bright_color:{
+        black: "90",
+        red: "91",
+        green: "92",
+        yellow: "93",
+        blue: "94",
+        magenta: "95",
+        cyan: "96",
+        white: "97"
+      },
+      background: {
+        black: "40",
+        red: "41",
+        green: "42",
+        yellow: "43",
+        blue: "44",
+        magenta: "45",
+        cyan: "46",
+        white: "47"
+      },
+      bright_background: {
+        black: "100",
+        red: "101",
+        green: "102",
+        yellow: "103",
+        blue: "104",
+        magenta: "105",
+        cyan: "106",
+        white: "107"
+      }
+    }
+
+    def self.reset
+      ANSI_CODES[:reset]
+    end
+
+    def self.color(color, bright=false)
+      if bright
+        "\e[#{ANSI_CODES[:bright_color][color]}m"
+      else
+        "\e[#{ANSI_CODES[:color][color]}m"
+      end
+    end
+
+    def self.background(color, bright=false)
+      if bright
+        "\e[#{ANSI_CODES[:bright_background][color]}m"
+      else
+        "\e[#{ANSI_CODES[:background][color]}m"
+      end
+    end
+
+    def self.bold
+      "\e[#{ANSI_CODES[:bold]}m"
+    end
+
+    def self.italic
+      "\e[#{ANSI_CODES[:italic]}m"
+    end
+
+    def self.underline(style=nil)
+      case style
+      when nil
+        return "\e[#{ANSI_CODES[:underline]}m"
+      when :double
+        return "\e[#{ANSI_CODES[:double_underline]}m"
+      when :curly
+        return "\e[#{ANSI_CODES[:curly_underline]}m"
+      when :dotted
+        return "\e[#{ANSI_CODES[:dotted_underline]}m"
+      when :dashed
+        return "\e[#{ANSI_CODES[:dashed_underline]}m"  
+      end
+    end
+
+    def self.blink
+      "\e[#{ANSI_CODES[:blink]}m"
+    end
+
+    def self.rapid_blink
+      "\e[#{ANSI_CODES[:rapid_blink]}m"
+    end
+
+    def self.inverse
+      "\e[#{ANSI_CODES[:inverse]}m"
+    end
+
+    def self.fraktur
+      "\e[#{ANSI_CODES[:fraktur]}m"
+    end
+
+    def self.invisible
+      "\e[#{ANSI_CODES[:invisible]}m"
+    end
+
+    def self.strikethrough
+      "\e[#{ANSI_CODES[:strikethrough]}m"
+    end
+    
+    def self.overline
+      "\e[#{ANSI_CODES[:overline]}m"
+    end
+
+    def self.no_blink
+      "\e[#{ANSI_CODES[:no_blink]}m"
+    end
+
+    def self.no_inverse
+      "\e[#{ANSI_CODES[:no_inverse]}m"
+    end
+
+    def self.font(font_color, 
+      font_bright: false, 
+      background: nil, 
+      background_bright: false,
+      bold: false, 
+      italic: false,
+      underline: false,
+      underline_style: nil,
+      strikethrough: false,
+      overline: false
+      )
+      code = if font_bright
+        "\e[#{ANSI_CODES[:bright_color][font_color]}"
+      else
+        "\e[#{ANSI_CODES[:color][font_color]}"
+      end
+      if background
+        code += ";" + if background_bright
+          "#{ANSI_CODES[:bright_background][background]}"
+        else
+          "#{ANSI_CODES[:background][background]}"
+        end
+      end
+      if bold
+        code += ";" + ANSI_CODES[:bold]
+      end
+      if italic
+        code += ";" + ANSI_CODES[:italic]
+      end
+      if underline
+        case underline_style
+        when nil
+          code += ";" + ANSI_CODES[:underline]
+        when :double
+          code += ";" + ANSI_CODES[:double_underline]
+        when :curly
+          code += ";" + ANSI_CODES[:curly_underline]
+        when :dotted
+          code += ";" + ANSI_CODES[:dotted_underline]
+        when :dashed
+          code += ";" + ANSI_CODES[:dashed_underline]
+        end
+      end
+      if strikethrough
+        code += ";" +  ANSI_CODES[:strikethrough]
+      end
+      if overline
+        code += ";" +  ANSI_CODES[:overline]
+      end
+      return code+"m"
+    end
+  end
+end

data/lib/ruby_rich/console.rb

@@ -18,7 +18,7 @@ module RubyRich
       # 其他
       '[5~' => :page_up, '[6~' => :page_down,
       '[H' => :home, '[F' => :end,
-      '[2~' => :insert, '[3~' => :delete      
+      '[2~' => :insert, '[3~' => :delete
     }.freeze
 
     def initialize
@@ -76,16 +76,17 @@ module RubyRich
     def get_key(input: $stdin)
       input.raw(intr: true) do |io|
         char = io.getch
-        
         # 优先处理回车键（ASCII 13 = \r，ASCII 10 = \n）
         if char == "\r" || char == "\n"
-          return :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"
-          return :tab
+          return {:name=>:tab}
         elsif char.ord == 0x07F
-          return :backspace
+          return {:name=>:backspace}
         elsif char == "\e" # 检测到转义序列
           sequence = ''
           begin
@@ -96,13 +97,17 @@ module RubyRich
             retry if IO.select([io], nil, nil, 0.01)
           rescue EOFError
           end
-          return ESCAPE_SEQUENCES[sequence] || :escape
+          if sequence.empty?
+            return {:name => :escape}
+          else
+            return {:name => ESCAPE_SEQUENCES[sequence]} || {:name => :escape}
+          end
         # 处理 Ctrl 组合键（排除 Tab 和回车）
         elsif char.ord.between?(1, 8) || char.ord.between?(10, 26)
           ctrl_char = (char.ord + 64).chr.downcase
-          return :"ctrl_#{ctrl_char}"
+          return {:name =>"ctrl_#{ctrl_char}".to_sym}
         else
-          char
+          {:name => :string, :value => char}
         end
       end
     end

data/lib/ruby_rich/dialog.rb

@@ -1,136 +1,66 @@
 module RubyRich
   class Dialog
-    attr_accessor :title, :content, :buttons
+    attr_accessor :title, :content, :buttons, :live
+    attr_accessor :width, :height
+
+    def initialize(title: "", content: "", width: 48, height: 8, buttons: [:ok])
+      @width = width
+      @height = height
+      terminal_width = `tput cols`.to_i
+      terminal_height = `tput lines`.to_i
+      @event_listeners = {}
+      @layout = RubyRich::Layout.new(name: :title, width: width, height: height)
+      @panel = RubyRich::Panel.new("", title: title, border_style: :white)
+      @layout.update_content(@panel)
+      @layout.calculate_dimensions(terminal_width, terminal_height)
+      @button_str = build_button(buttons)
+      @panel.content = "  \n  \n#{content}"+AnsiCode.reset+"\n \n \n" + " "*((@panel.inner_width - @button_str.display_width)/2) + @button_str
+    end
 
-    def initialize(title: "", content: "", buttons: ["OK"])
-      @title = title
-      @content = content
-      @buttons = buttons
-      @selected_index = 0
-      @result = nil
+    def content=(content)
+      @panel.content = "  \n  \n#{content}"+AnsiCode.reset+"\n \n \n" + " "*((@panel.inner_width - @button_str.display_width)/2) + @button_str
     end
 
-    # 主显示方法
-    def show
-      Console.raw do
-        loop do
-          Console.clear
-          render
-          handle_input(Console.get_key)
-          break if @result
+    def build_button(buttons)
+      str = ""
+      buttons.each do |btn|        
+        case btn
+        when :ok
+          str += "    "+AnsiCode.color(:blue) + "OK(enter)"+ AnsiCode.reset
+        when :cancel
+          str += "    "+AnsiCode.color(:red) + "Cancel(esc)"+ AnsiCode.reset
         end
       end
-      @result
+      str.strip
     end
 
-    private
-
-    # 渲染对话框
-    def render
-      build_layout unless @layout
-      update_panels
-      @layout.draw
+    def render_to_buffer
+      @layout.render_to_buffer
     end
 
-    def build_layout
-      @layout = RubyRich::Layout.new
-      @layout.split_column(
-        RubyRich::Layout.new(size: 1, name: :title_area),  # 标题区域
-        RubyRich::Layout.new(name: :content_area),         # 内容区域
-        RubyRich::Layout.new(size: 3, name: :button_area)  # 按钮区域
-      )
-
-      @title_panel = RubyRich::Panel.new("", title: @title, border_style: :white)
-      @content_panel = RubyRich::Panel.new("", border_style: :default)
-      @button_panel = RubyRich::Panel.new("", border_style: :blue)
-
-      @layout[:title_area].update_content(@title_panel)
-      @layout[:content_area].update_content(@content_panel)
-      @layout[:button_area].update_content(@button_panel)
-    end
-
-    def update_panels
-      # 更新内容面板
-      @content_panel.content = @content.lines.map { |line|
-        line.chomp.gsub(/\n/, ' ').scan(/.{1,#{@content_panel.inner_width}}/)
-      }.flatten.join("\n")
-
-      # 更新按钮面板
-      button_row = @buttons.each_with_index.map { |btn, i|
-        i == @selected_index ? "[#{btn}]" : " #{btn} "
-      }.join("  ")
-
-      @button_panel.content = button_row.center(@button_panel.inner_width)
-    end
-
-    # 渲染按钮区域
-    def render_buttons(right_x, bottom_y)
-      # 已通过布局系统处理按钮渲染
-    end
-
-    # 处理键盘输入
-    def handle_input(key)
-      case key
-      when :left then @selected_index = (@selected_index - 1) % @buttons.size
-      when :right then @selected_index = (@selected_index + 1) % @buttons.size
-      when :enter then @result = @buttons[@selected_index]
-      when :q, "\u0003" then @result = :cancel # Ctrl+C
+    def key(event_name, priority = 0, &block)
+      unless @event_listeners[event_name]
+        @event_listeners[event_name] = []
       end
+      @event_listeners[event_name] << { priority: priority, block: block }
+      @event_listeners[event_name].sort_by! { |l| -l[:priority] } # Higher priority first
     end
-  end
-
-  # 确认对话框
-  class ConfirmDialog < Dialog
-    def initialize(title: "确认", content: "确定要执行此操作吗？")
-      super(
-        title: title,
-        content: content,
-        buttons: ["取消", "确定"]
-      )
-    end
-  end
-
-  # 输入对话框
-  class InputDialog < Dialog
-    def initialize(title: "输入", prompt: "请输入：")
-      super(title: title, buttons: ["确定"])
-      @input = ""
-      @prompt = prompt
-    end
-
-    private
-
-    def build_layout
-      super
-      # 在内容区域下方添加输入行
-      @layout[:content_area].split_column(
-        RubyRich::Layout.new(ratio: 1, name: :main_content),
-        RubyRich::Layout.new(size: 3, name: :input_line)
-      )
 
-      @input_panel = RubyRich::Panel.new("", border_style: :yellow)
-      @layout[:input_line].update_content(@input_panel)
-    end
-
-    def update_panels
-      super
-      @input_panel.content = "#{@prompt}#{@input}"
-    end
-
-    def handle_input(key)
-      case key
-      when String
-        @input << key
-      when :backspace
-        @input.chop!
-      else
-        super
+    def on(event_name, &block)
+      if event_name==:close
+        @event_listeners[event_name] = [{block: block}]
       end
     end
 
-    def show
-      super
-      @result == "确定" ? @input : nil
+    def notify_listeners(event_data)
+      event_name = event_data[:name]
+      result = nil
+      if @event_listeners[event_name]
+        @event_listeners[event_name].each do |listener|
+          result = listener[:block].call(event_data, @live)
+        end
+        return result
+      end
     end
   end
 end

data/lib/ruby_rich/layout.rb

@@ -1,9 +1,10 @@
 module RubyRich
   class Layout
-    attr_accessor :name, :ratio, :size, :children, :content, :parent, :x_offset, :y_offset, :width, :height
+    attr_accessor :name, :ratio, :size, :children, :content, :parent, :live, :dialog
+    attr_accessor :x_offset, :y_offset, :width, :height, :show
     attr_reader :split_direction
 
-    def initialize(name: nil, ratio: 1, size: nil)
+    def initialize(name: nil, ratio: 1, size: nil, width: nil, height: nil)
       @name = name
       @ratio = ratio
       @size = size
@@ -12,9 +13,49 @@ module RubyRich
       @parent = nil
       @x_offset = 0
       @y_offset = 0
-      @width = nil
-      @height = nil
+      @width = width if width
+      @height = height if height
       @split_direction = nil
+      @show = true
+      @event_listeners = {}
+      @event_intercepted = false
+    end
+
+    def key(event_name, priority = 0, &block)
+      unless @event_listeners[event_name]
+        @event_listeners[event_name] = []
+      end
+      @event_listeners[event_name] << { priority: priority, block: block }
+      @event_listeners[event_name].sort_by! { |l| -l[:priority] } # Higher priority first
+    end
+
+    def show=(flag)
+      @show = flag
+      @event_intercepted = !flag
+    end
+
+    def notify_listeners(event_data)
+      return if @event_intercepted
+      if @dialog
+        @dialog.notify_listeners(event_data)
+      else
+        event_name = event_data[:name]
+        if @event_listeners[event_name]
+          @event_listeners[event_name].each do |listener|
+            next if @event_intercepted
+            result = listener[:block].call(event_data, self.root.live)
+            if result == true
+              @event_intercepted = true
+            end
+          end
+        end
+        
+        unless @event_intercepted
+          @children.each do |child|
+            child.notify_listeners(event_data)
+          end
+        end
+      end
     end
 
     def root
@@ -33,6 +74,10 @@ module RubyRich
       @children.concat(layouts)
     end
 
+    def add_child(layout)
+      @children << layout
+    end
+
     def update_content(content)
       @content = content
     end
@@ -56,18 +101,27 @@ module RubyRich
       nil
     end
 
+    def show_dialog(dialog)
+      @dialog = dialog
+    end
+
+    def hide_dialog
+      @dialog.notify_listeners({:name=>:close})
+      @dialog = nil
+    end
+
     def render
       # 将缓冲区转换为字符串（每行用换行符连接）
-      render_to_buffer.map { |line| line.compact.join("") }.join("\n")
+      buffer = render_to_buffer
+      buffer.map { |line| line.compact.join("") }.join("\n")
     end
 
     def render_to_buffer
       # 初始化缓冲区（二维数组，每个元素代表一个字符）
       buffer = Array.new(@height) { Array.new(@width, " ") }
-      
       # 递归填充内容到缓冲区
       render_into(buffer)
-
+      render_dialog_into(buffer) if @dialog
       return buffer
     end
 
@@ -75,6 +129,21 @@ module RubyRich
       puts render
     end
 
+    def render_dialog_into(buffer)
+      start_x = (@width - 2 - @dialog.width) / 2 + 1
+      start_y = (@height - 2 - @dialog.height) / 2 + 1
+      dialog_buffer = @dialog.render_to_buffer
+      buffer.each_with_index do |arr, y|
+        arr.each_with_index do |char, x|          
+          if x >= start_x && y >= start_y
+            if y-start_y <= dialog_buffer.size-1 && x-start_x <= dialog_buffer[y-start_y].size-1
+              buffer[y][x] = dialog_buffer[y-start_y][x-start_x]
+            end
+          end
+        end
+      end
+    end
+
     def render_into(buffer)
       children.each { |child| child.render_into(buffer) } if children
       return unless content

data/lib/ruby_rich/live.rb

@@ -8,13 +8,13 @@ module RubyRich
     def initialize
       @cache = nil
     end
-  
+    
     def print_with_pos(x,y,char)
       print "\e[?25l"   # 隐藏光标
       print "\e[#{y};#{x}H"   # 移动光标到左上角
       print char
     end
-  
+    
     def draw(buffer)
       unless @cache
         system("clear")
@@ -34,10 +34,12 @@ module RubyRich
   end
 
   class Live
+    attr_accessor :params, :app, :listening, :layout
     class << self
-      def start(layout, refresh_rate: 30, full_screen: false, &proc)
+      def start(layout, refresh_rate: 30, &proc)
         setup_terminal
         live = new(layout, refresh_rate)
+        proc.call(live) if proc
         live.run(proc)
       rescue => e
         puts e.message
@@ -60,29 +62,44 @@ module RubyRich
 
     def initialize(layout, refresh_rate)
       @layout = layout
+      @layout.live = self
       @refresh_rate = refresh_rate
       @running = true
       @last_frame = Time.now
       @cursor = TTY::Cursor
       @render = CacheRender.new
+      @console = RubyRich::Console.new
+      @params = {}
     end
 
     def run(proc = nil)
       while @running
         render_frame
-        proc.call(self) if proc
+        if @listening
+          event_data = @console.get_key()
+          @layout.notify_listeners(event_data)
+        end
         sleep 1.0 / @refresh_rate
       end
     end
 
     def stop
       @running = false
+      system("clear")
     end
 
     def move_cursor(x,y)
       print @cursor.move_to(x, y)
     end
 
+    def find_layout(name)
+      @layout[name]
+    end
+
+    def find_panel(name)
+      @layout[name].content
+    end
+
     private
 
     def render_frame

data/lib/ruby_rich/panel.rb

@@ -1,47 +1,72 @@
 module RubyRich
   class Panel
     attr_accessor :width, :height, :content, :line_pos, :border_style, :title
-    COLORS = {
-      red: "\e[31m",
-      green: "\e[32m",
-      blue: "\e[34m",
-      yellow: "\e[33m",
-      cyan: "\e[36m",
-      white: "\e[37m",
-      reset: "\e[0m"
-    }
-
-    def initialize(content = "", title: nil, border_style: :white)
+    attr_accessor :title_align, :content_changed
+
+    def initialize(content = "", title: nil, border_style: :white, title_align: :center)
       @content = content
       @title = title
       @border_style = border_style
       @width = 0
       @height = 0
       @line_pos = 0
+      @title_align = title_align
     end
 
     def inner_width
       @width - 2  # Account for border characters
     end
 
-    def calculate_string_width(str)
-      width = 0
-      str.each_char do |char|
-        width += Unicode::DisplayWidth.of(char)
+    def page_up
+      @line_pos -= ( @height - 4 )
+      if @line_pos < 0
+        @line_pos = 0
+      end
+      @content_changed = false
+    end
+
+    def page_down
+      unless @content.empty?
+        content_lines = wrap_content(@content)
+        @line_pos += ( @height - 4 )
+        if @line_pos + ( @height - 4 ) > content_lines.size
+          @line_pos = content_lines.size - @height + 2
+        end
+        @content_changed = false
+      end      
+    end
+
+    def home
+      @line_pos = 0
+      @content_changed = false
+    end
+
+    def end
+      unless @content.empty?
+        content_lines = wrap_content(@content)
+        @line_pos = content_lines.size - @height + 2
+        @content_changed = false
       end
-      width
     end
 
     def render
       lines = []
-      color_code = COLORS[@border_style] || COLORS[:white]
-      reset_code = COLORS[:reset]
+      color_code = AnsiCode.color(@border_style) || AnsiCode.color(:white)
+      reset_code = AnsiCode.reset
 
       # Top border
       top_border = color_code + "┌"
       if @title
-        title_text = "[ #{@title} ]"        
-        top_border += title_text + '─' * (@width - calculate_string_width(@title)-6)
+        title_text = "[ #{@title} ]"
+        bar_width = @width - @title.display_width-6
+        case @title_align
+        when :left
+          top_border += title_text + '─' * bar_width
+        when :center
+          top_border += '─' * (bar_width/2)  + title_text + '─' * (bar_width - bar_width/2)
+        when :right
+          top_border += '─' * bar_width + title_text
+        end
       else
         top_border += '─' * (@width - 2)
       end
@@ -50,13 +75,29 @@ module RubyRich
 
       # Content area
       content_lines = wrap_content(@content)
-      if content_lines.size > @height - 2
-        @line_pos = content_lines.size - @height + 2
-        content_lines=content_lines[@line_pos..-1]
+      if @line_pos==0
+        if @content_changed == false
+          if content_lines.size > @height - 2
+            content_lines=content_lines[0..@height - 3]
+          end
+        else
+          if content_lines.size > @height - 2
+            @line_pos = content_lines.size - @height + 2
+            content_lines=content_lines[@line_pos..-1]
+            @content_changed = false
+          end
+        end
+      else
+        if @line_pos+@height-2 >= content_lines.size
+          content_lines=content_lines[@line_pos..-1]
+        else
+          content_lines=content_lines[@line_pos..@line_pos+@height-3]
+        end
       end
+      
       content_lines.each do |line|
         lines << color_code + "│" + reset_code +
-                line + " "*(@width - calculate_string_width(line) - 2) +
+                line + " "*(@width - line.display_width - 2) +
                 color_code + "│" + reset_code
       end
 
@@ -74,8 +115,13 @@ module RubyRich
       lines
     end
 
-    def update_content(new_content)
+    def content=(new_content)
       @content = new_content
+      content_lines = wrap_content(@content)
+      if content_lines.size > @height - 2
+        @line_pos = content_lines.size - @height + 2
+      end
+      @content_changed = true
     end
 
     private
@@ -84,22 +130,37 @@ module RubyRich
       result = []
       current_line = ""
       current_width = 0
-    
-      text.each_char do |char|
-        char_width = Unicode::DisplayWidth.of(char)
-        if current_width + char_width <= @width - 4
-          current_line += char
-          current_width += char_width
+      
+      # 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) }
+        end
+      
+        if current_width + token_width <= @width - 4
+          current_line += token
+          current_width += token_width
         else
           result << current_line
-          current_line = char
-          current_width = char_width
+          current_line = start_color.to_s+token
+          current_width = token_width
         end
       end
-    
-      # 添加最后一行
+      
+      # Add remaining line
       result << current_line unless current_line.empty?
-    
+      
       result
     end
 
@@ -110,97 +171,18 @@ module RubyRich
     end
   end
 end
-module RubyRich
-    class RichPanel
-        # ANSI escape codes for styling
-        ANSI_CODES = {
-          reset: "\e[0m",
-          bold: "\e[1m",
-          underline: "\e[4m",
-          color: {
-            black: "\e[30m",
-            red: "\e[31m",
-            green: "\e[32m",
-            yellow: "\e[33m",
-            blue: "\e[34m",
-            magenta: "\e[35m",
-            cyan: "\e[36m",
-            white: "\e[37m"
-          },
-          background: {
-            black: "\e[40m",
-            red: "\e[41m",
-            green: "\e[42m",
-            yellow: "\e[43m",
-            blue: "\e[44m",
-            magenta: "\e[45m",
-            cyan: "\e[46m",
-            white: "\e[47m"
-          }
-        }
-      
-        attr_accessor :title, :content, :border_color, :title_color, :footer
-      
-        def initialize(content, title: nil, footer: nil, border_color: :white, title_color: :white)
-          @content = content.is_a?(String) ? content.split("\n") : content
-          @title = title
-          @footer = footer
-          @border_color = border_color
-          @title_color = title_color
-        end
-      
-        def render
-          content_lines = format_content
-          panel_width = calculate_panel_width(content_lines)
-      
-          lines = []
-          lines << top_border(panel_width)
-          lines += content_lines.map { |line| format_line(line, panel_width) }
-          lines << bottom_border(panel_width)
-      
-          lines.join("\n")
-        end
-      
-        private
-      
-        def top_border(width)
-          title_text = @title ? colorize(" #{@title} ", @title_color) : ""
-          padding = (width - title_text.uncolorize.length - 2) / 2
-          "#{colorize("╭", @border_color)}#{colorize("─" * padding, @border_color)}#{title_text}#{colorize("─" * (width - title_text.uncolorize.length - padding - 2), @border_color)}#{colorize("╮", @border_color)}"
-        end
-      
-        def bottom_border(width)
-          footer_text = @footer ? colorize(" #{@footer} ", @title_color) : ""
-          padding = (width - footer_text.uncolorize.length - 2) / 2
-          "#{colorize("╰", @border_color)}#{colorize("─" * padding, @border_color)}#{footer_text}#{colorize("─" * (width - footer_text.uncolorize.length - padding - 2), @border_color)}#{colorize("╯", @border_color)}"
-        end
-      
-        def format_line(line, width)
-          "#{colorize("│", @border_color)} #{line.ljust(width - 4)} #{colorize("│", @border_color)}"
-        end
-      
-        def format_content
-          @content.map(&:strip)
-        end
-      
-        def calculate_panel_width(content_lines)
-          [
-            @title ? @title.uncolorize.length + 4 : 0,
-            @footer ? @footer.uncolorize.length + 4 : 0,
-            content_lines.map(&:length).max + 4
-          ].max
-        end
-      
-        def colorize(text, color)
-          code = ANSI_CODES[:color][color] || ""
-          "#{code}#{text}#{ANSI_CODES[:reset]}"
-        end
-      end
-end
 
 # Extend String to remove ANSI codes for alignment
 class String
     def uncolorize
         gsub(/\e\[[0-9;]*m/, '')
     end
+
+    def display_width
+      width = 0
+      self.uncolorize.each_char do |char|
+        width += Unicode::DisplayWidth.of(char)
+      end
+      width
+    end
 end

data/lib/ruby_rich/print.rb

@@ -33,7 +33,7 @@ module RubyRich
 
     def apply_style(content, style)
       style_methods = style.downcase.split
-      rich_text = RichRuby::RichText.new(content)
+      rich_text = RubyRich::RichText.new(content)
       style.downcase.split.each do |method|
       case method
         when 'bold'

data/lib/ruby_rich/table.rb

@@ -34,7 +34,7 @@ module RubyRich
     private
   
     def format_cell(cell)      
-      cell.is_a?(RichRuby::RichText) ? cell : RichRuby::RichText.new(cell.to_s)
+      cell.is_a?(RubyRich::RichText) ? cell : RubyRich::RichText.new(cell.to_s)
     end
   
     def calculate_column_widths

data/lib/ruby_rich/text.rb

@@ -8,35 +8,6 @@ module RubyRich
       warning: { color: :yellow, bold: true }
     }
 
-    # ANSI 转义码常量
-    ANSI_CODES = {
-      reset: "\e[0m",
-      bold: "\e[1m",
-      italic: "\e[3m",
-      underline: "\e[4m",
-      blink: "\e[5m",
-      color: {
-        black: "\e[30m",
-        red: "\e[31m",
-        green: "\e[32m",
-        yellow: "\e[33m",
-        blue: "\e[34m",
-        magenta: "\e[35m",
-        cyan: "\e[36m",
-        white: "\e[37m"
-      },
-      background: {
-        black: "\e[40m",
-        red: "\e[41m",
-        green: "\e[42m",
-        yellow: "\e[43m",
-        blue: "\e[44m",
-        magenta: "\e[45m",
-        cyan: "\e[46m",
-        white: "\e[47m"
-      }
-    }
-
     def self.set_theme(new_theme)
       @@theme.merge!(new_theme)
     end
@@ -47,18 +18,23 @@ module RubyRich
       apply_theme(style) if style
     end
 
-    def style(color: nil, background: nil, bold: false, italic: false, underline: false, blink: false)
-      @styles << ANSI_CODES[:color][color] if color
-      @styles << ANSI_CODES[:background][background] if background
-      @styles << ANSI_CODES[:bold] if bold
-      @styles << ANSI_CODES[:italic] if italic
-      @styles << ANSI_CODES[:underline] if underline
-      @styles << ANSI_CODES[:blink] if blink
+    def style(color: :white, 
+      font_bright: false, 
+      background: nil, 
+      background_bright: false,
+      bold: false, 
+      italic: false,
+      underline: false,
+      underline_style: nil,
+      strikethrough: false,
+      overline: false
+      )
+      @styles << AnsiCode.font(color, font_bright, background, background_bright, bold, italic, underline, underline_style, strikethrough, overline)
       self
     end
 
     def render
-      "#{@styles.join}#{@text}#{ANSI_CODES[:reset]}"
+      "#{@styles.join}#{@text}#{AnsiCode.reset}"
     end
 
     private

data/lib/ruby_rich/version.rb

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

data/lib/ruby_rich.rb

@@ -16,6 +16,7 @@ require_relative 'ruby_rich/text'
 require_relative 'ruby_rich/print'
 require_relative 'ruby_rich/panel'
 require_relative 'ruby_rich/dialog'
+require_relative 'ruby_rich/ansi_code'
 require_relative 'ruby_rich/version'
 
 # 定义主模块

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rich
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - zhuang biaowei
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ruby_rich.rb
+- lib/ruby_rich/ansi_code.rb
 - lib/ruby_rich/console.rb
 - lib/ruby_rich/dialog.rb
 - lib/ruby_rich/layout.rb
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.4
 specification_version: 4
 summary: Rich text formatting and console output for Ruby
 test_files: []