markdown_exec 1.3.8 → 1.3.9

data/lib/fcb.rb

@@ -18,7 +18,9 @@ module MarkdownExec
         body: nil,
         call: nil,
         headings: [],
+        dname: nil,
         name: nil,
+        oname: nil,
         reqs: [],
         shell: '',
         title: '',
@@ -27,39 +29,9 @@ module MarkdownExec
       }.merge(options)
     end
 
-    def to_h
-      @attrs
-    end
-
-    def to_yaml
-      @attrs.to_yaml
-    end
-
-    private
-
-    # 2023-10-07 proposed but not functional with code
-    #
-    # def method_missing(method, *args, &block)
-    #   method_name = method.to_s
-
-    #   if method_name[-1] == '='
-    #     @attrs[method_name.chop.to_sym] = args[0]
-    #   elsif @attrs.key?(method_name.to_sym)
-    #     @attrs[method_name.to_sym]
-    #   else
-    #     super
-    #   end
-    # rescue StandardError => err
-    #   warn(error = "ERROR ** FCB.method_missing(method: #{method_name}, *args: #{args.inspect}, &block)")
-    #   warn err.inspect
-    #   warn(caller[0..4])
-    #   raise err  # Here, we simply propagate the original error instead of wrapping it in a StandardError.
-    # end
-
     # :reek:ManualDispatch
     def method_missing(method, *args, &block)
       method_name = method.to_s
-
       if @attrs.respond_to?(method_name)
         @attrs.send(method_name, *args, &block)
       elsif method_name[-1] == '='
@@ -79,6 +51,14 @@ module MarkdownExec
     def respond_to_missing?(method_name, _include_private = false)
       @attrs.key?(method_name.to_sym) || super
     end
+
+    def to_h
+      @attrs
+    end
+
+    def to_yaml
+      @attrs.to_yaml
+    end
   end
 end
 
@@ -92,7 +72,9 @@ if $PROGRAM_NAME == __FILE__
         body: 'Sample body',
         call: 'Sample call',
         headings: %w[Header1 Header2],
+        dname: 'Sample name',
         name: 'Sample name',
+        oname: 'Sample name',
         reqs: %w[req1 req2],
         shell: 'bash',
         text: 'Sample Text',

data/lib/filter.rb

@@ -35,10 +35,10 @@ module MarkdownExec
         wrap_name: nil
       }
 
-      name = fcb.fetch(:name, '')
+      name = fcb.oname
       shell = fcb.fetch(:shell, '')
 
-      apply_name_filters(options, filters, name)
+      apply_name_filters(options, filters, name) #if shell == 'bash'
       apply_shell_filters(options, filters, shell)
       apply_other_filters(options, filters, fcb)
 
@@ -107,7 +107,7 @@ module MarkdownExec
     # @param fcb [Hash] The fenced code block to be evaluated.
     #
     def self.apply_other_filters(options, filters, fcb)
-      name = fcb.fetch(:name, '')
+      name = fcb.oname
       shell = fcb.fetch(:shell, '')
       filters[:fcb_chrome] = fcb.fetch(:chrome, false)
 
@@ -166,13 +166,17 @@ if $PROGRAM_NAME == __FILE__
   require 'bundler/setup'
   Bundler.require(:default)
 
+  require 'fcb'
   require 'minitest/autorun'
 
   module MarkdownExec
     class FilterTest < Minitest::Test
       def setup
         @options = {}
-        @fcb = {}
+        @fcb = FCB.new(
+          dname: nil,
+          oname: nil
+        )
       end
 
       # Tests for fcb_select? method
@@ -191,27 +195,27 @@ if $PROGRAM_NAME == __FILE__
       def test_hidden_name_condition
         @options[:hide_blocks_by_name] = true
         @options[:block_name_hidden_match] = 'hidden'
-        @fcb[:name] = 'hidden_block'
+        @fcb[:oname] = 'hidden_block'
         refute Filter.fcb_select?(@options, @fcb)
       end
 
       def test_include_name_condition
         @options[:hide_blocks_by_name] = true
         @options[:block_name_indlude_match] = 'include'
-        @fcb[:name] = 'include_block'
+        @fcb[:oname] = 'include_block'
         assert Filter.fcb_select?(@options, @fcb)
       end
 
       def test_wrap_name_condition
         @options[:hide_blocks_by_name] = true
         @options[:block_name_wrapper_match] = 'wrap'
-        @fcb[:name] = 'wrap_block'
+        @fcb[:oname] = 'wrap_block'
         assert Filter.fcb_select?(@options, @fcb)
       end
 
       def test_name_exclude_condition
         @options[:block_name] = 'test'
-        @fcb[:name] = 'sample'
+        @fcb[:oname] = 'sample'
         refute Filter.fcb_select?(@options, @fcb)
       end
 
@@ -223,7 +227,7 @@ if $PROGRAM_NAME == __FILE__
 
       def test_name_select_condition
         @options[:select_by_name_regex] = 'select'
-        @fcb[:name] = 'select_this'
+        @fcb[:oname] = 'select_this'
         assert Filter.fcb_select?(@options, @fcb)
       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 = '1.3.8'
+  VERSION = '1.3.9'
 end