coradoc-markdown 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a195eaddedba173983f2ba2ab08ce81044fe089124b8287b4a643262dbc6f8
-  data.tar.gz: b163677948cdc8459692c411c2840f2bfa0cfe401e47453d61e88d156bbfc910
+  metadata.gz: 860562e968c6a646a564edac417a882d9d477ef09c7bb84c477a6ab13fcd6fd0
+  data.tar.gz: de5901c3b2e6eb123a718a14466d6bf688358e350ad95564abfcc17ebd62c660
 SHA512:
-  metadata.gz: 3b6c63bf4e97c80a63c4f6289576f80577434d6aa8176aafd3067c026abbad4c9ab72fbe509e936933f60ef6cf02c7e3b6087efab353f541618ffe75d6c93ad1
-  data.tar.gz: 0a7a78dc0d92fd3c03344df7a6063429b443dcacfc760686a7d3080b6df7daff9b873251a1576d73307bbacfa8e642e08e02561625f6cfcd2d493f524843dd4b
+  metadata.gz: 313e3f097c07329bfacd65ce3283c33087136a9e3d8f5259298c40781b76d10495b98dd89c3c3977b27e40d667d0a056ef9c012dc89165bcecc47293333e3442
+  data.tar.gz: 5125a17bab25bde3da034de5b898fd28214f9e18857a9ca471e03795683fd2a9f85d3d7c3bd2925d0abf1f4b36acf6e37c71ef6f4ce2aa7389a65c7e562f8bf3

data/lib/coradoc/markdown/parser/ast_processor.rb

@@ -390,7 +390,7 @@ module Coradoc
 
             # Pattern to match HTML tags with markdown attribute
             # Captures: tag name, markdown value, content, closing tag
-            pattern = %r{<(#{HTML_TAG_PATTERN})\s+([^>]*?)markdown\s*=\s*["']([^"']+)["']([^>]*)>(.*?)</\1>}im
+            pattern = %r{<(#{HTML_TAG_PATTERN})\s+([^>]*?)markdown\s*=\s*["']([^"']+)["']([^>]*)>(.*?)</\1>}imo
 
             text.gsub(pattern) do |_match|
               tag_name = ::Regexp.last_match(1)

data/lib/coradoc/markdown/parser/block_parser.rb

@@ -23,9 +23,9 @@ module Coradoc
 
         rule(:whitespace) { match[" \t"] }
         # NOTE: repeat(1) before EOF (any.absent?) because infinite loop otherwise
-        rule(:blank_line) { (whitespace.repeat(1) >> any.absent? | whitespace.repeat >> line_ending).ignore }
+        rule(:blank_line) { ((whitespace.repeat(1) >> any.absent?) | (whitespace.repeat >> line_ending)).ignore }
         rule(:blank_line_verbatim) do
-          whitespace.repeat(1).as(:ln) >> any.absent? | whitespace.repeat.as(:ln) >> line_ending
+          (whitespace.repeat(1).as(:ln) >> any.absent?) | (whitespace.repeat.as(:ln) >> line_ending)
         end
         rule(:line_char) { match["^\r\n"] }
         rule(:line_verbatim) { line_char.repeat(1).as(:ln) >> line_ending_or_eof }
@@ -222,7 +222,7 @@ module Coradoc
         end
 
         rule(:paragraph_line) do
-          line_char.repeat(1).as(:ln) >> any.absent? | line_char.repeat.as(:ln) >> line_ending
+          (line_char.repeat(1).as(:ln) >> any.absent?) | (line_char.repeat.as(:ln) >> line_ending)
         end
 
         rule(:paragraph_continued_line) do
@@ -286,8 +286,8 @@ module Coradoc
         rule(:ial_key_value) do
           match['\\w\\-'].repeat(1) >> str('=') >>
             (
-              str('"') >> match['^"'].repeat(0) >> str('"') |
-              str("'") >> match["^'"].repeat(0) >> str("'") |
+              (str('"') >> match['^"'].repeat(0) >> str('"')) |
+              (str("'") >> match["^'"].repeat(0) >> str("'")) |
               match['^\\s\\}'].repeat(1)
             )
         end
@@ -322,8 +322,8 @@ module Coradoc
         rule(:extension_option) do
           match['\\w\\-'].repeat(1) >> str('=') >>
             (
-              str('"') >> match['^"'].repeat(0) >> str('"') |
-              str("'") >> match["^'"].repeat(0) >> str("'") |
+              (str('"') >> match['^"'].repeat(0) >> str('"')) |
+              (str("'") >> match["^'"].repeat(0) >> str("'")) |
               match['^\\s/\\}'].repeat(1)
             )
         end
@@ -466,11 +466,11 @@ module Coradoc
         # List item continuation line (indented content that's not a block)
         # Excludes lines that look like nested list markers
         rule(:list_continuation_line) do
-          (str('    ') | str("\t")) >>
-            nested_list_marker.absent? >>
-            line_verbatim |
+          ((str('    ') | str("\t")) >>
             nested_list_marker.absent? >>
-            line_verbatim
+            line_verbatim) |
+            (nested_list_marker.absent? >>
+            line_verbatim)
         end
 
         # Nested list marker detection (for 4-space indented lists)
@@ -513,8 +513,8 @@ module Coradoc
 
         # Nested block (indented list, etc.)
         rule(:nested_block) do
-          (str('    ') | str("\t")) >> nested_unordered_list |
-            (str('    ') | str("\t")) >> nested_ordered_list
+          ((str('    ') | str("\t")) >> nested_unordered_list) |
+            ((str('    ') | str("\t")) >> nested_ordered_list)
         end
 
         # Nested unordered list (4-space indented)

data/lib/coradoc/markdown/parser/inline_parser.rb

@@ -266,7 +266,7 @@ module Coradoc
         end
 
         def parse(io, options = {})
-          process_emphasis(super(io, options))
+          process_emphasis(super)
         end
       end
     end

data/lib/coradoc/markdown/parser_util.rb

@@ -71,11 +71,11 @@ module Coradoc
         def self.extract_quoted_value(scanner, handle_escapes: false)
           if scanner.scan(/"([^"\\]*(?:\\.[^"\\]*)*)"/)
             value = scanner[1]
-            value = value.gsub(/\\"/, '"') if handle_escapes
+            value = value.gsub('\"', '"') if handle_escapes
             value
           elsif scanner.scan(/'([^'\\]*(?:\\.[^'\\]*)*)'/)
             value = scanner[1]
-            value = value.gsub(/\\'/, "'") if handle_escapes
+            value = value.gsub('\\\'', "'") if handle_escapes
             value
           elsif scanner.scan(/(\S+)/)
             scanner[1]

data/lib/coradoc/markdown/serializer/config.rb

@@ -48,7 +48,7 @@ module Coradoc
         end
 
         def with(overrides)
-          self.class.new(**to_h.merge(symbolize(overrides)))
+          self.class.new(**to_h, **symbolize(overrides))
         end
 
         private
@@ -58,15 +58,9 @@ module Coradoc
         end
 
         def validate_options!(resolved)
-          unless %i[github container html gfm_alert].include?(resolved.fetch(:admonition_style))
-            raise ArgumentError, "Unknown admonition_style: #{resolved[:admonition_style].inspect}"
-          end
-          unless %i[html flatten].include?(resolved.fetch(:definition_list_nested))
-            raise ArgumentError, "Unknown definition_list_nested: #{resolved[:definition_list_nested].inspect}"
-          end
-          unless [true, false].include?(resolved.fetch(:suppress_comments))
-            raise ArgumentError, 'suppress_comments must be boolean'
-          end
+          raise ArgumentError, "Unknown admonition_style: #{resolved[:admonition_style].inspect}" unless %i[github container html gfm_alert].include?(resolved.fetch(:admonition_style))
+          raise ArgumentError, "Unknown definition_list_nested: #{resolved[:definition_list_nested].inspect}" unless %i[html flatten].include?(resolved.fetch(:definition_list_nested))
+          raise ArgumentError, 'suppress_comments must be boolean' unless [true, false].include?(resolved.fetch(:suppress_comments))
           return if [true, false].include?(resolved.fetch(:autolinks))
 
           raise ArgumentError, 'autolinks must be boolean'

data/lib/coradoc/markdown/serializer/registry.rb

@@ -39,7 +39,7 @@ module Coradoc
         def lookup!(element)
           lookup(element) || raise(ArgumentError,
                                    "Unknown element type for serialization: #{element.class}. " \
-                                     'Expected a known Markdown model type.')
+                                   'Expected a known Markdown model type.')
         end
 
         private

data/lib/coradoc/markdown/serializer/runner.rb

@@ -40,7 +40,7 @@ module Coradoc
             else
               raise ArgumentError,
                     "Unknown element type for serialization: #{element.class}. " \
-                      'Expected a known Markdown model type.'
+                    'Expected a known Markdown model type.'
             end
           end
         end

data/lib/coradoc/markdown/transform/from_core_model.rb

@@ -55,6 +55,8 @@ module Coradoc
               Coradoc::Markdown::Text.new(content: model.title.to_s)
             when Coradoc::CoreModel::CommentLine
               Coradoc::Markdown::Comment.new(text: model.text.to_s)
+            when Coradoc::CoreModel::Include
+              transform_include(model)
             when Coradoc::CoreModel::TextContent
               model.text.to_s
             when Array
@@ -66,6 +68,17 @@ module Coradoc
 
           private
 
+          # Markdown has no transclusion — an unresolved include edge is
+          # preserved as an HTML comment so no information is lost and
+          # serialization never crashes on graph-mode documents.
+          def transform_include(element)
+            Coradoc::Markdown::Comment.new(text: include_directive_text(element))
+          end
+
+          def include_directive_text(element)
+            "include::#{element.target}[#{element.raw_options}]"
+          end
+
           def transform_structural_element(element)
             case element
             when CoreModel::DocumentElement

data/lib/coradoc/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Markdown
-    VERSION = '1.0.10'
+    VERSION = '1.0.11'
   end
 end

data/lib/coradoc/markdown.rb

@@ -127,9 +127,9 @@ module Coradoc
       # @param filename [String] Path to the Markdown file
       # @param options [Hash] Parsing options (see #parse)
       # @return [Array] The parsed AST
-      def from_file(filename, **options)
+      def from_file(filename, **)
         content = File.read(filename)
-        parse(content, **options)
+        parse(content, **)
       end
 
       # Parse inline Markdown content
@@ -150,6 +150,13 @@ module Coradoc
         Serializer.serialize(document, options)
       end
 
+      # Markdown preserves unresolved include edges as HTML comments
+      # (Transform::FromCoreModel#transform_include) — lossy formatting,
+      # but never silent content loss.
+      def preserves_unresolved_includes?
+        true
+      end
+
       # Check if this format can transform the given model to CoreModel
       #
       # @param model [Object] The model to check

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-markdown
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
@@ -232,6 +232,7 @@ metadata:
   homepage_uri: https://github.com/metanorma/coradoc
   source_code_uri: https://github.com/metanorma/coradoc
   changelog_uri: https://github.com/metanorma/coradoc/releases
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib