coradoc 2.0.4 → 2.0.6

data/exe/coradoc

@@ -21,6 +21,7 @@ require 'coradoc'
 require 'coradoc/cli'
 
 # Load available format gems
+require 'coradoc/asciidoc'
 require 'coradoc/html'
 require 'coradoc/markdown'
 

data/lib/coradoc/coradoc.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'lutaml/model'
-require_relative 'errors'
 
 # Coradoc - A hub-and-spoke document transformation library
 #
@@ -442,6 +441,7 @@ module Coradoc
     end
   end
 
+  autoload :Error, "#{__dir__}/errors"
   autoload :Version, "#{__dir__}/version"
   autoload :Logger, "#{__dir__}/logger"
   autoload :Hooks, "#{__dir__}/hooks"
@@ -449,14 +449,13 @@ module Coradoc
   autoload :Validation, "#{__dir__}/validation"
   autoload :Configurable, "#{__dir__}/configurable"
   autoload :FormatModule, "#{__dir__}/format_module"
+  autoload :CoreModel, "#{__dir__}/core_model"
+  autoload :Registry, "#{__dir__}/registry"
+  autoload :Transform, "#{__dir__}/transform"
+  autoload :Input, "#{__dir__}/input"
+  autoload :Output, "#{__dir__}/output"
 end
 
-require_relative 'core_model'
-require_relative 'registry'
-require_relative 'transform'
-require_relative 'input'
-require_relative 'output'
-
 # Format gems self-register via Coradoc.register_format when they are required.
 # No hardcoded registration needed here — each gem's entry file handles its own
 # registration (e.g., coradoc-adoc/lib/coradoc/asciidoc.rb calls

data/lib/coradoc/core_model/annotation_block.rb

@@ -19,7 +19,6 @@ module Coradoc
     # @example Creating a NOTE annotation
     #   note = CoreModel::AnnotationBlock.new(
     #     annotation_type: "note",
-    #     delimiter_type: "****",
     #     content: "This is important information."
     #   )
     #
@@ -27,7 +26,6 @@ module Coradoc
     #   reviewer = CoreModel::AnnotationBlock.new(
     #     annotation_type: "reviewer",
     #     annotation_label: "john.doe",
-    #     delimiter_type: "////",
     #     content: "Please review this section."
     #   )
     class AnnotationBlock < Block

data/lib/coradoc/core_model/block.rb

@@ -2,39 +2,53 @@
 
 module Coradoc
   module CoreModel
-    # Generic delimited block model
+    # Semantic block type constants
     #
-    # Represents all standard AsciiDoc delimited blocks including:
-    # - Example blocks (====)
-    # - Literal blocks (````)
-    # - Listing blocks (----)
-    # - Open blocks (--)
-    # - Pass blocks (++++/++++)
-    # - Quote blocks (____)
-    # - Sidebar blocks (****)
-    # - Source blocks (----)
-    # - Paragraphs (element_type: 'paragraph')
-    #
-    # This is a schema-agnostic representation that captures the semantic
-    # structure without schema-specific interpretation.
+    # Format gems own the mapping between their syntax and these
+    # canonical semantic types. The core model never stores raw
+    # delimiter strings.
+    module BlockSemanticType
+      SOURCE_CODE = :source_code
+      LISTING = :listing
+      EXAMPLE = :example
+      QUOTE = :quote
+      SIDEBAR = :sidebar
+      LITERAL = :literal
+      OPEN = :open
+      PASS = :pass
+      VERSE = :verse
+      HORIZONTAL_RULE = :horizontal_rule
+      COMMENT = :comment
+      PARAGRAPH = :paragraph
+      VIDEO = :video
+      AUDIO = :audio
+      ANNOTATION = :annotation
+      REVIEWER = :reviewer
+
+      def self.all
+          [SOURCE_CODE, LISTING, EXAMPLE, QUOTE, SIDEBAR, LITERAL, OPEN, PASS,
+           VERSE, HORIZONTAL_RULE, COMMENT, PARAGRAPH, VIDEO, AUDIO,
+           ANNOTATION, REVIEWER].freeze
+        end
+    end
+
+    # Generic block model
     #
-    # @example Creating a generic block
-    #   block = CoreModel::Block.new(
-    #     delimiter_type: "====",
-    #     delimiter_length: 4,
-    #     content: "Example content here"
-    #   )
+    # Represents all block-level elements in a format-neutral way.
+    # Each block has a `block_semantic_type` symbol (e.g., :source_code,
+    # :quote, :example) that captures its semantic meaning without
+    # tying it to any specific format's syntax.
     #
-    # @example Creating a source block
+    # @example Creating a source code block
     #   block = CoreModel::Block.new(
-    #     delimiter_type: "----",
+    #     block_semantic_type: :source_code,
     #     content: "puts 'Hello, World!'",
-    #     attributes: [{ role: "source", language: "ruby" }]
+    #     language: "ruby"
     #   )
     #
     # @example Creating a paragraph with inline formatting
     #   block = CoreModel::Block.new(
-    #     element_type: "paragraph",
+    #     block_semantic_type: :paragraph,
     #     children: [
     #       "Text with ",
     #       CoreModel::InlineElement.new(format_type: "bold", content: "bold"),
@@ -44,14 +58,38 @@ module Coradoc
     class Block < Base
       include ChildrenContent
 
-      # @!attribute element_type
+      class << self
+        # Class-level semantic type — overridden by each typed subclass.
+        # Returns nil for the generic Block base class.
+        def semantic_type
+          nil
+        end
+      end
+
+      # Resolve the semantic type from this block instance.
+      # Checks class-level semantic_type first (typed subclasses),
+      # then the block_semantic_type attribute, then element_type,
+      # then delimiter_type fallback.
+      def resolve_semantic_type
+        self.class.semantic_type ||
+          (block_semantic_type&.to_sym) ||
+          resolve_semantic_from_element_type ||
+          resolve_semantic_from_delimiter
+      end
+
+      # @!attribute block_semantic_type
       #   @return [String, nil] the semantic type of the block
+      #     (e.g., 'source_code', 'quote', 'example', 'paragraph')
+      attribute :block_semantic_type, :string
+
+      # @!attribute element_type
+      #   @return [String, nil] the structural role of the block
       #     (e.g., 'paragraph', 'block')
       attribute :element_type, :string
 
       # @!attribute delimiter_type
-      #   @return [String, nil] the delimiter character(s) used
-      #     (e.g., '****', '====', '----')
+      #   @return [String, nil] DEPRECATED — use block_semantic_type.
+      #     Retained for backward compatibility during migration.
       attribute :delimiter_type, :string
 
       # @!attribute delimiter_length
@@ -76,15 +114,37 @@ module Coradoc
 
       private
 
+      def resolve_semantic_from_element_type
+        case element_type
+        when 'paragraph' then :paragraph
+        when 'comment' then :comment
+        else nil
+        end
+      end
+
+      def resolve_semantic_from_delimiter
+        delim = delimiter_type
+        return nil unless delim && delim.length >= 4
+
+        char = delim[0]
+        DELIMITER_CHAR_TO_SEMANTIC[char] || nil
+      end
+
+      # Map delimiter first character to semantic type (backward compat)
+      DELIMITER_CHAR_TO_SEMANTIC = {
+        '-' => :source_code,
+        '=' => :example,
+        '_' => :quote,
+        '*' => :sidebar,
+        '.' => :literal,
+        '+' => :pass
+      }.freeze
+
       # Attributes to compare for semantic equivalence
       #
-      # Blocks are semantically equivalent if they have the same
-      # delimiter type and content, regardless of delimiter length
-      # or line structure.
-      #
       # @return [Array<Symbol>] list of comparable attributes
       def comparable_attributes
-        super + %i[delimiter_type content]
+        super + %i[block_semantic_type content]
       end
     end
   end

data/lib/coradoc/core_model/builder/block_builder.rb

@@ -16,7 +16,7 @@ module Coradoc
           AnnotationBlock.new(
             annotation_type: annotation_type,
             annotation_label: extract_annotation_label(ast),
-            delimiter_type: ast[:delimiter]&.to_s,
+            block_semantic_type: :annotation,
             delimiter_length: ast[:delimiter]&.to_s&.length || 4,
             content: extract_block_content(ast),
             lines: extract_block_lines(ast),
@@ -28,8 +28,10 @@ module Coradoc
 
         # Build generic block
         def build_generic_block(ast)
+          semantic_type = delimiter_to_semantic_type(ast[:delimiter]&.to_s)
+
           Block.new(
-            delimiter_type: ast[:delimiter]&.to_s,
+            block_semantic_type: semantic_type,
             delimiter_length: ast[:delimiter]&.to_s&.length || 4,
             content: extract_block_content(ast),
             lines: extract_block_lines(ast),
@@ -39,6 +41,22 @@ module Coradoc
           )
         end
 
+        # Map delimiter character to semantic type
+        def delimiter_to_semantic_type(delimiter)
+          return nil unless delimiter && !delimiter.empty?
+
+          char = delimiter[0]
+          case char
+          when '-' then :source_code
+          when '=' then :example
+          when '_' then :quote
+          when '*' then :sidebar
+          when '.' then :literal
+          when '+' then :pass
+          else nil
+          end
+        end
+
         # Extract block content from various AST formats
         def extract_block_content(ast)
           return ast[:content] if ast[:content]

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

@@ -38,9 +38,6 @@ module Coradoc
         def detect_block_type(ast)
           return :annotation if extract_annotation_type(ast)
 
-          delimiter = ast[:delimiter]&.to_s
-          return :annotation if delimiter && annotation_delimiters.include?(delimiter[0])
-
           return :list if ast[:marker] && list_markers.include?(ast[:marker].to_s)
 
           :generic
@@ -172,11 +169,6 @@ module Coradoc
           %w[note warning caution important tip reviewer sidebar]
         end
 
-        # List of annotation delimiters (first character)
-        def annotation_delimiters
-          %w[* / =]
-        end
-
         # List of list markers
         def list_markers
           %w[* - . :: numbered]

data/lib/coradoc/core_model/builder.rb

@@ -2,13 +2,6 @@
 
 require 'logger'
 
-# Load builder modules
-require_relative 'builder/detection'
-require_relative 'builder/list_builder'
-require_relative 'builder/block_builder'
-require_relative 'builder/text_builder'
-require_relative 'builder/element_builder'
-
 module Coradoc
   module CoreModel
     # Builds CoreModel objects from generic AST
@@ -45,6 +38,12 @@ module Coradoc
     #   }
     #   block = CoreModel::Builder.new.build_block(block_ast)
     class Builder
+      autoload :Detection, "#{__dir__}/builder/detection"
+      autoload :ListBuilder, "#{__dir__}/builder/list_builder"
+      autoload :BlockBuilder, "#{__dir__}/builder/block_builder"
+      autoload :TextBuilder, "#{__dir__}/builder/text_builder"
+      autoload :ElementBuilder, "#{__dir__}/builder/element_builder"
+
       include Detection
       include ListBuilder
       include BlockBuilder

data/lib/coradoc/core_model/example_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Example block — a delimited block for examples
+    class ExampleBlock < Block
+      def self.semantic_type = :example
+
+      attribute :block_semantic_type, :string, default: -> { 'example' }
+    end
+  end
+end

data/lib/coradoc/core_model/listing_block.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Listing block — a delimited block for listing/content without source language
+    #
+    # Distinct from SourceBlock: a listing has no language annotation.
+    # When a language is present, SourceBlock should be used instead.
+    class ListingBlock < Block
+      def self.semantic_type = :listing
+
+      attribute :block_semantic_type, :string, default: -> { 'listing' }
+    end
+  end
+end

data/lib/coradoc/core_model/literal_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Literal block — a delimited block for preformatted literal text
+    class LiteralBlock < Block
+      def self.semantic_type = :literal
+
+      attribute :block_semantic_type, :string, default: -> { 'literal' }
+    end
+  end
+end

data/lib/coradoc/core_model/open_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Open block — a generic container block with no special rendering
+    class OpenBlock < Block
+      def self.semantic_type = :open
+
+      attribute :block_semantic_type, :string, default: -> { 'open' }
+    end
+  end
+end

data/lib/coradoc/core_model/pass_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Pass-through block — raw content passed through without processing
+    class PassBlock < Block
+      def self.semantic_type = :pass
+
+      attribute :block_semantic_type, :string, default: -> { 'pass' }
+    end
+  end
+end

data/lib/coradoc/core_model/quote_block.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Quote block — a delimited block for quotations
+    class QuoteBlock < Block
+      def self.semantic_type = :quote
+
+      attribute :block_semantic_type, :string, default: -> { 'quote' }
+
+      attribute :attribution, :string
+    end
+  end
+end

data/lib/coradoc/core_model/reviewer_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Reviewer comment block — a block for reviewer annotations
+    class ReviewerBlock < AnnotationBlock
+      def self.semantic_type = :reviewer
+
+      attribute :block_semantic_type, :string, default: -> { 'reviewer' }
+    end
+  end
+end

data/lib/coradoc/core_model/sidebar_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Sidebar block — a delimited block for sidebars
+    class SidebarBlock < Block
+      def self.semantic_type = :sidebar
+
+      attribute :block_semantic_type, :string, default: -> { 'sidebar' }
+    end
+  end
+end

data/lib/coradoc/core_model/source_block.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Specialized block for source code listings
+    #
+    # Represents a source code block with optional language annotation.
+    # This is a first-class model type rather than a generic Block with
+    # a delimiter_type tag.
+    #
+    # @example Creating a source code block
+    #   block = CoreModel::SourceBlock.new(
+    #     content: "puts 'Hello, World!'",
+    #     language: "ruby"
+    #   )
+    class SourceBlock < Block
+      def self.semantic_type = :source_code
+
+      attribute :block_semantic_type, :string, default: -> { 'source_code' }
+    end
+  end
+end

data/lib/coradoc/core_model/structural_element.rb

@@ -54,6 +54,10 @@ module Coradoc
       #   @return [Array<Base>, nil] child elements (sections, blocks, etc.)
       attribute :children, Base, collection: true
 
+      # @!attribute attributes
+      #   @return [Hash] document-level attributes (key-value pairs)
+      attribute :attributes, :hash, default: -> { {} }
+
       # Heading level with sensible default
       #
       # @return [Integer] level, defaulting to 1 when unset

data/lib/coradoc/core_model/verse_block.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Verse block — a block for verse/poetry with optional attribution
+    class VerseBlock < Block
+      def self.semantic_type = :verse
+
+      attribute :block_semantic_type, :string, default: -> { 'verse' }
+
+      attribute :attribution, :string
+    end
+  end
+end

data/lib/coradoc/core_model.rb

@@ -42,5 +42,15 @@ module Coradoc
     autoload :TocGenerator, "#{__dir__}/core_model/toc_generator"
     autoload :Bibliography, "#{__dir__}/core_model/bibliography"
     autoload :BibliographyEntry, "#{__dir__}/core_model/bibliography_entry"
+    autoload :SourceBlock, "#{__dir__}/core_model/source_block"
+    autoload :ExampleBlock, "#{__dir__}/core_model/example_block"
+    autoload :QuoteBlock, "#{__dir__}/core_model/quote_block"
+    autoload :SidebarBlock, "#{__dir__}/core_model/sidebar_block"
+    autoload :LiteralBlock, "#{__dir__}/core_model/literal_block"
+    autoload :PassBlock, "#{__dir__}/core_model/pass_block"
+    autoload :ListingBlock, "#{__dir__}/core_model/listing_block"
+    autoload :OpenBlock, "#{__dir__}/core_model/open_block"
+    autoload :VerseBlock, "#{__dir__}/core_model/verse_block"
+    autoload :ReviewerBlock, "#{__dir__}/core_model/reviewer_block"
   end
 end

data/lib/coradoc/document_manipulator.rb

@@ -132,7 +132,9 @@ module Coradoc
                                   .compact
       end
 
-      return nil if element.is_a?(CoreModel::StructuralElement) && element.section? && !element.document? && !section_matches?(element, level: level, title: title)
+      return nil if element.is_a?(CoreModel::StructuralElement) && element.section? && !element.document? && !section_matches?(
+        element, level: level, title: title
+      )
 
       element
     end

data/lib/coradoc/processor_registry.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'registry'
-
 module Coradoc
   # Module adapter that gives a module Registry-backed processor methods.
   #

data/lib/coradoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coradoc
-  VERSION = '2.0.4'
+  VERSION = '2.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Ribose Inc.
@@ -288,6 +288,7 @@ files:
 - coradoc-adoc/lib/coradoc/util.rb
 - coradoc-adoc/lib/coradoc/util/asciidoc.rb
 - coradoc-adoc/spec/asciidoc/asciidoc_spec.rb
+- coradoc-adoc/spec/coradoc/asciidoc/integration_pipeline_spec.rb
 - coradoc-adoc/spec/coradoc/asciidoc/list_continuation_spec.rb
 - coradoc-adoc/spec/coradoc/asciidoc/model/admonition_spec.rb
 - coradoc-adoc/spec/coradoc/asciidoc/model/attribute_list_spec.rb
@@ -520,6 +521,7 @@ files:
 - coradoc-html/lib/coradoc/html/templates/core_model/bibliography.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/bibliography_entry.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/block.liquid
+- coradoc-html/lib/coradoc/html/templates/core_model/definition_list.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/image.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/inline_element.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/list_block.liquid
@@ -571,39 +573,6 @@ files:
 - coradoc-markdown/LICENSE.txt
 - coradoc-markdown/Rakefile
 - coradoc-markdown/coradoc-markdown.gemspec
-- coradoc-markdown/coverage/.last_run.json
-- coradoc-markdown/coverage/.resultset.json
-- coradoc-markdown/coverage/.resultset.json.lock
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc_disabled.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_both.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc_disabled.png
-- coradoc-markdown/coverage/assets/0.13.2/application.css
-- coradoc-markdown/coverage/assets/0.13.2/application.js
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/border.png
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/controls.png
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/loading.gif
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/loading_background.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_green.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_red.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_yellow.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_flat_75_ffffff_40x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_65_ffffff_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_75_dadada_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_95_fef1ec_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_222222_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_2e83ff_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_454545_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_888888_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_cd0a0a_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/loading.gif
-- coradoc-markdown/coverage/assets/0.13.2/magnify.png
-- coradoc-markdown/coverage/index.html
 - coradoc-markdown/lib/coradoc/markdown.rb
 - coradoc-markdown/lib/coradoc/markdown/errors.rb
 - coradoc-markdown/lib/coradoc/markdown/model/abbreviation.rb
@@ -1249,17 +1218,27 @@ files:
 - lib/coradoc/core_model/definition_item.rb
 - lib/coradoc/core_model/definition_list.rb
 - lib/coradoc/core_model/element_attribute.rb
+- lib/coradoc/core_model/example_block.rb
 - lib/coradoc/core_model/footnote.rb
 - lib/coradoc/core_model/image.rb
 - lib/coradoc/core_model/inline_element.rb
 - lib/coradoc/core_model/list_block.rb
 - lib/coradoc/core_model/list_item.rb
+- lib/coradoc/core_model/listing_block.rb
+- lib/coradoc/core_model/literal_block.rb
 - lib/coradoc/core_model/metadata.rb
+- lib/coradoc/core_model/open_block.rb
+- lib/coradoc/core_model/pass_block.rb
+- lib/coradoc/core_model/quote_block.rb
+- lib/coradoc/core_model/reviewer_block.rb
+- lib/coradoc/core_model/sidebar_block.rb
+- lib/coradoc/core_model/source_block.rb
 - lib/coradoc/core_model/structural_element.rb
 - lib/coradoc/core_model/table.rb
 - lib/coradoc/core_model/term.rb
 - lib/coradoc/core_model/toc.rb
 - lib/coradoc/core_model/toc_generator.rb
+- lib/coradoc/core_model/verse_block.rb
 - lib/coradoc/document_builder.rb
 - lib/coradoc/document_manipulator.rb
 - lib/coradoc/errors.rb

data/coradoc-markdown/coverage/.last_run.json

@@ -1,5 +0,0 @@
-{
-  "result": {
-    "line": 83.06
-  }
-}