coradoc 2.0.5 → 2.0.6

data/coradoc-adoc/lib/coradoc/asciidoc/transform/to_core_model_registrations.rb

@@ -35,25 +35,30 @@ module Coradoc
           end
 
           def register_block_transformers!
-            [
-              [Coradoc::AsciiDoc::Model::Block::SourceCode, 'source'],
-              [Coradoc::AsciiDoc::Model::Block::Quote, 'quote'],
-              [Coradoc::AsciiDoc::Model::Block::Example, 'example'],
-              [Coradoc::AsciiDoc::Model::Block::Side, 'sidebar'],
-              [Coradoc::AsciiDoc::Model::Block::Literal, 'literal'],
-              [Coradoc::AsciiDoc::Model::Block::Open, 'open'],
-              [Coradoc::AsciiDoc::Model::Block::Pass, 'pass']
-            ].each do |block_class, delimiter_type|
+            Registry.register_with_priority(
+              Coradoc::AsciiDoc::Model::Block::SourceCode,
+              METHOD_DISPATCH[:transform_source_block],
+              priority: 10
+            )
+
+            {
+              Coradoc::AsciiDoc::Model::Block::Quote => Coradoc::CoreModel::QuoteBlock,
+              Coradoc::AsciiDoc::Model::Block::Example => Coradoc::CoreModel::ExampleBlock,
+              Coradoc::AsciiDoc::Model::Block::Side => Coradoc::CoreModel::SidebarBlock,
+              Coradoc::AsciiDoc::Model::Block::Literal => Coradoc::CoreModel::LiteralBlock,
+              Coradoc::AsciiDoc::Model::Block::Open => Coradoc::CoreModel::OpenBlock,
+              Coradoc::AsciiDoc::Model::Block::Pass => Coradoc::CoreModel::PassBlock
+            }.each do |block_class, core_model_class|
               Registry.register_with_priority(
                 block_class,
-                block_wrapper(delimiter_type),
+                typed_block_wrapper(core_model_class),
                 priority: 10
               )
             end
 
             Registry.register(
               Coradoc::AsciiDoc::Model::Block::Core,
-              block_wrapper(nil) # uses model.delimiter at call time
+              block_model_wrapper
             )
 
             Registry.register(
@@ -200,16 +205,35 @@ module Coradoc
             end
           end
 
+          METHOD_DISPATCH = {
+            transform_document: ->(model) { ToCoreModel.transform_document(model) },
+            transform_section: ->(model) { ToCoreModel.transform_section(model) },
+            transform_paragraph: ->(model) { ToCoreModel.transform_paragraph(model) },
+            transform_source_block: ->(model) { ToCoreModel.transform_source_block(model) },
+            transform_link: ->(model) { ToCoreModel.transform_link(model) },
+            transform_cross_reference: ->(model) { ToCoreModel.transform_cross_reference(model) },
+            transform_inline_footnote: ->(model) { ToCoreModel.transform_inline_footnote(model) },
+            transform_stem: ->(model) { ToCoreModel.transform_stem(model) },
+            transform_table: ->(model) { ToCoreModel.transform_table(model) },
+            transform_table_row: ->(model) { ToCoreModel.transform_table_row(model) },
+            transform_table_cell: ->(model) { ToCoreModel.transform_table_cell(model) },
+            transform_term: ->(model) { ToCoreModel.transform_term(model) },
+            transform_admonition: ->(model) { ToCoreModel.transform_admonition(model) },
+            transform_image: ->(model) { ToCoreModel.transform_image(model) },
+            transform_bibliography: ->(model) { ToCoreModel.transform_bibliography(model) },
+            transform_bibliography_entry: ->(model) { ToCoreModel.transform_bibliography_entry(model) }
+          }.freeze
+
           def method_wrapper(method_name)
-            ->(model) { ToCoreModel.public_send(method_name, model) }
+            METHOD_DISPATCH.fetch(method_name)
           end
 
-          def block_wrapper(delimiter_type)
-            if delimiter_type
-              ->(model) { ToCoreModel.transform_block(model, delimiter_type) }
-            else
-              ->(model) { ToCoreModel.transform_block(model, model.delimiter) }
-            end
+          def typed_block_wrapper(klass)
+            ->(model) { ToCoreModel.transform_typed_block(model, klass) }
+          end
+
+          def block_model_wrapper
+            ->(model) { ToCoreModel.transform_block(model, model.delimiter.to_s) }
           end
 
           def list_wrapper(marker_type)

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

@@ -123,7 +123,8 @@ module Coradoc
               delim_char: simple(:delim_char),
               rows: sequence(:rows)
             ) do
-              Model::Table.new(id: id.to_s, title: title.to_s, rows: Transformer.regroup_table_rows(rows, attrs), attrs: attrs)
+              Model::Table.new(id: id.to_s, title: title.to_s, rows: Transformer.regroup_table_rows(rows, attrs),
+                               attrs: attrs)
             end
 
             # Table with id and title (no attributes)

data/coradoc-adoc/lib/coradoc/asciidoc.rb

@@ -15,9 +15,14 @@ module Coradoc
   end
 end
 
-# Load version and parse_error (small files, needed immediately)
+# Autoload version and parse error
 require_relative 'asciidoc/version'
-require_relative 'asciidoc/parse_error'
+
+module Coradoc
+  module AsciiDoc
+    autoload :ParseError, "#{__dir__}/asciidoc/parse_error"
+  end
+end
 
 # Autoload main components (lazy loading)
 module Coradoc

data/coradoc-adoc/spec/coradoc/asciidoc/integration_pipeline_spec.rb

@@ -320,9 +320,7 @@ RSpec.describe 'Integration pipeline fixes' do
                  el.children
                end
 
-    if children
-      children.each { |c| xrefs.concat(find_all_xrefs(c)) }
-    end
+    children&.each { |c| xrefs.concat(find_all_xrefs(c)) }
 
     xrefs
   end

data/coradoc-adoc/spec/coradoc/asciidoc/round_trip_spec.rb

@@ -257,4 +257,3 @@ RSpec.describe 'Round-Trip Conversion' do
     end
   end
 end
-# rubocop:enable RSpec/DescribeClass

data/coradoc-adoc/spec/coradoc/asciidoc/transform/from_core_model_spec.rb

@@ -32,15 +32,16 @@ RSpec.describe Coradoc::AsciiDoc::Transform::FromCoreModel do
     end
 
     context 'with Block' do
-      it 'transforms a CoreModel Block to AsciiDoc Block' do
+      it 'transforms a CoreModel Block to AsciiDoc Example Block' do
         core_block = Coradoc::CoreModel::Block.new(
+          block_semantic_type: :example,
           delimiter_type: '====',
           content: 'Example content'
         )
 
         result = described_class.transform(core_block)
 
-        expect(result).to be_a(Coradoc::AsciiDoc::Model::Block::Core)
+        expect(result).to be_a(Coradoc::AsciiDoc::Model::Block::Example)
       end
     end
 

data/coradoc-adoc/spec/coradoc/developer_experience_spec.rb

@@ -120,4 +120,3 @@ RSpec.describe 'Developer Experience API' do
     end
   end
 end
-# rubocop:enable RSpec/DescribeClass

data/coradoc-adoc/spec/transform/from_core_model_spec.rb

@@ -41,18 +41,18 @@ RSpec.describe Coradoc::AsciiDoc::Transform::FromCoreModel do
     end
 
     context 'when transforming a block' do
-      it 'transforms a CoreModel block to AsciiDoc' do
+      it 'transforms a CoreModel example block to AsciiDoc' do
         block = Coradoc::CoreModel::Block.new(
           id: 'example-1',
+          block_semantic_type: :example,
           delimiter_type: '====',
           content: "Line 1\nLine 2"
         )
 
         result = transformer.transform(block)
 
-        expect(result).to be_a(Coradoc::AsciiDoc::Model::Block::Core)
+        expect(result).to be_a(Coradoc::AsciiDoc::Model::Block::Example)
         expect(result.id).to eq('example-1')
-        expect(result.delimiter).to eq('====')
       end
     end
 

data/coradoc-adoc/spec/transform/to_core_model_spec.rb

@@ -54,6 +54,7 @@ RSpec.describe Coradoc::AsciiDoc::Transform::ToCoreModel do
         result = transformer.transform(block)
 
         expect(result).to be_a(Coradoc::CoreModel::Block)
+        expect(result.block_semantic_type).to eq('example')
         expect(result.delimiter_type).to eq('====')
         expect(result.content).to eq("Line 1\nLine 2")
       end

data/coradoc-html/lib/coradoc/html/converters/base.rb

@@ -169,40 +169,64 @@ module Coradoc
             # Get renderable content (children if present, otherwise content)
             renderable = block.renderable_content
 
-            # Check element_type first for paragraph handling
-            case block.element_type
-            when 'paragraph'
+            semantic = resolve_block_semantic_type(block)
+
+            case semantic
+            when :paragraph
               content = convert_content_to_html(renderable, state)
               return "<p#{attrs}>#{content}</p>" if content && !content.empty?
 
               ''
-            end
-
-            # Then check delimiter_type for special blocks
-            case block.delimiter_type
-            when '----', 'source'
+            when :source_code
               lang = block.language || block.metadata&.dig(:language)
               lang_attr = lang ? " data-lang=\"#{escape_attribute(lang)}\"" : ''
               "<pre#{attrs}><code#{lang_attr}>#{escape_html(block.flat_text)}</code></pre>"
-            when '____'
+            when :quote, :verse
               "<blockquote#{attrs}>#{convert_content_to_html(renderable, state)}</blockquote>"
-            when '===='
+            when :example
               "<div class=\"example\"#{attrs}>#{convert_content_to_html(renderable, state)}</div>"
-            when '****'
+            when :sidebar
               "<aside class=\"sidebar\"#{attrs}>#{convert_content_to_html(renderable, state)}</aside>"
-            when '....'
+            when :literal
               "<pre class=\"literal\"#{attrs}>#{escape_html(block.flat_text)}</pre>"
-            when '++++'
-              block.flat_text # Pass through
-            when 'comment'
-              '' # Skip comments in output
-            when '***', '---', '___'
+            when :pass
+              block.flat_text
+            when :listing
+              "<pre#{attrs}>#{escape_html(block.flat_text)}</pre>"
+            when :open
+              "<div#{attrs}>#{convert_content_to_html(renderable, state)}</div>"
+            when :verse
+              "<blockquote#{attrs}>#{convert_content_to_html(renderable, state)}</blockquote>"
+            when :comment, :reviewer
+              ''
+            when :horizontal_rule
               "<hr#{attrs}>"
             else
               "<div#{attrs}>#{convert_content_to_html(renderable, state)}</div>"
             end
           end
 
+          # Resolve the semantic type from a block via polymorphic dispatch.
+          # Block#resolve_semantic_type handles class-level semantic_type →
+          # block_semantic_type attribute → element_type → delimiter fallback.
+          def resolve_block_semantic_type(block)
+            block.resolve_semantic_type ||
+              resolve_format_specific_semantic(block)
+          end
+
+          # Format-specific semantic mappings not covered by the core model
+          def resolve_format_specific_semantic(block)
+            delim = block.delimiter_type
+            return nil unless delim && !delim.empty?
+
+            case delim
+            when "'''", '---', '___', '***' then :horizontal_rule
+            when '[verse]' then :verse
+            when 'comment' then :comment
+            when 'paragraph' then :paragraph
+            end
+          end
+
           # Render CoreModel structural element
           def render_core_structural_element(element, state = {})
             attrs = build_html_attributes(element.id, nil)

data/coradoc-html/lib/coradoc/html/converters/example.rb

@@ -47,8 +47,7 @@ module Coradoc
           # Extract ID if present
           id = element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '====',
+          Coradoc::CoreModel::ExampleBlock.new(
             content: content,
             title: title,
             id: id

data/coradoc-html/lib/coradoc/html/converters/listing.rb

@@ -55,8 +55,7 @@ module Coradoc
           # Extract ID if present
           id = pre_elem['id'] || element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '----',
+          Coradoc::CoreModel::SourceBlock.new(
             content: content,
             title: title,
             id: id

data/coradoc-html/lib/coradoc/html/converters/literal.rb

@@ -58,8 +58,7 @@ module Coradoc
           # Extract ID if present
           id = pre_elem['id'] || element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '....',
+          Coradoc::CoreModel::LiteralBlock.new(
             content: content,
             title: title,
             id: id

data/coradoc-html/lib/coradoc/html/converters/open.rb

@@ -39,8 +39,7 @@ module Coradoc
           # Extract ID if present
           id = element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '--',
+          Coradoc::CoreModel::OpenBlock.new(
             content: content,
             id: id
           )

data/coradoc-html/lib/coradoc/html/converters/quote.rb

@@ -43,11 +43,10 @@ module Coradoc
           # Extract ID if present
           id = element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '____',
+          Coradoc::CoreModel::QuoteBlock.new(
             content: content,
             id: id,
-            metadata: attribution ? { attribution: attribution } : {}
+            attribution: attribution
           )
         end
 

data/coradoc-html/lib/coradoc/html/converters/sidebar.rb

@@ -46,8 +46,7 @@ module Coradoc
           # Extract ID if present
           id = element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '****',
+          Coradoc::CoreModel::SidebarBlock.new(
             content: content,
             title: title,
             id: id

data/coradoc-html/lib/coradoc/html/converters/source.rb

@@ -63,8 +63,7 @@ module Coradoc
           # Extract ID if present
           id = code_elem['id'] || element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '----',
+          Coradoc::CoreModel::SourceBlock.new(
             content: content,
             title: title,
             id: id,

data/coradoc-html/lib/coradoc/html/converters/source_code.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module Coradoc
   module Html
     module Converters
+      autoload :Base, "#{__dir__}/base"
       # Converter for SourceCode blocks
       #
       # SourceCode models use the `lines` attribute, while Source models use `content`.

data/coradoc-html/lib/coradoc/html/converters/term.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module Coradoc
   module Html
     module Converters
+      autoload :Base, "#{__dir__}/base"
       # Converter for CoreModel::InlineElement (term) elements
       #
       # Terms are used in definition lists and can have types like "acronym",

data/coradoc-html/lib/coradoc/html/converters/verse.rb

@@ -50,12 +50,11 @@ module Coradoc
           # Extract ID if present
           id = element['id']
 
-          Coradoc::CoreModel::Block.new(
-            delimiter_type: '[verse]',
+          Coradoc::CoreModel::VerseBlock.new(
             content: content,
             title: title,
             id: id,
-            metadata: attribution ? { attribution: attribution } : {}
+            attribution: attribution
           )
         end
 

data/coradoc-html/lib/coradoc/html/input/converters/aside.rb

@@ -10,7 +10,7 @@ module Coradoc
             # Use AnnotationBlock with annotation_type: "sidebar" for aside elements
             Coradoc::CoreModel::AnnotationBlock.new(
               annotation_type: 'sidebar',
-              delimiter_type: '****',
+              block_semantic_type: :sidebar,
               children: content
             )
           end

data/coradoc-html/lib/coradoc/html/input/converters/audio.rb

@@ -16,7 +16,7 @@ module Coradoc
             # with element_attributes to store audio-specific data
             Coradoc::CoreModel::Block.new(
               element_type: 'audio',
-              delimiter_type: 'audio',
+              block_semantic_type: :audio,
               content: src,
               title: title,
               id: id,

data/coradoc-html/lib/coradoc/html/input/converters/blockquote.rb

@@ -10,11 +10,10 @@ module Coradoc
             cite = node['cite']
             content = treat_children_coradoc(node, state)
 
-            Coradoc::CoreModel::Block.new(
-              delimiter_type: '____',
+            Coradoc::CoreModel::QuoteBlock.new(
               content: content,
               id: id,
-              metadata: cite ? { attribution: cite } : {}
+              attribution: cite
             )
           end
         end

data/coradoc-html/lib/coradoc/html/input/converters/div.rb

@@ -9,8 +9,7 @@ module Coradoc
             id = node['id']
             contents = treat_children_coradoc(node, state)
 
-            Coradoc::CoreModel::Block.new(
-              delimiter_type: '--',
+            Coradoc::CoreModel::OpenBlock.new(
               content: contents,
               id: id
             )

data/coradoc-html/lib/coradoc/html/input/converters/figure.rb

@@ -10,9 +10,8 @@ module Coradoc
             title_content = extract_title(node)
             content = treat_children_coradoc(node, state)
 
-            # Use CoreModel::Block with delimiter_type "====" for example/figure
-            Coradoc::CoreModel::Block.new(
-              delimiter_type: '====',
+            # Use CoreModel::ExampleBlock for example/figure
+            Coradoc::CoreModel::ExampleBlock.new(
               title: extract_text_from_content(title_content),
               children: content,
               id: id

data/coradoc-html/lib/coradoc/html/input/converters/hr.rb

@@ -8,7 +8,7 @@ module Coradoc
           def to_coradoc(_node, _state = {})
             Coradoc::CoreModel::Block.new(
               element_type: 'thematic_break',
-              delimiter_type: "'''"
+              block_semantic_type: :horizontal_rule
             )
           end
         end

data/coradoc-html/lib/coradoc/html/input/converters/p.rb

@@ -13,7 +13,8 @@ module Coradoc
             content = strip_fullwidth_spaces(content)
 
             Coradoc::CoreModel::Block.new(
-              delimiter_type: 'paragraph',
+              block_semantic_type: :paragraph,
+              element_type: 'paragraph',
               children: content,
               id: id
             )

data/coradoc-html/lib/coradoc/html/input/converters/pre.rb

@@ -10,16 +10,20 @@ module Coradoc
             lang = language(node)
             content = extract_text_content(node)
 
-            delimiter_type = lang ? '----' : '....'
-            element_type = lang ? 'source' : 'literal'
-
-            Coradoc::CoreModel::Block.new(
-              element_type: element_type,
-              delimiter_type: delimiter_type,
-              content: content,
-              id: id,
-              language: lang
-            )
+            if lang
+              Coradoc::CoreModel::SourceBlock.new(
+                element_type: 'source',
+                content: content,
+                id: id,
+                language: lang
+              )
+            else
+              Coradoc::CoreModel::LiteralBlock.new(
+                element_type: 'literal',
+                content: content,
+                id: id
+              )
+            end
           end
 
           private

data/coradoc-html/lib/coradoc/html/input/converters/video.rb

@@ -16,7 +16,7 @@ module Coradoc
             # with element_attributes to store video-specific data
             Coradoc::CoreModel::Block.new(
               element_type: 'video',
-              delimiter_type: 'video',
+              block_semantic_type: :video,
               content: src,
               title: title,
               id: id,

data/coradoc-html/lib/coradoc/html/renderer.rb

@@ -42,13 +42,23 @@ module Coradoc
         'Coradoc::CoreModel::BibliographyEntry' => 'bibliography_entry',
         'Coradoc::CoreModel::StructuralElement' => 'structural_element',
         'Coradoc::CoreModel::Block' => 'block',
+        'Coradoc::CoreModel::SourceBlock' => 'source_block',
+        'Coradoc::CoreModel::ExampleBlock' => 'example_block',
+        'Coradoc::CoreModel::QuoteBlock' => 'quote_block',
+        'Coradoc::CoreModel::SidebarBlock' => 'sidebar_block',
+        'Coradoc::CoreModel::LiteralBlock' => 'literal_block',
+        'Coradoc::CoreModel::PassBlock' => 'pass_block',
+        'Coradoc::CoreModel::ListingBlock' => 'listing_block',
+        'Coradoc::CoreModel::OpenBlock' => 'open_block',
+        'Coradoc::CoreModel::VerseBlock' => 'verse_block',
+        'Coradoc::CoreModel::ReviewerBlock' => 'reviewer_block',
+        'Coradoc::CoreModel::AnnotationBlock' => 'annotation_block',
         'Coradoc::CoreModel::ListBlock' => 'list_block',
         'Coradoc::CoreModel::ListItem' => 'list_item',
         'Coradoc::CoreModel::Table' => 'table',
         'Coradoc::CoreModel::TableRow' => 'table_row',
         'Coradoc::CoreModel::TableCell' => 'table_cell',
         'Coradoc::CoreModel::Image' => 'image',
-        'Coradoc::CoreModel::AnnotationBlock' => 'annotation_block',
         'Coradoc::CoreModel::InlineElement' => 'inline_element',
         'Coradoc::CoreModel::Paragraph' => 'paragraph',
         'Coradoc::CoreModel::Term' => 'term',
@@ -125,6 +135,37 @@ module Coradoc
         end
       end
 
+      # Render a CoreModel element as a complete HTML5 document
+      #
+      # Wraps the fragment output of #render in a proper HTML5 document
+      # with DOCTYPE, charset, and viewport meta tags.
+      #
+      # @param element [Coradoc::CoreModel::Base] The element to render
+      # @param options [Hash] Document-level options
+      # @option options [String] :lang Document language (default: "en")
+      # @option options [String] :title Document title (default: extracted from element)
+      # @return [String] Complete HTML5 document
+      def render_html5(element, options = {})
+        body_html = render(element)
+
+        lang = options[:lang] || 'en'
+        title = options[:title] || extract_title(element) || 'Untitled Document'
+
+        <<~HTML
+          <!DOCTYPE html>
+          <html lang="#{lang}">
+          <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>#{escape_html(title)}</title>
+          </head>
+          <body>
+          #{body_html}
+          </body>
+          </html>
+        HTML
+      end
+
       # Get list of all available template names
       #
       # @return [Array<String>] List of template names (without .liquid extension)
@@ -318,7 +359,7 @@ module Coradoc
         assigns = {}
 
         # Common attributes that most CoreModel types have
-        %w[id title content children element_type language lines
+        %w[id title content children element_type block_semantic_type language lines
            delimiter_type delimiter_length metadata_entries element_attributes
            text href alt src level entries items rows cells
            anchor term definition abbreviations].each do |key|
@@ -353,6 +394,13 @@ module Coradoc
             .gsub(/"/, '&quot;')
             .gsub(/'/, '&#39;')
       end
+
+      def extract_title(element)
+        return nil unless element
+        return element.title if element.is_a?(Coradoc::CoreModel::StructuralElement) && element.title
+
+        nil
+      end
     end
 
     # Backwards compatibility alias

data/coradoc-html/lib/coradoc/html/spa.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'converter_base'
-
 module Coradoc
   module Html
+    autoload :ConverterBase, "#{__dir__}/converter_base"
+
     # SPA (Single Page Application) HTML converter
     #
     # Converts Coradoc::CoreModel::StructuralElement to a modern Vue.js + Tailwind CSS

data/coradoc-html/lib/coradoc/html/static.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'converter_base'
-
 module Coradoc
   module Html
+    autoload :ConverterBase, "#{__dir__}/converter_base"
+
     # Static HTML converter
     #
     # Converts CoreModel documents to static HTML5 output.

data/coradoc-html/lib/coradoc/html/templates/core_model/definition_list.liquid

@@ -0,0 +1,11 @@
+{%- comment -%}
+Definition list template
+{%- endcomment -%}
+<dl id="{{ id }}" class="definition-list">
+  {%- for item in items -%}
+    <dt>{{ item.term }}</dt>
+    {%- for def in item.definitions -%}
+    <dd>{{ def }}</dd>
+    {%- endfor -%}
+  {%- endfor -%}
+</dl>