markdown_exec 2.7.2 → 2.7.4

data/lib/mdoc.rb

@@ -220,101 +220,31 @@ module MarkdownExec
       end
 
       collapser = Collapser.new(
-        options: opts, state: opts[:compressed_ids] || {}
+        options: opts,
+        compress_ids: opts[:compressed_ids] || {},
+        expand_ids: opts[:expanded_ids] || {}
       )
-      selrows = collapser.reject(selrows, initialize: opts[:compressed_ids].nil?) do |fcb, hide, collapsed_level|
+      selrows = collapser.reject(
+        selrows,
+        initialize: opts[:compressed_ids].nil?
+      ) do |fcb, _hide, _collapsed_level|
         # update fcb per state
         if fcb.collapsible
           fcb.s1decorated = fcb.s1decorated + ' ' + (fcb.collapse ? opts[:menu_collapsible_symbol_collapsed] : opts[:menu_collapsible_symbol_expanded])
         end
       end
-      opts[:compressed_ids] = collapser.state
+      opts[:compressed_ids] = collapser.compress_ids
+      opts[:expanded_ids] = collapser.expand_ids
 
       # remove
       # . empty chrome between code; edges are same as blanks
       #
-      [
-        select_elements_with_neighbor_conditions(selrows) do |prev_element, current, next_element|
-          !(current[:chrome] && !current.oname.present?) ||
-            !(!prev_element.nil? &&
-              prev_element.shell.present? &&
-              !next_element.nil? &&
-              next_element.shell.present?)
-        end,
-        opts[:compressed_ids]
-      ]
-    end
-
-    # Filters out blocks that are nested within a hierarchy of "hidden" blocks.
-    #
-    # The method iterates over selected rows and uses a callback block to determine if a given block
-    # should trigger hiding for subsequent blocks in the hierarchy. Once hiding is triggered, all
-    # blocks with a level greater than the triggering block's level are excluded until the next
-    # visible collapsible block.
-    #
-    # @param selrows [Array] The array of selected rows to filter based on the callback's results.
-    # @param callback [Lambda/Proc] Alternate to yield block.
-    # @param collapsible_types [Array] Types to select, nil for all.
-    # @yield [block] A callback to evaluate each block; should return true to initiate hiding.
-    # @return [Array] Filtered list of rows, excluding those hidden by hierarchical hiding rules.
-    #
-    # Example:
-    #   proc_condition = Proc.new { |fcb| fcb.type == BlockType::HEADING && fcb.level == 1 }
-    #   reject_collapsed_blocks(selrows, callback: proc_condition)
-    #
-    #   lambda_condition = ->(fcb) { fcb.type == BlockType::HEADING && fcb.level == 1 }
-    #   reject_collapsed_blocks(selrows, callback: lambda_condition)
-    #
-    # Block: Exits the enclosing method (test_with_block) if return is used.
-    #        Flexible with arguments
-    # Proc: Exits the enclosing method (test_with_proc) when return is encountered, similar to a block.
-    # Lambda: Only exits the lambda itself, allowing reject_collapsed_blocks to continue execution.
-    #         Stricter argument checking.
-    #
-    # **`lambda` provides more control** and avoids the early exit behavior caused by `return` in blocks or `Proc` objects, making it a safer choice when you want `reject_collapsed_blocks` to complete its execution regardless of the callback’s behavior.
-    def reject_collapsed_blocks(
-      selrows,
-      callback: nil,
-      reject_callback: nil,
-      collapsible_types: nil,
-      &block
-    )
-      block ||= callback           # Use callback if no block is provided
-      hiding = false               # State to indicate if hiding is active
-      hidden_level = nil           # Level at which hiding was triggered
-
-      selrows.reject do |fcb|      # Reject rows that should be hidden based on the hierarchy
-        if hiding
-          # Currently in hiding mode; evaluate if the current block should remain hidden
-          if collapsible_types.nil? || collapsible_types.include?(fcb.type)
-            if hidden_level.nil?
-              # No specific hidden level yet, allow the item to show
-              false
-            elsif fcb.level > hidden_level
-              reject_callback.call(fcb, ) if reject_callback
-              # The current block is at a deeper level and thus remains hidden
-              true
-            else
-              # At the same or higher level than hidden_level, check if the callback initiates hiding again
-              hiding = block.call(fcb)
-              hidden_level = fcb.level if hiding # Update hidden level if hiding continues
-              false                              # Do not hide the initiating block itself
-            end
-          else
-            reject_callback.call(fcb) if reject_callback
-            # Non-collapsible block types (e.g., text or note) continue hiding by default
-            true
-          end
-
-        elsif block.call(fcb)
-          # If callback triggers hiding, initialize hiding state and hidden_level
-          hiding = fcb.type        # Start hiding subsequent blocks
-          hidden_level = fcb.level # Define the hierarchical level for hiding
-          false                    # Do not hide the initiating block itself
-
-        else
-          false                    # Default: do not hide if no hiding state
-        end
+      select_elements_with_neighbor_conditions(selrows) do |prev_element, current, next_element|
+        !(current[:chrome] && !current.oname.present?) ||
+          !(!prev_element.nil? &&
+            prev_element.shell.present? &&
+            !next_element.nil? &&
+            next_element.shell.present?)
       end
     end
 
@@ -605,7 +535,7 @@ if $PROGRAM_NAME == __FILE__
 
       def test_fcbs_per_options
         opts = { hide_blocks_by_name: true, block_name_hidden_match: 'block1' }
-        result, _ = @doc.fcbs_per_options(opts)
+        result = @doc.fcbs_per_options(opts)
         assert_equal [@table[1], @table[2]], result
       end if false ### broken test
 

data/lib/menu.src.yml

@@ -904,11 +904,10 @@
   :procname: val_as_str
 
 ## lines that start with "/" are comments (hidden), not notes (visible)
-# - :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<line>(?![ \t]*/)(?<text>.*?)(?<trailing>[ \t]*))$"
+  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :procname: val_as_str
 
 - :opt_name: menu_option_back_name
@@ -1588,6 +1587,12 @@
   :description: Color for table border
   :default: fg_bg_rgbh_00_00_df_14_18_1c
 
+- :opt_name: table_cell_text_truncate
+  :env_var: MDE_TABLE_CELL_TEXT_TRUNCATE
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
+
 - :opt_name: table_center
   :env_var: MDE_TABLE_CENTER
   :arg_name: BOOL

data/lib/menu.yml

@@ -766,7 +766,7 @@
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<line>(?![ \t]*/)(?<text>.*?)(?<trailing>[ \t]*))$"
+  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :procname: val_as_str
 - :opt_name: menu_option_back_name
   :env_var: MDE_MENU_OPTION_BACK_NAME
@@ -1355,6 +1355,11 @@
   :env_var: MDE_TABLE_BORDER_COLOR
   :description: Color for table border
   :default: fg_bg_rgbh_00_00_df_14_18_1c
+- :opt_name: table_cell_text_truncate
+  :env_var: MDE_TABLE_CELL_TEXT_TRUNCATE
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
 - :opt_name: table_center
   :env_var: MDE_TABLE_CENTER
   :arg_name: BOOL

data/lib/ww.rb

@@ -15,7 +15,7 @@ if $debug && ENV['WW_MINIMUM'].nil?
 end
 
 def ww(*objs, **kwargs)
-  return unless $debug
+  return objs.size == 1 ? objs.first : objs unless $debug
 
   ww0(*objs, **kwargs.merge(locations: caller_locations))
 end
@@ -24,7 +24,7 @@ def ww0(*objs,
         category: nil,
         full_backtrace: false,
         level: :debug,
-        locations: caller_locations[1..-1],
+        locations: caller_locations,
         log_file: nil,
         output: $stderr,
         single_line: false,
@@ -70,18 +70,20 @@ def ww0(*objs,
   output.flush
 
   # Optionally log to a file
-  return unless log_file
+  return objs.size == 1 ? objs.first : objs unless log_file
 
   File.open(log_file, 'a') do |file|
     file.puts(formatted_message)
   end
+
+  objs.size == 1 ? objs.first : objs
 end
 
 class Array
   unless defined?(deref)
     def deref
       map(&:deref).select do |line|
-        !%r{^/vendor/}.match(line)
+        !%r{^/(vendor|\.bundle)/}.match(line)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.4
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -107,6 +107,8 @@ files:
 - assets/select_a_block.png
 - assets/select_a_file.png
 - bats/bats.bats
+- bats/block-type-opts.bats
+- bats/block-type-vars.bats
 - bats/block-types.bats
 - bats/border.bats
 - bats/cli.bats
@@ -115,6 +117,7 @@ files:
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
+- bats/line-wrapping.bats
 - bats/markup.bats
 - bats/mde.bats
 - bats/options-collapse.bats
@@ -143,6 +146,7 @@ files:
 - docs/dev/document-shell.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
+- docs/dev/line-wrapping.md
 - docs/dev/linked-file.md
 - docs/dev/load1.sh
 - docs/dev/load_code.md
@@ -201,7 +205,7 @@ files:
 - examples/variable-expansion-save-block.md
 - examples/variable-expansion.md
 - examples/vars-blocks.md
-- examples/wrap.md
+- examples/wrapped-blocks.md
 - lib/ansi_formatter.rb
 - lib/ansi_string.rb
 - lib/argument_processor.rb