coradoc-html 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86ee1dfe0630fc0923c8bbaaf53a3a9653faf3a90f3fa6760e2abe765cc46a3
-  data.tar.gz: 228cb361cb1b9a7dc64823788fac88afa87e5d972049064ffdd51d9909ad11a4
+  metadata.gz: 5217e76f323e6810ce042935550bc937bb0cebdd697a81cd2faa36c699f18139
+  data.tar.gz: 2a2ed099e968c197fd8a2b0c9f6e8c8a76fa43806160f9a0790b2c91e77b8356
 SHA512:
-  metadata.gz: c219dbf71096377f684cd4ac7888e63248f1bf0ae279aec7e64923a1188bab59e57db330f4582cf5801155f2bfd061746c88dc4e61d79550130782459fd4b5e5
-  data.tar.gz: db6bb17213127a330405a09785ae40a54c45c7ebfa5cf4f00709efeffe0534827401aa502e9fb10a3c6ab51c17cf257ad3129ffa7650d53c5a6f64c141954f50
+  metadata.gz: df38444fa4bc63f848ddc8ad42890f3a922885dfa43061c134bdb0fce28ec030462202e3f544a17f258b902e5773e48fd2c1fff9afd347cb2aa163106ff68484
+  data.tar.gz: dc61e5cbb6f946665745522aaa40a05a3dd11603ce25adb5d5dbb50e418a7e47874bb10aec691a8885f4df885a3a7d88b5a9f63773b12969ee92f2f6130079a6

data/lib/coradoc/html/drop/base.rb

@@ -70,8 +70,3 @@ module Coradoc
     end
   end
 end
-
-# Load DropFactory and all drops after Base is fully defined.
-# Each drop self-registers; DropFactory sorts by type specificity
-# so registration order doesn't matter.
-require_relative 'drop_factory'

data/lib/coradoc/html/drop/drop_factory.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module Coradoc
   module Html
     module Drop
@@ -51,23 +49,24 @@ module Coradoc
   end
 end
 
-# Load all drops — each self-registers with DropFactory
-require_relative 'annotation_drop'
-require_relative 'block_drop'
-require_relative 'list_block_drop'
-require_relative 'list_item_drop'
-require_relative 'table_drop'
-require_relative 'table_row_drop'
-require_relative 'table_cell_drop'
-require_relative 'image_drop'
-require_relative 'inline_element_drop'
-require_relative 'bibliography_entry_drop'
-require_relative 'bibliography_drop'
-require_relative 'toc_entry_drop'
-require_relative 'toc_drop'
-require_relative 'definition_item_drop'
-require_relative 'definition_list_drop'
-require_relative 'term_drop'
-require_relative 'footnote_drop'
-require_relative 'text_content_drop'
-require_relative 'document_drop'
+# Load all drops — each self-registers with DropFactory.
+# Registration order doesn't matter (sorted by ancestor depth).
+require 'coradoc/html/drop/annotation_drop'
+require 'coradoc/html/drop/block_drop'
+require 'coradoc/html/drop/list_block_drop'
+require 'coradoc/html/drop/list_item_drop'
+require 'coradoc/html/drop/table_drop'
+require 'coradoc/html/drop/table_row_drop'
+require 'coradoc/html/drop/table_cell_drop'
+require 'coradoc/html/drop/image_drop'
+require 'coradoc/html/drop/inline_element_drop'
+require 'coradoc/html/drop/bibliography_entry_drop'
+require 'coradoc/html/drop/bibliography_drop'
+require 'coradoc/html/drop/toc_entry_drop'
+require 'coradoc/html/drop/toc_drop'
+require 'coradoc/html/drop/definition_item_drop'
+require 'coradoc/html/drop/definition_list_drop'
+require 'coradoc/html/drop/term_drop'
+require 'coradoc/html/drop/footnote_drop'
+require 'coradoc/html/drop/text_content_drop'
+require 'coradoc/html/drop/document_drop'

data/lib/coradoc/html/drop.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Drop namespace — manages Liquid drop layer for template rendering.
+#
+# Loading order matters: Base must load before DropFactory, and all
+# concrete drops must load after DropFactory (they self-register).
+# Each drop calls DropFactory.register at load time.
+module Coradoc
+  module Html
+    module Drop
+    end
+  end
+end
+
+# Base must load first (DropFactory depends on it)
+require 'coradoc/html/drop/base'
+# DropFactory loads next
+require 'coradoc/html/drop/drop_factory'

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'media_base'
-
 module Coradoc
   module Input
     module Html

data/lib/coradoc/html/input/converters/sub.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'positional_formatting'
-
 module Coradoc
   module Input
     module Html

data/lib/coradoc/html/input/converters/sup.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'positional_formatting'
-
 module Coradoc
   module Input
     module Html

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'media_base'
-
 module Coradoc
   module Input
     module Html

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

@@ -4,43 +4,51 @@ module Coradoc
   module Input
     module Html
       module Converters
-        # Autoload converter classes - they will register themselves when first accessed
-        autoload :Base, 'coradoc/html/input/converters/base'
-        autoload :Markup, 'coradoc/html/input/converters/markup'
-        autoload :A, 'coradoc/html/input/converters/a'
-        autoload :Aside, 'coradoc/html/input/converters/aside'
-        autoload :Audio, 'coradoc/html/input/converters/audio'
-        autoload :Blockquote, 'coradoc/html/input/converters/blockquote'
-        autoload :Br, 'coradoc/html/input/converters/br'
-        autoload :Bypass, 'coradoc/html/input/converters/bypass'
-        autoload :Code, 'coradoc/html/input/converters/code'
-        autoload :Div, 'coradoc/html/input/converters/div'
-        autoload :Dl, 'coradoc/html/input/converters/dl'
-        autoload :Skip, 'coradoc/html/input/converters/drop'
-        autoload :Em, 'coradoc/html/input/converters/em'
-        autoload :Figure, 'coradoc/html/input/converters/figure'
-        autoload :H, 'coradoc/html/input/converters/h'
-        autoload :Head, 'coradoc/html/input/converters/head'
-        autoload :Hr, 'coradoc/html/input/converters/hr'
-        autoload :Img, 'coradoc/html/input/converters/img'
-        autoload :Li, 'coradoc/html/input/converters/li'
-        autoload :Mark, 'coradoc/html/input/converters/mark'
-        autoload :Math, 'coradoc/html/input/converters/math'
-        autoload :MediaBase, 'coradoc/html/input/converters/media_base'
-        autoload :Ol, 'coradoc/html/input/converters/ol'
-        autoload :P, 'coradoc/html/input/converters/p'
-        autoload :PassThrough, 'coradoc/html/input/converters/pass_through'
-        autoload :PositionalFormatting, 'coradoc/html/input/converters/positional_formatting'
-        autoload :Pre, 'coradoc/html/input/converters/pre'
-        autoload :Q, 'coradoc/html/input/converters/q'
-        autoload :Strong, 'coradoc/html/input/converters/strong'
-        autoload :Sup, 'coradoc/html/input/converters/sup'
-        autoload :Sub, 'coradoc/html/input/converters/sub'
-        autoload :Table, 'coradoc/html/input/converters/table'
-        autoload :Td, 'coradoc/html/input/converters/td'
-        autoload :Text, 'coradoc/html/input/converters/text'
-        autoload :Tr, 'coradoc/html/input/converters/tr'
-        autoload :Video, 'coradoc/html/input/converters/video'
+        # Autoload converter classes — they self-register when loaded.
+        # Adding a new converter requires only adding one entry here.
+        CONVERTERS = {
+          Base: 'coradoc/html/input/converters/base',
+          Markup: 'coradoc/html/input/converters/markup',
+          A: 'coradoc/html/input/converters/a',
+          Aside: 'coradoc/html/input/converters/aside',
+          Audio: 'coradoc/html/input/converters/audio',
+          Blockquote: 'coradoc/html/input/converters/blockquote',
+          Br: 'coradoc/html/input/converters/br',
+          Bypass: 'coradoc/html/input/converters/bypass',
+          Code: 'coradoc/html/input/converters/code',
+          Div: 'coradoc/html/input/converters/div',
+          Dl: 'coradoc/html/input/converters/dl',
+          Skip: 'coradoc/html/input/converters/drop',
+          Em: 'coradoc/html/input/converters/em',
+          Figure: 'coradoc/html/input/converters/figure',
+          H: 'coradoc/html/input/converters/h',
+          Head: 'coradoc/html/input/converters/head',
+          Hr: 'coradoc/html/input/converters/hr',
+          Img: 'coradoc/html/input/converters/img',
+          Li: 'coradoc/html/input/converters/li',
+          Mark: 'coradoc/html/input/converters/mark',
+          Math: 'coradoc/html/input/converters/math',
+          MediaBase: 'coradoc/html/input/converters/media_base',
+          Ol: 'coradoc/html/input/converters/ol',
+          P: 'coradoc/html/input/converters/p',
+          PassThrough: 'coradoc/html/input/converters/pass_through',
+          PositionalFormatting: 'coradoc/html/input/converters/positional_formatting',
+          Pre: 'coradoc/html/input/converters/pre',
+          Q: 'coradoc/html/input/converters/q',
+          Strong: 'coradoc/html/input/converters/strong',
+          Sup: 'coradoc/html/input/converters/sup',
+          Sub: 'coradoc/html/input/converters/sub',
+          Table: 'coradoc/html/input/converters/table',
+          Td: 'coradoc/html/input/converters/td',
+          Text: 'coradoc/html/input/converters/text',
+          Tr: 'coradoc/html/input/converters/tr',
+          Video: 'coradoc/html/input/converters/video'
+        }.freeze
+        private_constant :CONVERTERS
+
+        CONVERTERS.each do |name, path|
+          autoload name, path
+        end
 
         @converters = {}
         @converters_loaded = false
@@ -57,12 +65,7 @@ module Coradoc
           return if @converters_loaded
 
           @converters_loaded = true
-
-          [
-            Base, Markup, A, Aside, Audio, Blockquote, Br, Bypass, Code, Div, Dl,
-            Skip, Em, Figure, H, Head, Hr, Img, Li, Mark, Math, Ol, P,
-            PassThrough, Pre, Q, Strong, Sup, Sub, Table, Td, Text, Tr, Video
-          ].each { |converter| _ = converter }
+          CONVERTERS.each_key { |name| const_get(name) }
         end
 
         def self.lookup(tag_name)

data/lib/coradoc/html/input/plugin.rb

@@ -65,13 +65,6 @@ module Coradoc
           Coradoc::Html::Input::Converters.process_coradoc(tree, state)
         end
 
-        def html_tree_preview
-          Tempfile.open(%w[coradoc .html]) do |i|
-            i << html_tree.to_html
-            system 'chromium-browser', '--no-sandbox', i.path
-          end
-        end
-
         # define preprocess_html_tree to process HTML trees
 
         # Creates a hook to be called instead of converting an element

data/lib/coradoc/html/renderer.rb

@@ -49,7 +49,13 @@ module Coradoc
       end
 
       def render_html5(document, **options)
-        @section_numbers = compute_section_numbers(document, options)
+        builder = TocBuilder.from_options(options)
+        @toc, @section_numbers = if document.is_a?(CoreModel::StructuralElement)
+                                   builder.build_with_numbers(document)
+                                 else
+                                   [nil, {}]
+                                 end
+
         body_html = render(document)
 
         if options[:layout] == :spa
@@ -73,33 +79,21 @@ module Coradoc
 
       private
 
-      def build_toc(_document, options)
-        TocBuilder.from_options(options)
-      end
-
-      def compute_section_numbers(document, options)
-        if options[:section_numbers] && document.is_a?(CoreModel::StructuralElement)
-          build_toc(document, options).section_number_map(document)
-        else
-          {}
-        end
-      end
-
-      def render_toc_for(document, options)
-        toc = build_toc(document, options).build(document)
-        render(toc)
-      end
-
       def render_static_layout(document, body_html, options)
-        if options[:toc] && document.is_a?(CoreModel::StructuralElement)
-          toc_html = render_toc_for(document, options)
+        if options[:toc] && @toc
+          toc_html = render(@toc)
           body_html = "#{toc_html}\n#{body_html}" unless toc_html.empty?
         end
         @layout_renderer.render_static(document, body_html, options)
       end
 
       def render_spa_layout(document, body_html, options)
-        toc_data = TocSerializer.new.build_json(document, options)
+        numbered = options[:section_numbers] == true
+        toc_data = if @toc
+                     { entries: TocSerializer.new.serialize_entries(@toc.entries), numbered: numbered }
+                   else
+                     { entries: [], numbered: false }
+                   end
         @layout_renderer.render_spa(document, options, body_html, toc_data)
       end
 
@@ -123,11 +117,12 @@ module Coradoc
         resolved = TitleText.resolve(drop.model)
         text = resolved ? Escape.escape_html(resolved) : ''
 
-        doc = Nokogiri::HTML::Document.new
-        fragment = Nokogiri::HTML::Builder.with(doc) do |builder|
-          builder.div(class: "element element-#{type}") { builder.text text }
-        end
-        fragment.at_css('div').to_html
+        fragment = Nokogiri::HTML.fragment
+        div = Nokogiri::XML::Node.new('div', fragment.document)
+        div['class'] = "element element-#{type}"
+        div.content = text
+        fragment.add_child(div)
+        fragment.to_html
       end
 
       def normalize_dirs(dirs)

data/lib/coradoc/html/toc_builder.rb

@@ -31,31 +31,31 @@ module Coradoc
       # @param document [CoreModel::StructuralElement] the root document
       # @return [CoreModel::Toc] the built TOC with entries and section numbers
       def build(document)
-        entries = []
-        counters = [0]
-        collect_entries(document.children, entries, 1, counters) if document.children
-
-        CoreModel::Toc.new(
-          entries: entries,
-          min_level: 1,
-          max_level: @max_level,
-          numbered: @numbered
-        )
+        toc, = build_with_numbers(document)
+        toc
       end
 
-      # Compute a mapping of section_id => section_number_string.
-      # Always computes numbers regardless of the +numbered+ flag,
-      # since this is used for heading annotation in the body.
+      # Build TOC and section number map in a single tree walk.
       #
       # @param document [CoreModel::StructuralElement] the root document
-      # @return [Hash{String => String}] mapping of section ID to number (e.g., "2.1")
-      def section_number_map(document)
-        map = {}
+      # @return [Array(CoreModel::Toc, Hash)] tuple of TOC model and section number map
+      def build_with_numbers(document)
         entries = []
         counters = [0]
         collect_entries(document.children, entries, 1, counters, always_number: true) if document.children
+
+        map = {}
         flatten_numbers(entries, map)
-        map
+
+        strip_numbers(entries) unless @numbered
+
+        toc = CoreModel::Toc.new(
+          entries: entries,
+          min_level: 1,
+          max_level: @max_level,
+          numbered: @numbered
+        )
+        [toc, map]
       end
 
       private
@@ -93,6 +93,13 @@ module Coradoc
         end
       end
 
+      def strip_numbers(entries)
+        entries.each do |entry|
+          entry.number = nil
+          strip_numbers(entry.children) if entry.children
+        end
+      end
+
       def entry_title(section)
         TitleText.resolve(section.title)
       end

data/lib/coradoc/html/toc_serializer.rb

@@ -15,8 +15,6 @@ module Coradoc
         { entries: serialize_entries(toc.entries), numbered: numbered }
       end
 
-      private
-
       def serialize_entries(entries)
         entries.map do |entry|
           {

data/lib/coradoc/html/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Html
-    VERSION = '1.1.13'
+    VERSION = '1.1.14'
   end
 end

data/lib/coradoc/html.rb

@@ -26,11 +26,8 @@ module Coradoc
     autoload :TemplateCaching, 'coradoc/html/template_caching'
     autoload :TitleText, 'coradoc/html/title_text'
 
-    # Autoload Drop namespace (DropFactory loads Base + all drops)
-    module Drop
-      autoload :DropFactory, 'coradoc/html/drop/drop_factory'
-      autoload :Base, 'coradoc/html/drop/base'
-    end
+    # Drop layer — self-registering drops loaded via parent namespace file
+    require 'coradoc/html/drop'
 
     # Autoload HTML output converters
     autoload :ConverterBase, 'coradoc/html/converter_base'
@@ -42,7 +39,8 @@ module Coradoc
     autoload :Theme, 'coradoc/html/theme'
     autoload :TemplateLocator, 'coradoc/html/template_locator'
     autoload :TemplateConfig, 'coradoc/html/template_config'
-    autoload :TemplateFilters, '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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-html
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Ribose Inc.
@@ -119,6 +119,7 @@ files:
 - lib/coradoc/html.rb
 - lib/coradoc/html/config.rb
 - lib/coradoc/html/converter_base.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