coradoc-html 1.1.7 → 1.1.14

data/lib/coradoc/html.rb

@@ -1,5 +1,17 @@
 # frozen_string_literal: true
 
+module Coradoc
+  module Html
+    HTML_EXTENSIONS = %w[.html .htm].freeze
+
+    module FormatDetection
+      def html_extension?(filename)
+        HTML_EXTENSIONS.any? { |ext| filename.downcase.end_with?(ext) }
+      end
+    end
+  end
+end
+
 # Load HTML input module to register with Coradoc::Input
 require 'coradoc/html/input'
 # Load HTML output module to register with Coradoc::Output
@@ -7,75 +19,31 @@ require 'coradoc/html/output'
 
 module Coradoc
   module Html
-    module Converters
-      # Autoload HTML converters - they will be loaded when accessed
-      autoload :Base, 'coradoc/html/converters/base'
-      autoload :Admonition, 'coradoc/html/converters/admonition'
-      autoload :AttributeReference, 'coradoc/html/converters/attribute_reference'
-      autoload :Attribute, 'coradoc/html/converters/attribute'
-      autoload :Audio, 'coradoc/html/converters/audio'
-      autoload :BibliographyEntry, 'coradoc/html/converters/bibliography_entry'
-      autoload :Bibliography, 'coradoc/html/converters/bibliography'
-      autoload :BlockImage, 'coradoc/html/converters/block_image'
-      autoload :Bold, 'coradoc/html/converters/bold'
-      autoload :Break, 'coradoc/html/converters/break'
-      autoload :CommentBlock, 'coradoc/html/converters/comment_block'
-      autoload :CommentLine, 'coradoc/html/converters/comment_line'
-      autoload :CrossReference, 'coradoc/html/converters/cross_reference'
-      autoload :Document, 'coradoc/html/converters/document'
-      autoload :Example, 'coradoc/html/converters/example'
-      autoload :Highlight, 'coradoc/html/converters/highlight'
-      autoload :Include, 'coradoc/html/converters/include'
-      autoload :InlineImage, 'coradoc/html/converters/inline_image'
-      autoload :Italic, 'coradoc/html/converters/italic'
-      autoload :LineBreak, 'coradoc/html/converters/line_break'
-      autoload :Link, 'coradoc/html/converters/link'
-      autoload :ListItem, 'coradoc/html/converters/list_item'
-      autoload :Listing, 'coradoc/html/converters/listing'
-      autoload :Literal, 'coradoc/html/converters/literal'
-      autoload :Monospace, 'coradoc/html/converters/monospace'
-      autoload :Ordered, 'coradoc/html/converters/ordered'
-      autoload :Open, 'coradoc/html/converters/open'
-      autoload :Paragraph, 'coradoc/html/converters/paragraph'
-      autoload :Quote, 'coradoc/html/converters/quote'
-      autoload :ReviewerComment, 'coradoc/html/converters/reviewer_comment'
-      autoload :ReviewerNote, 'coradoc/html/converters/reviewer_note'
-      autoload :Section, 'coradoc/html/converters/section'
-      autoload :Sidebar, 'coradoc/html/converters/sidebar'
-      autoload :Source, 'coradoc/html/converters/source'
-      autoload :SourceCode, 'coradoc/html/converters/source_code'
-      autoload :Span, 'coradoc/html/converters/span'
-      autoload :Strikethrough, 'coradoc/html/converters/strikethrough'
-      autoload :Subscript, 'coradoc/html/converters/subscript'
-      autoload :Superscript, 'coradoc/html/converters/superscript'
-      autoload :TableCell, 'coradoc/html/converters/table_cell'
-      autoload :TableRow, 'coradoc/html/converters/table_row'
-      autoload :Table, 'coradoc/html/converters/table'
-      autoload :Term, 'coradoc/html/converters/term'
-      autoload :TextElement, 'coradoc/html/converters/text_element'
-      autoload :Underline, 'coradoc/html/converters/underline'
-      autoload :Unordered, 'coradoc/html/converters/unordered'
-      autoload :Verse, 'coradoc/html/converters/verse'
-      autoload :Video, 'coradoc/html/converters/video'
-    end
-
     # Autoload HTML components
     autoload :Config, 'coradoc/html/config'
-    autoload :Base, 'coradoc/html/base'
-    autoload :Entity, 'coradoc/html/entity'
-    autoload :ElementMapping, 'coradoc/html/element_mapping'
+    autoload :Escape, 'coradoc/html/escape'
+    autoload :SectionNumberable, 'coradoc/html/section_numberable'
+    autoload :TemplateCaching, 'coradoc/html/template_caching'
+    autoload :TitleText, 'coradoc/html/title_text'
+
+    # Drop layer — self-registering drops loaded via parent namespace file
+    require 'coradoc/html/drop'
 
     # Autoload HTML output converters
     autoload :ConverterBase, 'coradoc/html/converter_base'
     autoload :Static, 'coradoc/html/static'
     autoload :Spa, 'coradoc/html/spa'
+    autoload :TocBuilder, 'coradoc/html/toc_builder'
 
     # Theme system
     autoload :Theme, 'coradoc/html/theme'
     autoload :TemplateLocator, 'coradoc/html/template_locator'
     autoload :TemplateConfig, 'coradoc/html/template_config'
-    autoload :TemplateHelpers, 'coradoc/html/template_helpers'
+    # Side-effect: registers Liquid filters on load
+    require 'coradoc/html/template_helpers'
     autoload :Renderer, 'coradoc/html/renderer'
+    autoload :LayoutRenderer, 'coradoc/html/layout_renderer'
+    autoload :TocSerializer, 'coradoc/html/toc_serializer'
 
     # CoreModel transformers
     module Transform
@@ -103,19 +71,18 @@ module Coradoc
 
     # Parse HTML content and return CoreModel elements (may be an Array)
     def self.parse(html, options = {})
-      # Input::Html is autoloaded via Coradoc::Input
-      ::Coradoc::Html::Input.to_coradoc(html, options)
+      ::Coradoc::Input::Html.to_coradoc(html, options)
     end
 
     # Parse HTML content directly into a CoreModel document
     #
     # Unlike #parse which returns an Array of CoreModel elements,
-    # this wraps the result into a top-level StructuralElement document
+    # this wraps the result into a top-level DocumentElement document
     # suitable for use with Coradoc.serialize and other CoreModel pipelines.
     #
     # @param html [String] HTML content
     # @param options [Hash] Parse options
-    # @return [Coradoc::CoreModel::StructuralElement] CoreModel document
+    # @return [Coradoc::CoreModel::DocumentElement] CoreModel document
     def self.parse_to_core(html, options = {})
       elements = parse(html, options)
 
@@ -133,39 +100,31 @@ module Coradoc
         end
       end
 
-      Coradoc::CoreModel::StructuralElement.new(
-        element_type: 'document',
+      Coradoc::CoreModel::DocumentElement.new(
         title: title,
         children: Array(children)
       )
     end
 
     # Parse HTML file
-    def self.from_file(filename, **options)
+    def self.from_file(filename, **)
       content = File.read(filename)
-      parse(content, **options)
+      parse(content, **)
     end
 
     # Serialize CoreModel document to HTML
     #
-    # Uses the theme system to render HTML. Default theme is :classic.
+    # Uses the unified Liquid template renderer.
     #
     # @param document [Coradoc::CoreModel::Base] CoreModel document to serialize
     # @param options [Hash] Output options
     # @return [String] HTML output
     def self.serialize(document, options = {})
-      # Validate input is CoreModel
       validate_core_model!(document)
 
-      # Trigger theme autoloads to ensure renderers are registered
-      Theme::ClassicRenderer if options[:theme].nil? || options[:theme] == :classic
-      Theme::ModernRenderer if options[:theme] == :modern
-
-      # Use theme registry to find and use the appropriate renderer
-      theme = options[:theme] || :classic
-      renderer_class = Theme::Registry.find(theme)
-      renderer = renderer_class.new(document, options)
-      renderer.render_html5
+      layout = options.delete(:layout) || :static
+      renderer = Renderer.new(template_dirs: options.delete(:template_dirs))
+      renderer.render_html5(document, layout: layout, **options)
     end
 
     # Serialize CoreModel document to static HTML
@@ -176,9 +135,6 @@ module Coradoc
     # @param config [Hash, Static::Configuration] Static converter configuration
     # @return [String] HTML output
     def self.serialize_static(document, config = {})
-      # Validate input is CoreModel
-      validate_core_model!(document)
-
       Static.convert(document, config)
     end
 
@@ -190,9 +146,6 @@ module Coradoc
     # @param config [Hash, Spa::Configuration] SPA converter configuration
     # @return [String] HTML output
     def self.serialize_spa(document, config = {})
-      # Validate input is CoreModel
-      validate_core_model!(document)
-
       Spa.convert(document, config)
     end
 
@@ -203,9 +156,6 @@ module Coradoc
     # @param options [Hash] Converter options
     # @return [String] HTML output
     def self.serialize_as(document, format, options = {})
-      # Validate input is CoreModel
-      validate_core_model!(document)
-
       case format.to_sym
       when :static, :html_static, :classic
         serialize_static(document, options)
@@ -213,7 +163,7 @@ module Coradoc
         serialize_spa(document, options)
       else
         raise ArgumentError, "Unknown output format: #{format}. " \
-          'Valid formats: :static, :spa'
+                             'Valid formats: :static, :spa'
       end
     end
 
@@ -227,12 +177,15 @@ module Coradoc
 
     # Check if this format can transform the given model to CoreModel
     #
-    # HTML produces CoreModel directly, so it only handles already-CoreModel objects.
+    # HTML uses Nokogiri as its model layer. Accepts Nokogiri nodes
+    # and CoreModel objects (pass-through).
     #
     # @param model [Object] The model to check
-    # @return [Boolean] true if the model is already CoreModel
+    # @return [Boolean] true if the model is a Nokogiri node or CoreModel
     def self.handles_model?(model)
-      model.is_a?(Coradoc::CoreModel::Base)
+      model.is_a?(Nokogiri::XML::Node) ||
+        model.is_a?(Nokogiri::XML::Document) ||
+        model.is_a?(Coradoc::CoreModel::Base)
     end
 
     def self.to_core(document)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-html
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.14
 platform: ruby
 authors:
 - Ribose Inc.
@@ -13,16 +13,16 @@ dependencies:
   name: coradoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coradoc-adoc
   requirement: !ruby/object:Gem::Requirement
@@ -117,60 +117,31 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/coradoc/html.rb
-- lib/coradoc/html/base.rb
 - lib/coradoc/html/config.rb
 - lib/coradoc/html/converter_base.rb
-- lib/coradoc/html/converters/admonition.rb
-- lib/coradoc/html/converters/attribute.rb
-- lib/coradoc/html/converters/attribute_reference.rb
-- lib/coradoc/html/converters/audio.rb
-- lib/coradoc/html/converters/base.rb
-- lib/coradoc/html/converters/bibliography.rb
-- lib/coradoc/html/converters/bibliography_entry.rb
-- lib/coradoc/html/converters/block_image.rb
-- lib/coradoc/html/converters/bold.rb
-- lib/coradoc/html/converters/break.rb
-- lib/coradoc/html/converters/comment_block.rb
-- lib/coradoc/html/converters/comment_line.rb
-- lib/coradoc/html/converters/cross_reference.rb
-- lib/coradoc/html/converters/document.rb
-- lib/coradoc/html/converters/example.rb
-- lib/coradoc/html/converters/highlight.rb
-- lib/coradoc/html/converters/include.rb
-- lib/coradoc/html/converters/inline_image.rb
-- lib/coradoc/html/converters/italic.rb
-- lib/coradoc/html/converters/line_break.rb
-- lib/coradoc/html/converters/link.rb
-- lib/coradoc/html/converters/list_item.rb
-- lib/coradoc/html/converters/listing.rb
-- lib/coradoc/html/converters/literal.rb
-- lib/coradoc/html/converters/monospace.rb
-- lib/coradoc/html/converters/open.rb
-- lib/coradoc/html/converters/ordered.rb
-- lib/coradoc/html/converters/paragraph.rb
-- lib/coradoc/html/converters/quote.rb
-- lib/coradoc/html/converters/reviewer_comment.rb
-- lib/coradoc/html/converters/reviewer_note.rb
-- lib/coradoc/html/converters/section.rb
-- lib/coradoc/html/converters/sidebar.rb
-- lib/coradoc/html/converters/source.rb
-- lib/coradoc/html/converters/source_code.rb
-- lib/coradoc/html/converters/span.rb
-- lib/coradoc/html/converters/strikethrough.rb
-- lib/coradoc/html/converters/subscript.rb
-- lib/coradoc/html/converters/superscript.rb
-- lib/coradoc/html/converters/table.rb
-- lib/coradoc/html/converters/table_cell.rb
-- lib/coradoc/html/converters/table_row.rb
-- lib/coradoc/html/converters/template_html_converter.rb
-- lib/coradoc/html/converters/term.rb
-- lib/coradoc/html/converters/text_element.rb
-- lib/coradoc/html/converters/underline.rb
-- lib/coradoc/html/converters/unordered.rb
-- lib/coradoc/html/converters/verse.rb
-- lib/coradoc/html/converters/video.rb
-- lib/coradoc/html/element_mapping.rb
-- lib/coradoc/html/entity.rb
+- lib/coradoc/html/drop.rb
+- lib/coradoc/html/drop/annotation_drop.rb
+- lib/coradoc/html/drop/base.rb
+- lib/coradoc/html/drop/bibliography_drop.rb
+- lib/coradoc/html/drop/bibliography_entry_drop.rb
+- lib/coradoc/html/drop/block_drop.rb
+- lib/coradoc/html/drop/definition_item_drop.rb
+- lib/coradoc/html/drop/definition_list_drop.rb
+- lib/coradoc/html/drop/document_drop.rb
+- lib/coradoc/html/drop/drop_factory.rb
+- lib/coradoc/html/drop/footnote_drop.rb
+- lib/coradoc/html/drop/image_drop.rb
+- lib/coradoc/html/drop/inline_element_drop.rb
+- lib/coradoc/html/drop/list_block_drop.rb
+- lib/coradoc/html/drop/list_item_drop.rb
+- lib/coradoc/html/drop/table_cell_drop.rb
+- lib/coradoc/html/drop/table_drop.rb
+- lib/coradoc/html/drop/table_row_drop.rb
+- lib/coradoc/html/drop/term_drop.rb
+- lib/coradoc/html/drop/text_content_drop.rb
+- lib/coradoc/html/drop/toc_drop.rb
+- lib/coradoc/html/drop/toc_entry_drop.rb
+- lib/coradoc/html/escape.rb
 - lib/coradoc/html/input.rb
 - lib/coradoc/html/input/cleaner.rb
 - lib/coradoc/html/input/config.rb
@@ -191,15 +162,16 @@ files:
 - lib/coradoc/html/input/converters/h.rb
 - lib/coradoc/html/input/converters/head.rb
 - lib/coradoc/html/input/converters/hr.rb
-- lib/coradoc/html/input/converters/ignore.rb
 - lib/coradoc/html/input/converters/img.rb
 - lib/coradoc/html/input/converters/li.rb
 - lib/coradoc/html/input/converters/mark.rb
 - lib/coradoc/html/input/converters/markup.rb
 - lib/coradoc/html/input/converters/math.rb
+- lib/coradoc/html/input/converters/media_base.rb
 - lib/coradoc/html/input/converters/ol.rb
 - lib/coradoc/html/input/converters/p.rb
 - lib/coradoc/html/input/converters/pass_through.rb
+- lib/coradoc/html/input/converters/positional_formatting.rb
 - lib/coradoc/html/input/converters/pre.rb
 - lib/coradoc/html/input/converters/q.rb
 - lib/coradoc/html/input/converters/strong.rb
@@ -208,7 +180,6 @@ files:
 - lib/coradoc/html/input/converters/table.rb
 - lib/coradoc/html/input/converters/td.rb
 - lib/coradoc/html/input/converters/text.rb
-- lib/coradoc/html/input/converters/th.rb
 - lib/coradoc/html/input/converters/tr.rb
 - lib/coradoc/html/input/converters/video.rb
 - lib/coradoc/html/input/errors.rb
@@ -216,24 +187,20 @@ files:
 - lib/coradoc/html/input/plugin.rb
 - lib/coradoc/html/input/plugins/plateau.rb
 - lib/coradoc/html/input/postprocessor.rb
+- lib/coradoc/html/layout_renderer.rb
 - lib/coradoc/html/output.rb
 - lib/coradoc/html/renderer.rb
+- lib/coradoc/html/section_numberable.rb
 - lib/coradoc/html/spa.rb
 - lib/coradoc/html/static.rb
+- lib/coradoc/html/template_caching.rb
 - lib/coradoc/html/template_config.rb
 - lib/coradoc/html/template_helpers.rb
 - lib/coradoc/html/template_locator.rb
 - lib/coradoc/html/theme.rb
-- lib/coradoc/html/theme/base.rb
-- lib/coradoc/html/theme/classic_renderer.rb
-- lib/coradoc/html/theme/modern/components/ui_components.rb
-- lib/coradoc/html/theme/modern/css_generator.rb
-- lib/coradoc/html/theme/modern/javascript_generator.rb
-- lib/coradoc/html/theme/modern/serializers/document_serializer.rb
-- lib/coradoc/html/theme/modern/tailwind_config_builder.rb
-- lib/coradoc/html/theme/modern/vue_template_generator.rb
-- lib/coradoc/html/theme/modern_renderer.rb
-- lib/coradoc/html/theme/registry.rb
+- lib/coradoc/html/title_text.rb
+- lib/coradoc/html/toc_builder.rb
+- lib/coradoc/html/toc_serializer.rb
 - lib/coradoc/html/transform/from_core_model.rb
 - lib/coradoc/html/transform/to_core_model.rb
 - lib/coradoc/html/version.rb
@@ -244,6 +211,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
@@ -251,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/coradoc/html/base.rb

@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-
-module Coradoc
-  module Html
-    # Base module for HTML processing utilities
-    module Base
-      class << self
-        # Convert content to HTML, handling various input types
-        def convert_content(content, state = {})
-          return '' if content.nil?
-
-          case content
-          when String
-            return '' if content.empty?
-
-            escape_html(content)
-          when Array
-            return '' if content.empty?
-
-            content.map { |item| convert_content(item, state) }.join
-          else
-            # If content responds to a converter, use it
-            converter = find_converter(content.class)
-            if converter
-              converter.to_html(content, state)
-            else
-              content.to_s
-            end
-          end
-        end
-
-        # Find the appropriate converter for a model class
-        def find_converter(model_class)
-          return nil unless defined?(Coradoc::Html::Converters)
-
-          converter_name = model_class.name.split('::').last
-
-          # Use const_get on the Converters module to trigger autoload
-          begin
-            klass = Coradoc::Html::Converters.const_get(converter_name, false)
-            # Return nil if this is the Base class itself (not a real converter)
-            # or if it doesn't inherit from Converters::Base
-            return nil if klass == Coradoc::Html::Converters::Base
-            return nil unless klass <= Coradoc::Html::Converters::Base
-
-            klass
-          rescue NameError
-            nil
-          end
-        end
-
-        # Escape HTML special characters
-        def escape_html(text)
-          return '' if text.nil?
-          return text unless text.is_a?(String)
-
-          text
-            .gsub('&', '&amp;')
-            .gsub('<', '&lt;')
-            .gsub('>', '&gt;')
-            .gsub('"', '&quot;')
-            .gsub("'", '&#39;')
-        end
-
-        # Unescape HTML entities
-        def unescape_html(text)
-          return '' if text.nil?
-          return text unless text.is_a?(String)
-
-          text
-            .gsub('&amp;', '&')
-            .gsub('&lt;', '<')
-            .gsub('&gt;', '>')
-            .gsub('&quot;', '"')
-            .gsub('&#39;', "'")
-            .gsub('&#x27;', "'")
-        end
-
-        # Build HTML element with attributes
-        def build_element(tag, content = nil, attributes = {})
-          attrs = build_attributes(attributes)
-          attr_string = attrs.empty? ? '' : " #{attrs}"
-
-          # Handle empty content (String, Array, or nil)
-          content_empty = case content
-                          when nil, String, Array
-                            content.nil? || content.empty?
-                          else
-                            false
-                          end
-
-          if content_empty
-            # Self-closing for void elements
-            if void_element?(tag)
-              "<#{tag}#{attr_string}>"
-            else
-              "<#{tag}#{attr_string}></#{tag}>"
-            end
-          else
-            "<#{tag}#{attr_string}>#{content}</#{tag}>"
-          end
-        end
-
-        # Build HTML attributes string
-        def build_attributes(attributes)
-          return '' if attributes.nil? || attributes.empty?
-
-          attributes.map do |key, value|
-            next if value.nil?
-
-            escaped_value = escape_html(value.to_s)
-            %(#{key}="#{escaped_value}")
-          end.compact.join(' ')
-        end
-
-        # Check if element is a void element (self-closing)
-        def void_element?(tag)
-          %w[area base br col embed hr img input link meta param source track wbr].include?(tag.to_s)
-        end
-
-        # Extract attributes from a CoreModel
-        #
-        # @param model [Coradoc::CoreModel::Base] Model to extract attributes from
-        # @return [Hash] Attributes hash
-        def extract_attributes(model)
-          attrs = {}
-
-          attrs[:id] = model.id if model.id
-          attrs[:title] = model.title if model.title
-
-          if model.is_a?(Coradoc::CoreModel::StructuralElement) && model.metadata
-            attrs[:class] = model.metadata[:class] || model.metadata[:role]
-            attrs.merge!(model.metadata.except(:class, :role))
-          end
-
-          attrs
-        end
-
-        # Wrap content with line breaks if needed
-        def wrap_lines(content)
-          return content unless content.is_a?(String)
-
-          content.split("\n").join("<br>\n")
-        end
-
-        # Process children of a node (common operation)
-        def treat_children(children, state = {})
-          return [] if children.nil? || children.empty?
-
-          Array(children).map do |child|
-            convert_content(child, state)
-          end
-        end
-      end
-    end
-  end
-end