markdown_exec 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e95733b82149c0ae79c429132f53373975961457c9fc6dd6b5f4feed5618d63
-  data.tar.gz: bfc880428a6cb6e3f58f3248972fffdbe2a51449c3e12ee1b4542aee0148fa29
+  metadata.gz: aca4576a97f3d528e52f331941144d91970a5dd6477d60a6270de464e47475cb
+  data.tar.gz: 2c16498793d375c37d4b07c55500e76b63f1ab9dd37cdbbc83dedbeced288d5c
 SHA512:
-  metadata.gz: d24fdac6f00933c9796fe8225c81d35745d2275055b8963b565955a4a9a581e232ddc99e67999e8b00053ecb573ae4e24be8875506d6257b645d4eea74661b40
-  data.tar.gz: 10423e9faec308472a9678b7726c78c5b0be55a702c866e6b4cbe722f6aa6f69cae80ed9a30857f08c60dae792fc70062ebb7a16fd3728d0bc289b9487bc3a98
+  metadata.gz: d90b01f7fa224697dc393a70fea22cd3083a200e32f52d9bead14e08d83a45d86d2ed00d5a90995c14401a28b850fb92ca0fb2682e91977671cd393924635ce5
+  data.tar.gz: 7272c814fe69625754c7e6c0dcddd2bd21d602636eb089593080f4f26ae0863cbe2915fcfa470058677420781a8d57f13a7e5f52348bcf280738779238871197

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.0.3] - 2025-05-23
+
+### Changed
+
+- Collect all required blocks when multiple blocks have the same name.
+
 ## [3.0.2] - 2025-05-21
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (3.0.2)
+    markdown_exec (3.0.3)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

data/docs/dev/block-type-ux-allowed.md

@@ -8,7 +8,7 @@ name: SPECIES
 / automatic block loads first line in output of exec
 ```ux :[document_ux_GENUS]
 allowed: :exec
-exec: echo "Pongo\nHistiophryne psychedelica"
+exec: printf "Pongo\nHistiophryne psychedelica"
 name: GENUS
 ```
 / executed block presents a menu of the allowed list

data/lib/hash_delegator.rb

@@ -3138,7 +3138,10 @@ module MarkdownExec
                                                    opts_block_name)
       return if selected_blocks.empty?
 
-      dependency_map = {}
+      dependency_map = selected_blocks.map do |block|
+        [block.id, block.reqs]
+      end.to_h
+
       selected_blocks.each do |block|
         mdoc.collect_dependencies(memo: dependency_map, block: block)
       end

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/lib/mdoc.rb

@@ -121,7 +121,7 @@ module MarkdownExec
 
       nickname = name_block.pub_name
 
-      dependencies = collect_dependencies(source: nickname)
+      dependencies = collect_dependencies(pubname: nickname)
       # !!t dependencies.count
       all_dependency_names =
         collect_unique_names(dependencies).push(nickname).uniq
@@ -372,6 +372,18 @@ module MarkdownExec
       end.fetch(0, default)
     end
 
+    # Retrieves code blocks by a name.
+    #
+    # @param name [String] The name of the code block to retrieve.
+    # @param default [Hash] The default value to return if the code block is not found.
+    # @return [Hash] The code block as a hash or the default value if not found.
+    #
+    def get_blocks_by_anyname(name)
+      table_not_split.select do |fcb|
+        fcb.is_named?(name)
+      end
+    end
+
     # Checks if a code block should be hidden based on the given options.
     #
     # @param opts [Hash] The options used for hiding code blocks.
@@ -426,13 +438,12 @@ module MarkdownExec
       return memo unless source
       return memo if memo.keys.include? source
 
-      block = get_block_by_anyname(source)
-      # if block.nil? || block.keys.nil? || block.keys.empty?
-      if block.nil?
+      blocks = get_blocks_by_anyname(source)
+      if blocks.empty?
         raise "Named code block `#{source}` not found. (@#{__LINE__})"
       end
 
-      memo[source] = block.reqs
+      memo[source] = blocks.map(&:reqs).flatten(1)
       return memo unless memo[source]&.count&.positive?
 
       memo[source].each do |req|
@@ -447,21 +458,28 @@ module MarkdownExec
     # @param source [String] The name of the initial source block.
     # @param memo [Hash] A memoization hash to store resolved dependencies.
     # @return [Hash] A hash mapping sources to their respective dependencies.
-    def collect_dependencies(block: nil, memo: {}, source: nil)
+    def collect_dependencies(block: nil, memo: {}, pubname: nil)
       if block.nil?
-        return memo unless source
+        return memo unless pubname
 
-        block = get_block_by_anyname(source)
-        if block.nil? || block.instance_of?(Hash)
-          raise "Named code block `#{source}` not found. (@#{__LINE__})"
+        blocks = get_blocks_by_anyname(pubname)
+        if blocks.empty?
+          raise "Named code block `#{pubname}` not found. (@#{__LINE__})"
         end
+      else
+        blocks = [block]
       end
-      return memo unless block.reqs
+      return memo unless blocks.count.positive?
+
+      required_blocks = blocks.map(&:reqs).flatten(1)
+      return memo unless required_blocks.count.positive?
 
-      memo[block.id] = block.reqs
+      blocks.each do |block|
+        memo[block.id] = required_blocks
+      end
 
-      block.reqs.each do |req|
-        collect_dependencies(source: req, memo: memo) unless memo.key?(req)
+      required_blocks.each do |req|
+        collect_dependencies(pubname: req, memo: memo)
       end
 
       memo
@@ -519,7 +537,7 @@ if $PROGRAM_NAME == __FILE__
       ### must raise error
       def test_collect_dependencies_with_nonexistent_source
         assert_raises(RuntimeError) do
-          @mdoc.collect_dependencies(source: 'nonexistent')
+          @mdoc.collect_dependencies(pubname: 'nonexistent')
         end
       end if false
 
@@ -531,7 +549,7 @@ if $PROGRAM_NAME == __FILE__
              .with('source2').returns(OpenStruct.new(id: 'source2', reqs: []))
 
         expected = { 'source1' => ['source2'], 'source2' => [] }
-        assert_equal expected, @mdoc.collect_dependencies(source: 'source1')
+        assert_equal expected, @mdoc.collect_dependencies(pubname: 'source1')
       end
     end
 

data/lib/ww.rb

@@ -77,6 +77,10 @@ def ww0(*objs,
     file.puts(formatted_message)
   end
 
+  def wwb
+    binding.irb if $debug
+  end
+
   # return the last item in the list, as the label is usually first
   objs.last
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard