markdown_exec 2.7.2 → 2.7.4

data/lib/colorize.rb

@@ -13,23 +13,15 @@ class String
   # @return [String] The formatted string.
   def method_missing(method_name, *args, &block)
     case method_name.to_s
-    # when /^bg_rgb_/
-    #   bytes = $'.split('_')
-    #   bg_rgb_color(bytes[0..2].join(';'))
     when /^fg_bg_rgb_/
-      pp [__LINE__, caller[0]]; binding.irb
       bytes = $'.split('_')
       fg_bg_rgb_color(bytes[0..2].join(';'), bytes[3..5].join(';'))
     when /^fg_bg_rgbh_/
-      pp [__LINE__, caller[0]]; binding.irb
       hex_to_fg_bg_rgb($')
     when /^fg_rgb_/
-      pp [__LINE__, caller[0]]; binding.irb
       fg_rgb_color($'.gsub('_', ';'))
     when /^fg_rgbh_/
-      pp [__LINE__, caller[0]]; binding.irb
       hex_to_rgb($')
-
     when 'to_a', 'to_ary', 'to_hash', 'to_int', 'to_io', 'to_regexp'
       nil
     else
@@ -41,24 +33,14 @@ class String
   #
   # @return [String] The string wrapped in an ANSI control sequence.
   def ansi_control_sequence
-    pp [__LINE__, caller[0]]; binding.irb
     "\033[#{self}\033[0m"
   end
 
-  # # Applies a 24-bit RGB background color to the string.
-  # #
-  # # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
-  # # @return [String] The string with the applied RGB foreground color.
-  # def bg_rgb_color(rgb)
-  #   "48;2;#{rgb}m#{self}".ansi_control_sequence
-  # end
-
   # Applies a 24-bit RGB foreground color to the string.
   #
   # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
   # @return [String] The string with the applied RGB foreground color.
   def fg_bg_rgb_color(fg_rgb, bg_rgb)
-    pp [__LINE__, caller[0]]; binding.irb
     "38;2;#{fg_rgb}m\033[48;2;#{bg_rgb}m#{self}".ansi_control_sequence
   end
 
@@ -67,7 +49,6 @@ class String
   # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
   # @return [String] The string with the applied RGB foreground color.
   def fg_rgb_color(rgb)
-    pp [__LINE__, caller[0]]; binding.irb
     "38;2;#{rgb}m#{self}".ansi_control_sequence
   end
 
@@ -76,7 +57,6 @@ class String
   # @param hex_str [String] The RGB color, expressed as a hex string like "FF00FF".
   # @return [String] The string with the applied RGB foreground color.
   def hex_to_fg_bg_rgb(hex_str)
-    pp [__LINE__, caller[0]]; binding.irb
     values = hex_str.split('_').map { |hex| hex.to_i(16).to_s }
     fg_bg_rgb_color(
       values[0..2].join(';'),
@@ -89,7 +69,6 @@ class String
   # @param hex_str [String] The RGB color, expressed as a hex string like "FF00FF".
   # @return [String] The string with the applied RGB foreground color.
   def hex_to_rgb(hex_str)
-    pp [__LINE__, caller[0]]; binding.irb
     fg_rgb_color(
       hex_str.split('_').map { |hex| hex.to_i(16).to_s }.join(';')
     )
@@ -99,7 +78,6 @@ class String
   #
   # @return [String] The original string.
   def plain
-    pp [__LINE__, caller[0]]; binding.irb
     self
   end
 
@@ -126,20 +104,16 @@ class String
   def violet;  fg_rgbh_94_00_D3; end
   def yellow;  fg_rgbh_FF_FF_00; end
 
-  def x
-    pp [__LINE__, caller[1]]; binding.irb
-  end
-
   # graphics modes
-  def bold;             x; "\033[1m#{self}\033[22m"; end
-  def bold_italic;      x; "\033[1m\033[3m#{self}\033[22m\033[23m"; end
-  def bold_underline;   x; "\033[1m\033[4m#{self}\033[22m\033[24m"; end
-  def dim;              x; "\033[2m#{self}\033[22m"; end
-  def italic;           x; "\033[3m#{self}\033[23m"; end
-  def underline;        x; "\033[4m#{self}\033[24m"; end
-  def underline_italic; x; "\033[4m\033[3m#{self}\033[23m\033[24m"; end
-  def blinking;         x; "\033[5m#{self}\033[25m"; end
-  def inverse;          x; "\033[7m#{self}\033[27m"; end
-  def hidden;           x; "\033[8m#{self}\033[28m"; end
-  def strikethrough;    x; "\033[9m#{self}\033[29m"; end
+  def bold;             "\033[1m#{self}\033[22m"; end
+  def bold_italic;      "\033[1m\033[3m#{self}\033[22m\033[23m"; end
+  def bold_underline;   "\033[1m\033[4m#{self}\033[22m\033[24m"; end
+  def dim;              "\033[2m#{self}\033[22m"; end
+  def italic;           "\033[3m#{self}\033[23m"; end
+  def underline;        "\033[4m#{self}\033[24m"; end
+  def underline_italic; "\033[4m\033[3m#{self}\033[23m\033[24m"; end
+  def blinking;         "\033[5m#{self}\033[25m"; end
+  def inverse;          "\033[7m#{self}\033[27m"; end
+  def hidden;           "\033[8m#{self}\033[28m"; end
+  def strikethrough;    "\033[9m#{self}\033[29m"; end
 end

data/lib/fcb.rb

@@ -33,6 +33,10 @@ module MarkdownExec
         title: '',
         type: ''
       }.merge(options)
+      # @attrs[:raw_body] ||= @attrs[:body]
+      # @attrs[:raw_dname] ||= @attrs[:dname]
+      # @attrs[:raw_s0printable] ||= @attrs[:s0printable]
+      # @attrs[:raw_s1decorated] ||= @attrs[:s1decorated]
     end
 
     def code_name_included?(*names)
@@ -43,6 +47,10 @@ module MarkdownExec
       Regexp.new(regexp) =~ @attrs[:oname]
     end
 
+    def delete_key(key)
+      @attrs.delete(key)
+    end
+
     # Derives a title from the body of an FCB object.
     # @param fcb [Object] The FCB object whose title is to be derived.
     # @return [String] The derived title.
@@ -57,10 +65,38 @@ module MarkdownExec
       @attrs[:title] = if body_content.count == 1
                          body_content.first
                        else
-                         FCB::format_multiline_body_as_title(body_content)
+                         FCB.format_multiline_body_as_title(body_content)
                        end
     end
 
+    # def body=(value)
+    #   ww0 'body=', value
+    #   # binding.irb
+    #   @attrs[:raw_body] ||= value
+    #   @attrs[:body] = value
+    # end
+
+    # def dname=(value)
+    #   ww0 'dname=', value
+    #   binding.irb if value == '                                              | Species| Not specified'
+    #   @attrs[:raw_dname] ||= value
+    #   @attrs[:dname] = value
+    # end
+
+    # def s0printable=(value)
+    #   ww0 's0printable=', value
+    #   # binding.irb
+    #   @attrs[:raw_s0printable] ||= value
+    #   @attrs[:s0printable] = value
+    # end
+
+    # def s1decorated=(value)
+    #   ww0 's1decorated=', value
+    #   # binding.irb
+    #   @attrs[:raw_s1decorated] ||= value
+    #   @attrs[:s1decorated] = value
+    # end
+
     # Processes a block to generate its summary, modifying its attributes
     #  based on various matching criteria.
     # It handles special formatting for bash blocks, extracting and setting
@@ -75,6 +111,7 @@ module MarkdownExec
       block_name_nick_match: @delegate_object[:block_name_nick_match],
       id: ''
     )
+      # binding.irb
       call = @attrs[:call] = @attrs[:start_line]&.match(
         Regexp.new(block_calls_scan)
       )&.fetch(1, nil)
@@ -85,7 +122,7 @@ module MarkdownExec
                 @attrs[:nickname] = $~[0]
                 derive_title_from_body
               else
-                bm = NamedCaptureExtractor::extract_named_groups(
+                bm = NamedCaptureExtractor.extract_named_groups(
                   titlexcall,
                   block_name_match
                 )
@@ -161,7 +198,6 @@ module MarkdownExec
     end
 
     # Expand variables in attributes
-    ####
     def expand_variables_in_attributes!(pattern, replacements)
       @attrs[:raw_dname] ||= @attrs[:dname]
       @attrs[:dname] = @attrs[:dname]&.gsub(pattern) do |match|
@@ -179,14 +215,14 @@ module MarkdownExec
       end
 
       # Replace variables in each line of `body` if `body` is present
-      if @attrs[:body]
-        @attrs[:raw_body] ||= @attrs[:body]
-        @attrs[:body] = @attrs[:body]&.map do |line|
-          if line.empty?
-            line
-          else
-            line.gsub(pattern) { |match| replacements[match] }
-          end
+      return unless @attrs[:body]
+
+      @attrs[:raw_body] ||= @attrs[:body]
+      @attrs[:body] = @attrs[:body]&.map do |line|
+        if line.empty?
+          line
+        else
+          line.gsub(pattern) { |match| replacements[match] }
         end
       end
     end

data/lib/format_table.rb

@@ -63,20 +63,31 @@ module MarkdownTableFormatter
     end
   end
 
-  def format_cell(cell, align, width)
-    case align
-    when :center
-      cell.center(width)
-    when :right
-      cell.rjust(width)
-    else
-      cell.ljust(width)
-    end
+  def format_cell(cell, align, width, truncate: true)
+    plain_string = cell.gsub(/\033\[[\d;]+m|\033\[0m/, '')
+    truncated = false
+    ret = TrackedString.new(
+      case
+      when truncate && plain_string.length > width
+        truncated = true
+        plain_string[0, width]
+      when align == :center
+        cell.center(width)
+      when align == :right
+        cell.rjust(width)
+      else
+        cell.ljust(width)
+      end
+    )
+    ret.truncated = truncated
+    ret
   end
 
   def format_row_line__hs(
     row, alignment_indicators, column_widths, decorate,
-    text_sym: :text, style_sym: :color
+    style_sym: :color,
+    text_sym: :text,
+    truncate: true
   )
     return HierarchyString.new if row.cells.nil?
 
@@ -92,8 +103,10 @@ module MarkdownTableFormatter
                style_sym => decorate && decorate[row.role] }
            else
              {
-               text_sym => format_cell(cell, alignment_indicators[i],
-                                       column_widths[i]),
+               text_sym => format_cell(
+                 cell, alignment_indicators[i], column_widths[i],
+                 truncate: truncate
+               ),
                style_sym => decoration_style(row.role, row.counter, decorate)
              }
            end
@@ -106,9 +119,15 @@ module MarkdownTableFormatter
     )
   end
 
-  def format_rows__hs(rows, alignment_indicators, column_widths, decorate)
+  def format_rows__hs(
+    rows, alignment_indicators, column_widths, decorate,
+    truncate: true
+  )
     rows.map do |row|
-      format_row_line__hs(row, alignment_indicators, column_widths, decorate)
+      format_row_line__hs(
+        row, alignment_indicators, column_widths, decorate,
+        truncate: truncate
+      )
     end
   end
 
@@ -116,7 +135,11 @@ module MarkdownTableFormatter
     format_table__hs(**kwargs).map(&:decorate)
   end
 
-  def format_table__hs(lines:, column_count:, decorate: nil)
+  def format_table__hs(
+    lines:, column_count:, decorate: nil,
+    table_width: nil,
+    truncate: true
+  )
     unless column_count.positive?
       return lines.map do |line|
         HierarchyString.new([{ text: line }])
@@ -129,7 +152,23 @@ module MarkdownTableFormatter
     alignment_indicators, column_widths =
       calculate_column_alignment_and_widths(rows, column_count)
 
-    format_rows__hs(rows, alignment_indicators, column_widths, decorate)
+    # ww0 'table_width', table_width
+    # ww0 'truncate', truncate
+
+    unless table_width.nil?
+      sum_column_widths = column_widths.sum
+      if sum_column_widths > table_width
+        ratio = table_width.to_f / sum_column_widths
+        column_widths.each_with_index do |width, i|
+          column_widths[i] = (width * ratio).to_i
+        end
+      end
+    end
+
+    format_rows__hs(
+      rows, alignment_indicators, column_widths, decorate,
+      truncate: truncate
+    ).tap { |ret| binding.irb if ret.class == TrackedString }
   end
 
   def insert_every_other(array, obj)
@@ -188,7 +227,6 @@ end
 return if $PROGRAM_NAME != __FILE__
 
 require 'minitest/autorun'
-require_relative 'colorize'
 
 class TestMarkdownTableFormatter < Minitest::Test
   def setup