coradoc-adoc 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d135f788f7205a03a242f7d1e9242b84fdc76994f6eff372579db29c9c420d51
-  data.tar.gz: 6eafdb8eb6a101650e48e6a29d5e719f729d8c7888c506a5e67a33511640db2f
+  metadata.gz: 4ecb988af13f918e49f0249e3691e22fd98f21beffd3f0e2d6c98affc39d64dc
+  data.tar.gz: 4db6ab5b2227364c2092f00b40167fa054ed1dd43592150baf1c745e39f98a09
 SHA512:
-  metadata.gz: cfe57d959c7d69cf47aadb30526cd826ac85720d1f3f4426c4f6fc4d769c2618ad2c31cd713e3b86b4480f79fdf41d473457623c145746eb7fc25155c47b2dfc
-  data.tar.gz: 07dcf6099269006d16c34a21f5ca9457227fe9e7fcd597607716511ddecf7a3a1b7d794d5f32a29c6542a4b4f93ced0f61b37ae7e06553d775a0068ad4f7f363
+  metadata.gz: 26ea9aeac36925a4ce0df0221ffba1e0c5ba41fc33de0b8c0937229e353f2f758e101a873e0eab76ed46408fe71990c0001088612ecef50c0f3a22fba17646db
+  data.tar.gz: 2a7a709b48e9c0764c12b5a54be0846ecd08551245e92dd6028deb881c1ebff634514445a72cf28d24a6e31a5bdd90b12c6519e523e440977a7bfe9f767949a5

data/lib/coradoc/asciidoc/builder/detection.rb

@@ -70,10 +70,10 @@ module Coradoc
             return false
           end
 
-          key = "#{format_type}_constrained".to_sym
+          key = :"#{format_type}_constrained"
           return true if ast.key?(key)
 
-          unconstrained_key = "#{format_type}_unconstrained".to_sym
+          unconstrained_key = :"#{format_type}_unconstrained"
           return false if ast.key?(unconstrained_key)
 
           true
@@ -158,8 +158,8 @@ module Coradoc
         def extract_inline_content(ast, format_type)
           content_key = format_type.to_sym
           content = ast[content_key] ||
-                    ast["#{format_type}_constrained".to_sym] ||
-                    ast["#{format_type}_unconstrained".to_sym]
+                    ast[:"#{format_type}_constrained"] ||
+                    ast[:"#{format_type}_unconstrained"]
 
           extract_text_content(content)
         end

data/lib/coradoc/asciidoc/model/attribute_list/matchers.rb

@@ -5,8 +5,8 @@ module Coradoc
     module Model
       class AttributeList < Base
         module Matchers
-          def one(*args)
-            One.new(*args)
+          def one(*)
+            One.new(*)
           end
 
           class One
@@ -19,8 +19,8 @@ module Coradoc
             end
           end
 
-          def many(*args)
-            Many.new(*args)
+          def many(*)
+            Many.new(*)
           end
 
           # NOTE: The Many matcher validates that all values in an array/string match

data/lib/coradoc/asciidoc/model/block/core.rb

@@ -54,7 +54,7 @@ module Coradoc
           include Coradoc::AsciiDoc::Model::Anchorable
 
           attribute :id, :string
-          attribute :title, :string, default: -> { nil } # Polymorphic: string or array of Model objects
+          attribute :title, :string, default: -> {} # Polymorphic: string or array of Model objects
           attribute :attributes, Coradoc::AsciiDoc::Model::AttributeList, default: lambda {
             Coradoc::AsciiDoc::Model::AttributeList.new
           }

data/lib/coradoc/asciidoc/model/content_list.rb

@@ -86,8 +86,8 @@ module Coradoc
         # @example Iterate
         #   content.each { |item| puts item }
         #
-        def each(&block)
-          @items.each(&block)
+        def each(&)
+          @items.each(&)
         end
 
         # Add an item to the content
@@ -199,8 +199,8 @@ module Coradoc
         # @example Map
         #   content.map(&:class) # => [String, Bold, String]
         #
-        def map(&block)
-          @items.map(&block)
+        def map(&)
+          @items.map(&)
         end
 
         # Select items matching predicate
@@ -211,8 +211,8 @@ module Coradoc
         # @example Select strings
         #   content.select { |i| i.is_a?(String) }
         #
-        def select(&block)
-          @items.select(&block)
+        def select(&)
+          @items.select(&)
         end
 
         # Reject items matching predicate
@@ -220,8 +220,8 @@ module Coradoc
         # @yield [Object] Each item
         # @return [Array] Remaining items
         #
-        def reject(&block)
-          @items.reject(&block)
+        def reject(&)
+          @items.reject(&)
         end
 
         # Check if content includes an item

data/lib/coradoc/asciidoc/model/inline/bold.rb

@@ -25,7 +25,7 @@ module Coradoc
         class Bold < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/highlight.rb

@@ -23,7 +23,7 @@ module Coradoc
         class Highlight < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/italic.rb

@@ -25,7 +25,7 @@ module Coradoc
         class Italic < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/monospace.rb

@@ -26,7 +26,7 @@ module Coradoc
         class Monospace < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/strikethrough.rb

@@ -25,12 +25,12 @@ module Coradoc
         class Strikethrough < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array
                     ]
-          attribute :text, :string, default: -> { nil }
+          attribute :text, :string, default: -> {}
           attribute :unconstrained, :boolean, default: -> { false }
         end
       end

data/lib/coradoc/asciidoc/model/inline/subscript.rb

@@ -21,7 +21,7 @@ module Coradoc
         class Subscript < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/superscript.rb

@@ -21,7 +21,7 @@ module Coradoc
         class Superscript < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/serialization/asciidoc_mapping.rb

@@ -6,8 +6,7 @@ module Coradoc
       module Serialization
         # Define the DSL for defining mappings in Asciidoc format
         class AsciidocMapping < Lutaml::Model::Mapping
-          attr_reader :mappings
-          attr_writer :mappings
+          attr_accessor :mappings
 
           def initialize
             super
@@ -33,8 +32,8 @@ module Coradoc
 
           private
 
-          def add_mapping(name, to, **options)
-            @mappings << AsciidocMappingRule.new(name, to: to, **options)
+          def add_mapping(name, to, **)
+            @mappings << AsciidocMappingRule.new(name, to: to, **)
           end
         end
       end

data/lib/coradoc/asciidoc/model/text_element.rb

@@ -3,6 +3,16 @@
 module Coradoc
   module AsciiDoc
     module Model
+      # Single source of truth for the markers AsciiDoc uses to terminate
+      # a TextElement. Exposed as a module so the transformer can compare
+      # against the constant without hand-writing string literals across
+      # the codebase (DRY), and so future markers (e.g. a hypothetical
+      # backslash-style hard break) extend one place.
+      module LineBreakMarker
+        HARD = '+'
+      end
+      private_constant :LineBreakMarker
+
       class TextElement < Base
         def inline?
           true
@@ -18,6 +28,18 @@ module Coradoc
                   ]
         attribute :line_break, :string, default: -> { '' }
 
+        # Semantic predicates over the line-break marker. Consumers (the
+        # transformer, the serializer) call these instead of comparing
+        # line_break against literal strings, so the wire format for
+        # hard breaks is owned by the model layer (SRP).
+        def hard_break?
+          line_break == LineBreakMarker::HARD
+        end
+
+        def soft_break?
+          line_break.to_s.empty?
+        end
+
         def self.escape_keychars(string)
           subs = { '*' => '\*', '_' => '\_' }
           string

data/lib/coradoc/asciidoc/parser/block.rb

@@ -73,14 +73,14 @@ module Coradoc
           closing_fence = dynamic do |_s, c|
             str(c.captures[capture_key].to_s.strip)
           end
-          language = (space? >> match("[A-Za-z0-9_+.-]").repeat(1).as(:language)).maybe
+          language = (space? >> match('[A-Za-z0-9_+.-]').repeat(1).as(:language)).maybe
 
           block_content_with_closing = dynamic do |_s, c|
-            fence_str = c.captures[capture_key].to_s.strip
+            c.captures[capture_key].to_s.strip
             closing_pattern = closing_fence >> space? >> newline
 
             content = text_line(false, unguarded: true, verbatim: true) |
-                        empty_line.as(:line_break)
+                      empty_line.as(:line_break)
 
             (closing_pattern.absent? >> content).repeat(1)
           end

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

@@ -300,8 +300,11 @@ module Coradoc
           end
 
           def transform_image(image)
-            target_class = image.inline ? Coradoc::AsciiDoc::Model::Image::InlineImage
-                                        : Coradoc::AsciiDoc::Model::Image::BlockImage
+            target_class = if image.inline
+                             Coradoc::AsciiDoc::Model::Image::InlineImage
+                           else
+                             Coradoc::AsciiDoc::Model::Image::BlockImage
+                           end
             target_class.new(**image_attributes(image))
           end
 

data/lib/coradoc/asciidoc/transform/inline_transform_visitor.rb

@@ -62,10 +62,15 @@ module Coradoc
           result
         end
 
+        # Two adjacent TextElements in the content array indicate the
+        # parser split a paragraph across source lines. Join them with a
+        # space (soft break) unless the second one carries a hard-break
+        # marker — the model owns that predicate, so this method does
+        # not reach into parser-specific line_break string values.
         def soft_break_before?(previous, current)
           previous.is_a?(Model::TextElement) &&
             current.is_a?(Model::TextElement) &&
-            current.line_break != '+'
+            !current.hard_break?
         end
 
         def visit_model(model)

data/lib/coradoc/asciidoc/transformer/block_rules.rb

@@ -23,8 +23,7 @@ module Coradoc
                 title: title,
                 delimiter_len: delimiter.size,
                 lines: lines,
-                ordering: ordering,
-                source_line: SourceLineExtractor.extract(block)
+                ordering: ordering
               }
               # Markdown fences carry the language tag inline (```ruby);
               # pass it through so the SourceCode classifier entry can set
@@ -37,8 +36,7 @@ module Coradoc
             rule(example: sequence(:example)) do
               Model::Block::Example.new(
                 title: '',
-                lines: example,
-                source_line: SourceLineExtractor.extract(example)
+                lines: example
               )
             end
 
@@ -52,8 +50,7 @@ module Coradoc
               canonical = Coradoc::AsciiDoc::Transform::ElementTransformers::AdmonitionStyles.canonicalize(admonition_type.to_s)
               Model::Admonition.new(
                 content: content,
-                type: canonical,
-                source_line: SourceLineExtractor.extract(admonition_type)
+                type: canonical
               )
             end
 
@@ -72,7 +69,6 @@ module Coradoc
                 src: path,
                 attributes: residual,
                 line_break: "\n",
-                source_line: SourceLineExtractor.extract(block_image),
                 **promoted
               )
             end

data/lib/coradoc/asciidoc/transformer/block_type_classifier.rb

@@ -16,23 +16,23 @@ module Coradoc
         # returning a Model::Block::* instance. `max_length` nil means
         # unbounded.
         DELIMITER_CLASSIFICATIONS = [
-          ['*', 4, nil, ->(opts, attrs) {
+          ['*', 4, nil, lambda { |opts, attrs|
             if attrs && attrs.positional == [] && attrs.named.first&.name == 'reviewer'
-              Model::Block::ReviewerComment.new(**opts.merge(attributes: attrs))
+              Model::Block::ReviewerComment.new(**opts, attributes: attrs)
             else
-              Model::Block::Side.new(**opts.merge(attributes: attrs))
+              Model::Block::Side.new(**opts, attributes: attrs)
             end
           }],
-          ['=', 4, nil, ->(opts, attrs) { Model::Block::Example.new(**opts.merge(attributes: attrs)) }],
-          ['+', 4, nil, ->(opts, attrs) { Model::Block::Pass.new(**opts.merge(attributes: attrs)) }],
-          ['.', 4, nil, ->(opts, attrs) { Model::Block::Literal.new(**opts.merge(attributes: attrs)) }],
-          ['_', 4, nil, ->(opts, attrs) { Model::Block::Quote.new(**opts.merge(attributes: attrs)) }],
-          ['-', 4, nil, ->(opts, attrs) { Model::Block::SourceCode.new(**opts.merge(attributes: attrs)) }],
-          ['-', 2, 2,  ->(opts, attrs) { Model::Block::Open.new(**opts.merge(attributes: attrs)) }],
+          ['=', 4, nil, ->(opts, attrs) { Model::Block::Example.new(**opts, attributes: attrs) }],
+          ['+', 4, nil, ->(opts, attrs) { Model::Block::Pass.new(**opts, attributes: attrs) }],
+          ['.', 4, nil, ->(opts, attrs) { Model::Block::Literal.new(**opts, attributes: attrs) }],
+          ['_', 4, nil, ->(opts, attrs) { Model::Block::Quote.new(**opts, attributes: attrs) }],
+          ['-', 4, nil, ->(opts, attrs) { Model::Block::SourceCode.new(**opts, attributes: attrs) }],
+          ['-', 2, 2, ->(opts, attrs) { Model::Block::Open.new(**opts, attributes: attrs) }],
           # Markdown-style triple-backtick fence: behaves as a SourceCode
           # block. The language tag parsed from the opening fence is passed
           # through opts[:lang]; extract_block_language prefers block.lang.
-          ['`', 3, nil, ->(opts, attrs) {
+          ['`', 3, nil, lambda { |opts, attrs|
             model_opts = opts.merge(attributes: attrs, delimiter_char: '`')
             model_opts[:lang] = opts[:lang] if opts.key?(:lang)
             Model::Block::SourceCode.new(**model_opts)

data/lib/coradoc/asciidoc/transformer/header_rules.rb

@@ -22,8 +22,7 @@ module Coradoc
               id = nil if id && id.empty?
 
               Model::Header.new(
-                id:, title:, author:, revision:,
-                source_line: SourceLineExtractor.extract(header)
+                id:, title:, author:, revision:
               )
             end
 
@@ -38,8 +37,7 @@ module Coradoc
               email: simple(:email)
             ) do
               Model::Author.new(
-                first_name:, last_name:, email:, middle_name: nil,
-                source_line: SourceLineExtractor.extract(first_name)
+                first_name:, last_name:, email:, middle_name: nil
               )
             end
 
@@ -50,8 +48,7 @@ module Coradoc
               remark: simple(:remark)
             ) do
               Model::Revision.new(
-                number:, date:, remark:,
-                source_line: SourceLineExtractor.extract(number)
+                number:, date:, remark:
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/inline_rules.rb

@@ -10,8 +10,8 @@ module Coradoc
         # `span` is excluded because it carries `text:` + `attributes:`
         # rather than `content:`, so it gets its own pair of rules.
         FORMATTING_VARIANTS = [
-          %i[bold      Bold],
-          %i[italic    Italic],
+          %i[bold Bold],
+          %i[italic Italic],
           %i[highlight Highlight],
           %i[monospace Monospace]
         ].freeze
@@ -22,8 +22,7 @@ module Coradoc
             rule(link: subtree(:link)) do
               Model::Inline::Link.new(
                 path: link[:path].to_s,
-                name: link[:text]&.to_s,
-                source_line: SourceLineExtractor.extract(link)
+                name: link[:text]&.to_s
               )
             end
 
@@ -33,8 +32,7 @@ module Coradoc
               text = xref[:text]
               args = text ? [text.to_s] : []
               Model::Inline::CrossReference.new(
-                href:, args:,
-                source_line: SourceLineExtractor.extract(xref)
+                href:, args:
               )
             end
 
@@ -47,7 +45,6 @@ module Coradoc
               Model::Image::InlineImage.new(
                 src: inline_image[:path],
                 attributes: residual,
-                source_line: SourceLineExtractor.extract(inline_image),
                 **promoted
               )
             end
@@ -59,16 +56,14 @@ module Coradoc
             rule(inline_passthrough: subtree(:passthrough)) do
               Model::Inline::Passthrough.new(
                 content: passthrough[:raw].to_s,
-                form: 'triple',
-                source_line: SourceLineExtractor.extract(passthrough)
+                form: 'triple'
               )
             end
 
             # Attribute reference
             rule(attribute_reference: simple(:name)) do
               Model::Inline::AttributeReference.new(
-                name:,
-                source_line: SourceLineExtractor.extract(name)
+                name:
               )
             end
 
@@ -78,9 +73,7 @@ module Coradoc
             # blank lines. Hard breaks carry semantic meaning: HTML/Markdown
             # renderers map them to <br>.
             rule(hard_line_break: simple(:hard_line_break)) do
-              Model::Inline::HardLineBreak.new(
-                source_line: SourceLineExtractor.extract(hard_line_break)
-              )
+              Model::Inline::HardLineBreak.new
             end
 
             # Term
@@ -89,8 +82,7 @@ module Coradoc
               term: simple(:term)
             ) do
               Coradoc::AsciiDoc::Model::Term.new(
-                term:, type: term_type, lang: :en,
-                source_line: SourceLineExtractor.extract(term_type)
+                term:, type: term_type, lang: :en
               )
             end
 
@@ -98,16 +90,14 @@ module Coradoc
             rule(footnote: simple(:footnote)) do
               text_str = footnote.to_s
               Coradoc::AsciiDoc::Model::Inline::Footnote.new(
-                text: text_str,
-                source_line: SourceLineExtractor.extract(footnote)
+                text: text_str
               )
             end
 
             rule(footnote: simple(:footnote), id: simple(:id)) do
               text_str = footnote.to_s
               Coradoc::AsciiDoc::Model::Inline::Footnote.new(
-                text: text_str, id: id.to_s,
-                source_line: SourceLineExtractor.extract(footnote)
+                text: text_str, id: id.to_s
               )
             end
 
@@ -115,8 +105,7 @@ module Coradoc
             rule(footnote: sequence(:footnote), id: simple(:id)) do
               text_str = footnote.map(&:to_s).join
               Coradoc::AsciiDoc::Model::Inline::Footnote.new(
-                text: text_str, id: id.to_s,
-                source_line: SourceLineExtractor.extract(footnote)
+                text: text_str, id: id.to_s
               )
             end
 
@@ -124,8 +113,7 @@ module Coradoc
             rule(footnote: sequence(:footnote)) do
               text_str = footnote.map(&:to_s).join
               Coradoc::AsciiDoc::Model::Inline::Footnote.new(
-                text: text_str,
-                source_line: SourceLineExtractor.extract(footnote)
+                text: text_str
               )
             end
 
@@ -141,15 +129,13 @@ module Coradoc
               rule(constrained_key => subtree(:subtree)) do
                 content = Transformer.extract_inline_content(subtree)
                 klass.new(
-                  content: content, unconstrained: false,
-                  source_line: SourceLineExtractor.extract(subtree)
+                  content: content, unconstrained: false
                 )
               end
               rule(unconstrained_key => subtree(:subtree)) do
                 content = Transformer.extract_inline_content(subtree)
                 klass.new(
-                  content: content, unconstrained: true,
-                  source_line: SourceLineExtractor.extract(subtree)
+                  content: content, unconstrained: true
                 )
               end
             end
@@ -159,8 +145,7 @@ module Coradoc
               Model::Inline::Span.new(
                 text: span_constrained[:text],
                 unconstrained: false,
-                attributes: span_constrained[:attribute_list],
-                source_line: SourceLineExtractor.extract(span_constrained)
+                attributes: span_constrained[:attribute_list]
               )
             end
 
@@ -169,8 +154,7 @@ module Coradoc
               Model::Inline::Span.new(
                 text: span_unconstrained[:text],
                 unconstrained: true,
-                attributes: span_unconstrained[:attribute_list],
-                source_line: SourceLineExtractor.extract(span_unconstrained)
+                attributes: span_unconstrained[:attribute_list]
               )
             end
 
@@ -178,8 +162,7 @@ module Coradoc
             rule(superscript: subtree(:superscript)) do
               content = Transformer.extract_simple_inline_content(superscript)
               Model::Inline::Superscript.new(
-                content:,
-                source_line: SourceLineExtractor.extract(superscript)
+                content:
               )
             end
 
@@ -187,24 +170,21 @@ module Coradoc
             rule(subscript: subtree(:subscript)) do
               content = Transformer.extract_simple_inline_content(subscript)
               Model::Inline::Subscript.new(
-                content:,
-                source_line: SourceLineExtractor.extract(subscript)
+                content:
               )
             end
 
             # Highlight (simple)
             rule(highlight: simple(:text)) do
               Model::Highlight.new(
-                content: text,
-                source_line: SourceLineExtractor.extract(text)
+                content: text
               )
             end
             # Stem
             rule(stem: subtree(:stem)) do
               Coradoc::AsciiDoc::Model::Inline::Stem.new(
                 type: stem[:stem_type],
-                content: stem[:content],
-                source_line: SourceLineExtractor.extract(stem)
+                content: stem[:content]
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/list_rules.rb

@@ -74,8 +74,7 @@ module Coradoc
               end
 
               Model::List::Item.new(
-                content: content, id:, marker:, attached:, nested:, line_break:,
-                source_line: SourceLineExtractor.extract(list_item)
+                content: content, id:, marker:, attached:, nested:, line_break:
               )
             end
 
@@ -87,8 +86,7 @@ module Coradoc
             # Unordered list
             rule(unordered: sequence(:list_items)) do
               Model::List::Unordered.new(
-                items: list_items,
-                source_line: SourceLineExtractor.extract(list_items)
+                items: list_items
               )
             end
 
@@ -98,16 +96,14 @@ module Coradoc
             ) do
               Model::List::Unordered.new(
                 items: list_items,
-                attrs: attribute_list,
-                source_line: SourceLineExtractor.extract(attribute_list)
+                attrs: attribute_list
               )
             end
 
             # Ordered list
             rule(ordered: sequence(:list_items)) do
               Model::List::Ordered.new(
-                items: list_items,
-                source_line: SourceLineExtractor.extract(list_items)
+                items: list_items
               )
             end
 
@@ -117,8 +113,7 @@ module Coradoc
             ) do
               Model::List::Ordered.new(
                 items: list_items,
-                attrs: attribute_list,
-                source_line: SourceLineExtractor.extract(attribute_list)
+                attrs: attribute_list
               )
             end
 

data/lib/coradoc/asciidoc/transformer/misc_rules.rb

@@ -14,23 +14,19 @@ module Coradoc
                  }) do
               Model::CommentLine.new(
                 text: comment_text,
-                line_break: line_break,
-                source_line: SourceLineExtractor.extract(comment_text)
+                line_break: line_break
               )
             end
 
             rule(comment_block: { comment_text: simple(:comment_text) }) do
               Model::CommentBlock.new(
-                text: comment_text,
-                source_line: SourceLineExtractor.extract(comment_text)
+                text: comment_text
               )
             end
 
             # Page break
             rule(page_break: simple(:page_break)) do
-              Model::Break::PageBreak.new(
-                source_line: SourceLineExtractor.extract(page_break)
-              )
+              Model::Break::PageBreak.new
             end
 
             # Tag
@@ -39,8 +35,7 @@ module Coradoc
                 name: tag[:name],
                 attrs: tag[:attribute_list],
                 line_break: tag[:line_break],
-                prefix: tag[:prefix],
-                source_line: SourceLineExtractor.extract(tag)
+                prefix: tag[:prefix]
               )
             end
 
@@ -63,9 +58,8 @@ module Coradoc
             end
 
             rule(attribute_array: sequence(:attributes)) do
-              attr_list = Model::AttributeList.new(
-                source_line: SourceLineExtractor.extract(attributes)
-              )
+              attr_list = Model::AttributeList.new
+
               attributes.each do |a|
                 case a
                 when Parslet::Slice
@@ -119,8 +113,7 @@ module Coradoc
               Model::Include.new(
                 path: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break,
-                source_line: SourceLineExtractor.extract(path)
+                line_break: line_break
               )
             end
 
@@ -135,8 +128,7 @@ module Coradoc
               Model::Audio.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break,
-                source_line: SourceLineExtractor.extract(path)
+                line_break: line_break
               )
             end
 
@@ -151,8 +143,7 @@ module Coradoc
               Model::Video.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break,
-                source_line: SourceLineExtractor.extract(path)
+                line_break: line_break
               )
             end
 
@@ -180,8 +171,7 @@ module Coradoc
                 date: attrs[:date],
                 from: attrs[:from],
                 to: attrs[:to],
-                content: Transformer.lines_to_text_elements(lines),
-                source_line: SourceLineExtractor.extract(reviewer_note)
+                content: Transformer.lines_to_text_elements(lines)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/source_line_extractor.rb

@@ -37,7 +37,6 @@ module Coradoc
           when Coradoc::AsciiDoc::Model::Base then node.source_line
           when Hash then extract_from_hash(node)
           when Array then extract_from_array(node)
-          else nil
           end
         end
 

data/lib/coradoc/asciidoc/transformer/structural_rules.rb

@@ -72,7 +72,6 @@ module Coradoc
               opts = { rows: Transformer.regroup_table_rows(rows, attrs), attrs: attrs }
               opts[:id] = id if id
               opts[:title] = title unless title.nil? || title.empty?
-              opts[:source_line] = SourceLineExtractor.extract(table)
               Model::Table.new(**opts)
             end
 
@@ -85,8 +84,7 @@ module Coradoc
               Model::Title.new(
                 content: text,
                 level_int: level.size - 1,
-                line_break: line_break,
-                source_line: SourceLineExtractor.extract(level)
+                line_break: line_break
               )
             end
 
@@ -100,8 +98,7 @@ module Coradoc
                 content: text,
                 level_int: level.size - 1,
                 line_break: line_break,
-                id: name,
-                source_line: SourceLineExtractor.extract(name)
+                id: name
               )
             end
 
@@ -120,8 +117,7 @@ module Coradoc
                 id: id,
                 attribute_list: attribute_list,
                 contents: contents,
-                sections: sections,
-                source_line: SourceLineExtractor.extract(section)
+                sections: sections
               )
             end
 

data/lib/coradoc/asciidoc/transformer/table_layout.rb

@@ -46,9 +46,7 @@ module Coradoc
           normalized_cells = cells.map { |cell| TableCellBuilder.normalize_cell(cell) }
 
           col_count = explicit_col_count
-          if col_count.nil? || col_count.zero?
-            col_count = infer_column_count(normalized_cells)
-          end
+          col_count = infer_column_count(normalized_cells) if col_count.nil? || col_count.zero?
           col_count = normalized_cells.size if col_count.nil? || col_count.zero?
 
           rows = []

data/lib/coradoc/asciidoc/transformer/text_rules.rb

@@ -10,8 +10,7 @@ module Coradoc
             # Text Model
             rule(text: simple(:text)) do
               Model::TextElement.new(
-                content: text.to_s,
-                source_line: Transformer::SourceLineExtractor.extract(text)
+                content: text.to_s
               )
             end
 
@@ -22,31 +21,27 @@ module Coradoc
             rule(text: simple(:text), line_break: simple(:line_break)) do
               Model::TextElement.new(
                 content: text.to_s,
-                line_break: line_break,
-                source_line: Transformer::SourceLineExtractor.extract(text)
+                line_break: line_break
               )
             end
 
             rule(text: sequence(:text), line_break: simple(:line_break)) do
               Model::TextElement.new(
                 content: text,
-                line_break: line_break,
-                source_line: Transformer::SourceLineExtractor.extract(text)
+                line_break: line_break
               )
             end
 
             rule(id: simple(:id), text: simple(:text)) do
               Model::TextElement.new(
                 content: text.to_s,
-                id: id.to_s,
-                source_line: Transformer::SourceLineExtractor.extract(id)
+                id: id.to_s
               )
             end
 
             rule(text: sequence(:text)) do
               Model::TextElement.new(
-                content: text,
-                source_line: Transformer::SourceLineExtractor.extract(text)
+                content: text
               )
             end
 
@@ -58,8 +53,7 @@ module Coradoc
               Model::TextElement.new(
                 content: text.to_s,
                 id: id.to_s,
-                line_break: line_break,
-                source_line: Transformer::SourceLineExtractor.extract(id)
+                line_break: line_break
               )
             end
 
@@ -71,16 +65,14 @@ module Coradoc
               Model::TextElement.new(
                 content: text,
                 id: id.to_s,
-                line_break: line_break,
-                source_line: Transformer::SourceLineExtractor.extract(id)
+                line_break: line_break
               )
             end
 
             # Line break
             rule(line_break: simple(:line_break)) do
               Model::LineBreak.new(
-                line_break:,
-                source_line: Transformer::SourceLineExtractor.extract(line_break)
+                line_break:
               )
             end
 
@@ -95,8 +87,7 @@ module Coradoc
                 content: Transformer.lines_to_text_elements(paragraph[:lines]),
                 id: paragraph[:id],
                 attributes: paragraph[:attribute_list],
-                title: paragraph[:title],
-                source_line: Transformer::SourceLineExtractor.extract(paragraph)
+                title: paragraph[:title]
               )
             end
           end

data/lib/coradoc/asciidoc/transformer.rb

@@ -142,8 +142,7 @@ module Coradoc
 
           Model::TextElement.new(
             content: transformed,
-            line_break: line[:line_break],
-            source_line: SourceLineExtractor.extract(line)
+            line_break: line[:line_break]
           )
         end
       end
@@ -153,6 +152,31 @@ module Coradoc
       def self.legacy_transform(syntax_tree)
         new.apply(syntax_tree)
       end
+
+      # Single deepening seam for source_line propagation. Parslet's
+      # transform pipeline funnels every rule block through
+      # +call_on_match(bindings, block)+; overriding it lets us post-
+      # process the block's result and inject +source_line+ from the
+      # matched bindings, so individual rules no longer need to call
+      # SourceLineExtractor.extract themselves (DRY — was 47 call
+      # sites across 7 rule files).
+      #
+      # Safety:
+      #   * Only Model::Base results get an injection — Strings, Arrays,
+      #     and intermediate hashes pass through unchanged.
+      #   * Existing explicit source_line values are preserved — the
+      #     injection is fill-in-the-blank, never overwrite.
+      #   * No Slice in the bindings → SourceLineExtractor returns nil,
+      #     no injection (synthetic transformations stay clean).
+      def call_on_match(bindings, block)
+        result = super
+        return result unless result.is_a?(Model::Base)
+        return result if result.source_line
+
+        line = self.class::SourceLineExtractor.extract(bindings)
+        result.source_line = line if line
+        result
+      end
     end
   end
 end

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.24'
+    VERSION = '2.0.25'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Ribose Inc.