coradoc-adoc 2.0.11 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791dca3b794e199e6d856458c3399946545f54a26a98cc4e8aee07de8b7aa21f
-  data.tar.gz: 6fd4f6457098075c4ad3f98238ab56c4eb5359271f2024e3b75b0caee3791372
+  metadata.gz: e39d805fa1f2a5a0f7417223301a0935c858a8ccb157c57d420c8a3f8a90962b
+  data.tar.gz: 369b807f0cdeacf1bd0fb420500301add3d3c334e8e3b202054b4c14834faf37
 SHA512:
-  metadata.gz: d8c7eb7672609651c3152ce468727f638cd5e9b5bd73b25b1334697710b8083391db13e9d6d030f97a288a7fe28e33567a2dd934b6a455c0e5279fe4fe183455
-  data.tar.gz: 003e62344acf12212216306ad211330464866862dc5876d2caf7a4812c3c120a041b1da11d7ae83668b15e4a0c96a80e08984b9b7a3686de451fa548c444b0e0
+  metadata.gz: 2fa932a43798666e4a1dc2c709433ba55fe8ef570e7d8cc2c9d178a94a058295ec70353abf09fb5069cba6c6afe9dac110f742809ca696446c79759c2734160a
+  data.tar.gz: '091cdb09fb0cc658a60080718b536eacc6ddfd06056cf846e568af815c04f4dee05e1b8394cb0f246c324b9d903e73877f3219eaa4876ab69b0fb53204025868'

data/lib/coradoc/asciidoc/model/admonition.rb

@@ -28,7 +28,13 @@ module Coradoc
       #   admonition.content = "Be careful!"
       #
       class Admonition < Attached
-        attribute :content, :string
+        attribute :content,
+                  Lutaml::Model::Serializable,
+                  collection: true,
+                  polymorphic: [
+                    Lutaml::Model::Type::String,
+                    Coradoc::AsciiDoc::Model::TextElement
+                  ]
         attribute :type, :string
         attribute :line_break, :string, default: -> { '' }
       end

data/lib/coradoc/asciidoc/model/bibliography_entry.rb

@@ -36,9 +36,12 @@ module Coradoc
         # Coerce a raw parser AST value into the canonical ref_text string.
         # Accepts the shapes produced by Parser::Bibliography for `:ref_text`:
         # nil, Parslet::Slice, plain String, single Model::Base, or an Array
-        # of any of these. Keeping this coercion on the model that owns
-        # ref_text (rather than in a transformer rule) keeps the transformer
-        # declarative and lets callers build entries from any source shape.
+        # of any of these. Model objects (TextElement, Inline::Italic, etc.)
+        # are flattened via TextExtractVisitor so their text content is
+        # preserved instead of leaking `#<Class:0x...>` inspect strings.
+        # Keeping this coercion on the model that owns ref_text (rather than
+        # in a transformer rule) keeps the transformer declarative and lets
+        # callers build entries from any source shape.
         # @param raw [Object, nil]
         # @return [String]
         def self.coerce_ref_text(raw)
@@ -47,6 +50,8 @@ module Coradoc
           case raw
           when Array then raw.map { |e| coerce_ref_text(e) }.join
           when String then raw
+          when Coradoc::AsciiDoc::Model::Base
+            Coradoc::AsciiDoc::Transform::TextExtractVisitor.new.extract(raw).to_s
           else raw.to_s
           end
         end

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

@@ -15,7 +15,7 @@ module Coradoc
 
         def admonition_line
           admonition_type.as(:admonition_type) >> str(': ') >>
-            (text.as(:text) >>
+            (text_any.as(:text) >>
             line_ending.as(:line_break)
             ).repeat(1)
             .as(:content)

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

@@ -35,6 +35,75 @@ module Coradoc
               )
             end
 
+            # Open blocks (`--`) are generic containers. AsciiDoc allows
+            # casting them to a different block type via positional
+            # attributes: verbatim types (`[source]`, `[listing]`,
+            # `[literal]`) and admonition labels (`[NOTE]`, `[TIP]`,
+            # `[WARNING]`, `[CAUTION]`, `[IMPORTANT]`). When such a cast
+            # is present, the block behaves like the corresponding
+            # delimited block. Anything else stays an OpenBlock.
+            def transform_open_block(block)
+              semantic = open_block_semantic(block)
+              case semantic
+              when :source_code
+                transform_source_block(block)
+              when :listing
+                transform_listing_from_open(block)
+              when :literal
+                transform_literal_from_open(block)
+              when :admonition
+                transform_admonition_from_open(block)
+              else
+                transform_typed_block(block, Coradoc::CoreModel::OpenBlock)
+              end
+            end
+
+            ADMONITION_TYPES = %w[note tip warning caution important].freeze
+
+            def open_block_semantic(block)
+              attrs = block.attributes
+              return nil unless attrs.is_a?(Coradoc::AsciiDoc::Model::AttributeList)
+
+              first = attrs.positional&.first
+              return nil unless first.is_a?(Coradoc::AsciiDoc::Model::AttributeListAttribute)
+
+              case first.value.to_s.downcase
+              when 'source' then :source_code
+              when 'listing' then :listing
+              when 'literal' then :literal
+              when *ADMONITION_TYPES then :admonition
+              end
+            end
+
+            def transform_admonition_from_open(block)
+              type = block.attributes.positional.first.value.to_s.downcase
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::AnnotationBlock.new(
+                annotation_type: type,
+                content: content_lines,
+                title: ToCoreModel.extract_title_text(block.title)
+              )
+            end
+
+            def transform_listing_from_open(block)
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::ListingBlock.new(
+                id: block.id,
+                title: ToCoreModel.extract_title_text(block.title),
+                content: content_lines,
+                language: ToCoreModel.extract_block_language(block)
+              )
+            end
+
+            def transform_literal_from_open(block)
+              content_lines = Array(block.lines).map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+              Coradoc::CoreModel::LiteralBlock.new(
+                id: block.id,
+                title: ToCoreModel.extract_title_text(block.title),
+                content: content_lines
+              )
+            end
+
             def transform_block(block, semantic_type_or_delimiter)
               content_lines = ToCoreModel.extract_block_lines(block)
               semantic_type = if semantic_type_or_delimiter.is_a?(Symbol)

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

@@ -52,7 +52,6 @@ module Coradoc
               Coradoc::AsciiDoc::Model::Block::Example => Coradoc::CoreModel::ExampleBlock,
               Coradoc::AsciiDoc::Model::Block::Side => Coradoc::CoreModel::SidebarBlock,
               Coradoc::AsciiDoc::Model::Block::Literal => Coradoc::CoreModel::LiteralBlock,
-              Coradoc::AsciiDoc::Model::Block::Open => Coradoc::CoreModel::OpenBlock,
               Coradoc::AsciiDoc::Model::Block::Pass => Coradoc::CoreModel::PassBlock
             }.each do |block_class, core_model_class|
               Registry.register_with_priority(
@@ -62,6 +61,12 @@ module Coradoc
               )
             end
 
+            Registry.register_with_priority(
+              Coradoc::AsciiDoc::Model::Block::Open,
+              ->(model) { Blk.transform_open_block(model) },
+              priority: 10
+            )
+
             Registry.register(
               Coradoc::AsciiDoc::Model::Block::Core,
               ->(model) { Blk.transform_block(model, model.delimiter.to_s) }

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.11'
+    VERSION = '2.0.13'
   end
 end

metadata

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