markdown_exec 2.5.0 → 2.6.0

data/lib/fcb.rb

@@ -64,7 +64,8 @@ module MarkdownExec
     def for_menu!(
       block_calls_scan: @delegate_object[:block_calls_scan],
       block_name_match: @delegate_object[:block_name_match],
-      block_name_nick_match: @delegate_object[:block_name_nick_match]
+      block_name_nick_match: @delegate_object[:block_name_nick_match],
+      id: ''
     )
       call = @attrs[:call] = @attrs[:start_line]&.match(
         Regexp.new(block_calls_scan)
@@ -83,7 +84,7 @@ module MarkdownExec
                 bm && bm[1] ? bm[:title] : titlexcall
               end
       @attrs[:title] = @attrs[:oname] = oname
-
+      @attrs[:id] = id
       @attrs[:dname] = HashDelegator.indent_all_lines(
         (yield oname, BLOCK_TYPE_COLOR_OPTIONS[@attrs[:type]]),
         @attrs[:indent]
@@ -107,17 +108,10 @@ module MarkdownExec
     def method_missing(method, *args, &block)
       method_name = method.to_s
       if @attrs.respond_to?(method_name)
-if method_name == 'fetch'
-  ww args[0]
-end
         @attrs.send(method_name, *args, &block)
       elsif method_name[-1] == '='
-# ww caller.take(3) if method_name == 'label='
-ww method_name
         @attrs[method_name.chop.to_sym] = args[0]
       else
-# ww caller.take(3) if method_name == 'label'
-ww method_name
         @attrs[method_name.to_sym]
       end
     rescue StandardError => err
@@ -158,20 +152,22 @@ ww method_name
       @attrs.to_yaml
     end
 
-    # Expand in body and dname
-    def variable_expansion!(pattern, replacement_dictionary)
+    # Expand variables in `dname` and `body` attributes
+    def expand_variables_in_attributes!(pattern, replacements)
       ### update name, nickname, title, label ???
-      @attrs[:dname] = @attrs[:dname].gsub(pattern) { |match|
-        replacement_dictionary[match]
-      }
+
+      # Replace variables in `dname` using the replacements dictionary
+      @attrs[:dname] = @attrs[:dname].gsub(pattern) do |match|
+        replacements[match]
+      end
+
+      # Replace variables in each line of `body` if `body` is present
       if @attrs[:body]
         @attrs[:body] = @attrs[:body].map do |line|
           if line.empty?
             line
           else
-            line.gsub(pattern) do |match|
-              replacement_dictionary[match]
-            end
+            line.gsub(pattern) { |match| replacements[match] }
           end
         end
       end

data/lib/format_table.rb

@@ -74,11 +74,11 @@ module MarkdownTableFormatter
     end
   end
 
-  def format_row_line(
+  def format_row_line__hs(
     row, alignment_indicators, column_widths, decorate,
     text_sym: :text, style_sym: :color
   )
-    return '' if row.cells.nil?
+    return HierarchyString.new if row.cells.nil?
 
     border_style = decorate && decorate[:border]
     HierarchyString.new(
@@ -103,16 +103,20 @@ module MarkdownTableFormatter
        { text_sym => ' |', style_sym => border_style }].compact,
       style_sym: style_sym,
       text_sym: text_sym
-    ).decorate
+    )
   end
 
-  def format_rows(rows, alignment_indicators, column_widths, decorate)
+  def format_rows__hs(rows, alignment_indicators, column_widths, decorate)
     rows.map do |row|
-      format_row_line(row, alignment_indicators, column_widths, decorate)
+      format_row_line__hs(row, alignment_indicators, column_widths, decorate)
     end
   end
 
-  def format_table(lines:, column_count:, decorate: nil)
+  def format_table(**kwargs)
+    format_table__hs(**kwargs).map(&:decorate)
+  end
+
+  def format_table__hs(lines:, column_count:, decorate: nil)
     unless column_count.positive?
       return lines.map do |line|
         HierarchyString.new([{ text: line }])
@@ -125,7 +129,7 @@ module MarkdownTableFormatter
     alignment_indicators, column_widths =
       calculate_column_alignment_and_widths(rows, column_count)
 
-    format_rows(rows, alignment_indicators, column_widths, decorate)
+    format_rows__hs(rows, alignment_indicators, column_widths, decorate)
   end
 
   def insert_every_other(array, obj)