markdown_exec 2.7.5 → 2.8.1

data/lib/fcb.rb

@@ -5,6 +5,29 @@
 require 'digest'
 require_relative 'namer'
 
+def parse_yaml_of_ux_block(
+  data,
+  menu_format: nil,
+  prompt: nil,
+  validate: nil
+)
+  export = data['export']
+  export = data if export.nil?
+  name = export['name']
+  raise "Invalid data: #{data.inspect}" unless name.present?
+
+  OpenStruct.new(
+    allowed: export['allowed'],
+    default: export['default'],
+    exec: export['exec'],
+    menu_format: export['menu_format'] || menu_format,
+    name: name,
+    prompt: export['prompt'] || prompt,
+    transform: export['transform'],
+    validate: export['validate'] || validate
+  )
+end
+
 module MarkdownExec
   class Error < StandardError; end
 
@@ -33,10 +56,6 @@ 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)
@@ -69,34 +88,6 @@ module MarkdownExec
                        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
@@ -106,12 +97,14 @@ module MarkdownExec
     # @return [Object] The modified functional code block with updated
     #  summary attributes.
     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],
-      id: ''
+      block_calls_scan:,
+      block_name_match:,
+      block_name_nick_match:,
+      id: '',
+      menu_format:,
+      prompt:,
+      table_center:
     )
-      # binding.irb
       call = @attrs[:call] = @attrs[:start_line]&.match(
         Regexp.new(block_calls_scan)
       )&.fetch(1, nil)
@@ -130,6 +123,23 @@ module MarkdownExec
               end
       @attrs[:title] = @attrs[:oname] = oname
       @attrs[:id] = id
+
+      if @attrs[:type] == BlockType::UX
+        case data = YAML.load(@attrs[:body].join("\n"))
+        when Hash
+          export = parse_yaml_of_ux_block(
+            data,
+            menu_format: menu_format,
+            prompt: prompt
+          )
+
+          @attrs[:center] = table_center
+          oname = @attrs[:oname] = format(export.menu_format, export.to_h)
+        else
+          raise "Invalid data type: #{data.inspect}"
+        end
+      end
+
       @attrs[:dname] = HashDelegator.indent_all_lines(
         (yield oname, BLOCK_TYPE_COLOR_OPTIONS[@attrs[:type]]),
         @attrs[:indent]

data/lib/format_table.rb

@@ -65,12 +65,15 @@ module MarkdownTableFormatter
 
   def format_cell(cell, align, width, truncate: true)
     plain_string = cell.gsub(/\033\[[\d;]+m|\033\[0m/, '')
+    exceeded = plain_string.length > width
     truncated = false
     ret = TrackedString.new(
       case
-      when truncate && plain_string.length > width
+      when truncate && exceeded
         truncated = true
-        plain_string[0, width]
+        plain_string[0, width] ### s/trim decorated text
+      when exceeded
+        cell
       when align == :center
         cell.center(width)
       when align == :right
@@ -79,6 +82,7 @@ module MarkdownTableFormatter
         cell.ljust(width)
       end
     )
+    ret.exceeded = exceeded
     ret.truncated = truncated
     ret
   end
@@ -152,11 +156,8 @@ module MarkdownTableFormatter
     alignment_indicators, column_widths =
       calculate_column_alignment_and_widths(rows, column_count)
 
-    # ww0 'table_width', table_width
-    # ww0 'truncate', truncate
-
     unless table_width.nil?
-      sum_column_widths = column_widths.sum
+      sum_column_widths = column_widths.sum + ((column_count * 3) + 5)
       if sum_column_widths > table_width
         ratio = table_width.to_f / sum_column_widths
         column_widths.each_with_index do |width, i|
@@ -168,7 +169,7 @@ module MarkdownTableFormatter
     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)