coradoc-adoc 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76a16bad8dc3e4567d425b8c464bd4469db6bb55cab06aa48621ffe8ed2dc60
-  data.tar.gz: 7d2c531af059b0108780acdeace458051a5f484cb130f695d329cd5e1c7376c0
+  metadata.gz: ed044cb4af9fd1e18a9cb2c34ddc5c322d801fd24962058a5b6ec55e7a3a9c43
+  data.tar.gz: 751978667c8663723085bf0a79d5908cf4a3368e827366a1d703c2602671fcb3
 SHA512:
-  metadata.gz: ae0aed7da09b650dd45e5781f929b99923530840741509be68721f8a978511840d0f211b7572997309f40205597fccce47e914f0fa2a33d606865ffa8d927404
-  data.tar.gz: 7b09ddcf81d699f4deab3c6a7dbb74f42c91dddf1607ea20b1dfe439fd0fafa05144b5f667b3391e6b9e05542c6cb321012467598b7fe492160aa58383dfb05f
+  metadata.gz: caf485068682d2b714078ff0ec934601a35498fb546d5a97677cbae3b08aa237b598768ca7bafb3f1075868ae5524a01ab20a9fede25d2e4a374d8e67390baca
+  data.tar.gz: cf951b3c317c1a40ac4b2d170dba913b4a83d375aa60a8a7a8a16e47865d3ebe7609b61630436d90726fe682e3d78412beadac3ced3589bf642b865ad7250628

data/lib/coradoc/asciidoc/model/list/definition_item.rb

@@ -32,6 +32,12 @@ module Coradoc
           attribute :id, :string
           attribute :terms, Coradoc::AsciiDoc::Model::Term, collection: true
           attribute :contents, Coradoc::AsciiDoc::Model::TextElement, collection: true
+          attribute :delimiter, :string, default: -> { '::' }
+          attribute :nested,
+                    Coradoc::AsciiDoc::Model::Base,
+                    polymorphic: [Coradoc::AsciiDoc::Model::List::Definition],
+                    collection: true,
+                    initialize_empty: true
 
           def to_adoc(delimiter: '')
             Coradoc::AsciiDoc::Serializer.serialize(self, delimiter: delimiter)

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

@@ -29,10 +29,10 @@ module Coradoc
           attrs >> r.repeat(1).as(:unordered)
         end
 
-        def definition_list(delimiter = '::')
+        def definition_list(_delimiter = nil)
           (attribute_list >> newline).maybe >>
-            dlist_item(delimiter).repeat(1).as(:definition_list) >>
-            dlist_item(delimiter).absent?
+            dlist_item.repeat(1).as(:definition_list) >>
+            dlist_item.absent?
         end
 
         def list_marker(nesting_level = 1)
@@ -98,27 +98,32 @@ module Coradoc
         end
 
         def dlist_delimiter
-          (str('::') | str(':::') | str('::::') | str(';;')
+          (
+            (str(':::::') >> match(':').absent?) |
+            (str('::::') >> match(':').absent?) |
+            (str(':::') >> match(':').absent?) |
+            (str('::') >> match(':').absent?) |
+            str(';;')
           ).as(:delimiter)
         end
 
-        def dlist_term(_delimiter)
-          (element_id_inline.maybe >>
-            match("[^\n:]").repeat(1)
-                           .as(:text)
-          ).as(:dlist_term) >> dlist_delimiter
+        def dlist_term(_delimiter = nil)
+          term_chars =
+            (dlist_delimiter.absent? >> match("[^\n]")).repeat(1)
+                                                       .as(:text)
+          (element_id_inline.maybe >> term_chars).as(:dlist_term) >> dlist_delimiter
         end
 
         def dlist_definition
-          text # >> empty_line.repeat(0)
+          text
             .as(:definition) >> line_ending >> empty_line.repeat(0)
         end
 
-        def dlist_item(delimiter)
-          (((dlist_term(delimiter).as(:terms).repeat(1) >> line_ending >>
+        def dlist_item(_delimiter = nil)
+          (((dlist_term.as(:terms).repeat(1) >> line_ending >>
             empty_line.repeat(0)).repeat(1) >>
             dlist_definition) |
-            (dlist_term(delimiter).repeat(1, 1).as(:terms) >> space >>
+            (dlist_term.repeat(1, 1).as(:terms) >> space >>
               dlist_definition)
           ).as(:definition_list_item)
         end

data/lib/coradoc/asciidoc/serializer/serializers/list/definition_item.rb

@@ -8,7 +8,8 @@ module Coradoc
           class DefinitionItem < Base
             def to_adoc(model, options_or_context = {})
               context = normalize_context(options_or_context)
-              delimiter = context.option(:delimiter, '')
+              delimiter = model.delimiter.to_s
+              delimiter = context.option(:delimiter, '::') if delimiter.empty?
               _anchor = model.anchor.nil? ? '' : serialize_child(model.anchor, context)
               content = +''
 
@@ -26,6 +27,25 @@ module Coradoc
 
               d = model.contents ? serialize_children(model.contents, context) : ''
               content << "#{d}\n"
+
+              nested_delimiter = "#{delimiter}:"
+              Array(model.nested).each do |nested_list|
+                next unless nested_list.is_a?(Coradoc::AsciiDoc::Model::List::Definition)
+
+                nested_list.items.each do |nested_item|
+                  content << serialize_with_options(nested_item, delimiter: nested_delimiter)
+                end
+              end
+
+              content
+            end
+
+            private
+
+            def serialize_with_options(child, options = {})
+              serializer_class = ElementRegistry.lookup(child.class)
+              serializer = serializer_class.new
+              serializer.to_adoc(child, options)
             end
           end
         end

data/lib/coradoc/asciidoc/transform/element_transformers/list_transformer.rb

@@ -48,6 +48,12 @@ module Coradoc
                 definition_children: def_children
               )
               di.id = item.id if item.id
+
+              nested_adoc = Array(item.nested).find do |n|
+                n.is_a?(Coradoc::AsciiDoc::Model::List::Definition) && n.items.any?
+              end
+              di.nested = transform_list(nested_adoc, 'definition') if nested_adoc
+
               di
             end
 

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

@@ -298,22 +298,29 @@ module Coradoc
             )
           end
 
-          def transform_definition_list(definition_list)
+          def transform_definition_list(definition_list, depth = 1)
+            delimiter = ':' * (depth + 1)
             items = Array(definition_list.items).map do |item|
-              transform_definition_item(item)
+              transform_definition_item(item, depth)
             end
-            Coradoc::AsciiDoc::Model::List::Definition.new(items: items)
+            list = Coradoc::AsciiDoc::Model::List::Definition.new(items: items)
+            list.delimiter = delimiter
+            list
           end
 
-          def transform_definition_item(item)
+          def transform_definition_item(item, depth = 1)
+            delimiter = ':' * (depth + 1)
             term = Coradoc::AsciiDoc::Model::Term.new(term: item.term.to_s)
             contents = Array(item.definitions).map do |defn|
               Coradoc::AsciiDoc::Model::TextElement.new(content: defn.to_s)
             end
-            Coradoc::AsciiDoc::Model::List::DefinitionItem.new(
+            di = Coradoc::AsciiDoc::Model::List::DefinitionItem.new(
               terms: [term],
-              contents: contents
+              contents: contents,
+              delimiter: delimiter
             )
+            di.nested << transform_definition_list(item.nested, depth + 1) if item.nested&.items&.any?
+            di
           end
 
           def transform_toc(_toc)

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

@@ -5,6 +5,42 @@ module Coradoc
     class Transformer < Parslet::Transform
       # Module containing list transformation rules
       module ListRules
+        class << self
+          def build_dlist_tree(items)
+            root = Model::List::Definition.new(items: [])
+            stack = [[root, 0]]
+
+            items.each do |item|
+              depth = dlist_depth(item.delimiter)
+              stack.pop while stack.last[1] >= depth
+
+              stack.last[0].items << item
+              nested_list = Model::List::Definition.new(items: [])
+              item.nested << nested_list
+              stack.push([nested_list, depth])
+            end
+
+            prune_empty_nested(root)
+            root
+          end
+
+          def dlist_depth(delimiter)
+            delim = delimiter.to_s
+            return 1 if delim == ';;' || delim.empty?
+
+            [delim.count(':') - 1, 1].max
+          end
+
+          def prune_empty_nested(list)
+            list.items.each do |item|
+              item.nested.select! do |n|
+                n.is_a?(Model::List::Definition) && n.items.any?
+              end
+              item.nested.each { |n| prune_empty_nested(n) }
+            end
+          end
+        end
+
         def self.apply(transformer_class)
           transformer_class.class_eval do
             # List item
@@ -68,7 +104,7 @@ module Coradoc
             end
 
             # Definition list term (with optional anchor)
-            rule(dlist_term: subtree(:term_data), delimiter: simple(:_delim)) do
+            rule(dlist_term: subtree(:term_data), delimiter: simple(:delim)) do
               case term_data
               when Hash
                 text = term_data[:text]
@@ -76,11 +112,11 @@ module Coradoc
                 text = text.content.to_s if text.is_a?(Model::TextElement)
                 id = term_data[:id]
                 id = id.to_s if id.is_a?(Parslet::Slice)
-                { text: text.to_s, id: id }
+                { text: text.to_s, id: id, delimiter: delim.to_s }
               when Model::TextElement
-                { text: term_data.content.to_s, id: term_data.id }
+                { text: term_data.content.to_s, id: term_data.id, delimiter: delim.to_s }
               else
-                { text: term_data.to_s, id: nil }
+                { text: term_data.to_s, id: nil, delimiter: delim.to_s }
               end
             end
 
@@ -95,13 +131,15 @@ module Coradoc
                 t.is_a?(Hash) ? t[:text].to_s : t.to_s
               end
               item_id = nil
+              item_delim = '::'
               terms.each do |t|
-                next unless t.is_a?(Hash) && t[:id]
+                next unless t.is_a?(Hash)
 
-                item_id = t[:id].to_s
-                break
+                item_id = t[:id].to_s if t[:id]
+                item_delim = t[:delimiter].to_s if t[:delimiter]
               end
-              Model::List::DefinitionItem.new(terms: term_strings, contents: contents, id: item_id)
+              Model::List::DefinitionItem.new(terms: term_strings, contents: contents,
+                                              id: item_id, delimiter: item_delim)
             end
 
             # Definition list item with hash terms (single term case)
@@ -111,6 +149,7 @@ module Coradoc
               data = item_data.is_a?(Hash) ? item_data : { terms: Array(item_data), definition: '' }
 
               item_id = nil
+              item_delim = '::'
               terms_data = data[:terms]
               definition = data[:definition].to_s
 
@@ -118,17 +157,19 @@ module Coradoc
                 case t
                 when Hash
                   item_id ||= t[:id].to_s if t[:id]
+                  item_delim = t[:delimiter].to_s if t[:delimiter]
                   t[:text].to_s
                 else
                   t.to_s
                 end
               end
 
-              Model::List::DefinitionItem.new(terms: terms, contents: definition, id: item_id)
+              Model::List::DefinitionItem.new(terms: terms, contents: definition,
+                                              id: item_id, delimiter: item_delim)
             end
 
             rule(definition_list: sequence(:list_items)) do
-              Model::List::Definition.new(items: list_items)
+              ListRules.build_dlist_tree(list_items)
             end
 
             # Definition list with attribute_list (e.g., [%key])
@@ -136,7 +177,9 @@ module Coradoc
               attribute_list: simple(:attribute_list),
               definition_list: sequence(:list_items)
             ) do
-              Model::List::Definition.new(items: list_items, attrs: attribute_list)
+              tree = ListRules.build_dlist_tree(list_items)
+              tree.attrs = attribute_list if attribute_list
+              tree
             end
           end
         end

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.8'
+    VERSION = '2.0.9'
   end
 end

metadata

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