coradoc-markdown 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 007d0f6cb59531d5677c8775118fa2e676f811b067b725170963a64d727235da
-  data.tar.gz: ca79c3da61050874894e5815cf03c5cce54711781ae51c5c4971cb5b56d36040
+  metadata.gz: 953ed53e8524e48cac6182bce3e847cc99deba64ba70e49add437b170186bc4c
+  data.tar.gz: 4b47acb69d7ab740fe2bb1f40e14ed0471cc4766ae7bb861efe066a94551eb33
 SHA512:
-  metadata.gz: e551c841bc950973c7a96274e77f31b450916cfcd4bc989dd6f425688d493898318f6ac545dc537b1cf584fa7f6d3d8d8fa9c7a00b47750d7407abf2419494b9
-  data.tar.gz: c75199d663605c880367231f1f3779480ac7582610d55983a0bedced93b513041bedf8d190066c8d6bacd3220ec6646b9a7b0e57ceb00bbde7ed138dd462cae0
+  metadata.gz: 5e46c8a03f843c7061438135d27440476f4415c29a3c9d3f253cc523ae90a13ea044fa801c839f6ab7723ecc414c88a7773ac40effd10de38177dc376fafbd62
+  data.tar.gz: 7a3480158a1aef2af7236d751577fb5297f0844f148a54218b23b2583c74fee472b42c5a8c10b356b4b2c4e13999c3521fb6be4f808d27e037893509e458ec91

data/lib/coradoc/markdown/model/example_block.rb

@@ -15,11 +15,13 @@ module Coradoc
     class ExampleBlock < Base
       attribute :content, :string
       attribute :caption, :string
+      attribute :children, Coradoc::Markdown::Base, collection: true, default: []
 
-      def initialize(content:, caption: nil, **rest)
+      def initialize(content:, caption: nil, children: [], **rest)
         super
         @content = content
         @caption = caption
+        @children = Array(children)
       end
     end
   end

data/lib/coradoc/markdown/serializer/serializers/example_block.rb

@@ -15,23 +15,31 @@ module Coradoc
           handles_type ::Coradoc::Markdown::ExampleBlock
 
           def call(element, ctx)
+            body = render_body(element, ctx)
             if ctx.config.admonition_style == :container
-              render_container(element)
+              render_container(element, body)
             else
-              render_html(element)
+              render_html(element, body)
             end
           end
 
           private
 
-          def render_html(element)
+          def render_body(element, ctx)
+            return element.content.to_s if element.children.nil? || element.children.empty?
+
+            element.children.map { |c| ctx.serialize(c) }.join("\n\n")
+          end
+
+          def render_html(element, body)
             caption_html = element.caption ? %(<h4>Example: #{element.caption}</h4>\n) : ''
-            %(<div class="example">\n#{caption_html}<p>#{element.content.to_s}</p>\n</div>)
+            inner = element.children&.any? ? body : "<p>#{body}</p>"
+            %(<div class="example">\n#{caption_html}#{inner}\n</div>)
           end
 
-          def render_container(element)
+          def render_container(element, body)
             title = element.caption ? " Example: #{element.caption}" : ''
-            ":::details#{title}\n#{element.content.to_s}\n:::"
+            ":::details#{title}\n#{body}\n:::"
           end
         end
       end

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

@@ -232,9 +232,11 @@ module Coradoc
           end
 
           def transform_example_block(block)
+            children = Array(block.children).map { |c| transform(c) }.flat_map { |c| flatten_result(c) }
             Coradoc::Markdown::ExampleBlock.new(
               content: block.flat_text,
-              caption: block.title.to_s
+              caption: block.title.to_s,
+              children: children
             )
           end
 

data/lib/coradoc/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Markdown
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-markdown
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.