markbridge 0.1.3 → 0.2.0

data/lib/markbridge/renderers/discourse/renderer.rb

@@ -5,13 +5,15 @@ module Markbridge
     module Discourse
       # Renders AST to Discourse-flavored Markdown in-memory.
       class Renderer
-        def initialize(tag_library: nil, escaper: nil, html_escaper: nil)
+        attr_reader :postprocessor
+
+        def initialize(tag_library: nil, escaper: nil, html_escaper: nil, postprocessor: nil)
           @tag_library = tag_library || TagLibrary.default
           @escaper = escaper || MarkdownEscaper.new
           @html_escaper = html_escaper || HtmlEscaper
+          @postprocessor = postprocessor || Postprocessor::DEFAULT
           # @interface_cache is lazily initialized in #render's top-level
-          # call and reset to nil after the call completes. No init
-          # needed here — unset ivar returns nil under `.nil?` check.
+          # call and reset to nil after the call completes.
         end
 
         # Render a node to Markdown
@@ -20,7 +22,7 @@ module Markbridge
         # @return [String]
         def render(node, context: RenderContext.new)
           root_call = @interface_cache.nil?
-          @interface_cache ||= {}
+          @interface_cache = {} if root_call
 
           tag = @tag_library[node.class]
           if tag
@@ -97,9 +99,17 @@ module Markbridge
           elsif context.html_mode?
             @html_escaper.escape(node.text)
           else
-            @escaper.escape(node.text)
+            @escaper.escape(node.text, in_link_label: in_link_label?(context))
           end
         end
+
+        # `]` is structural inside a Markdown link label, so any plain text
+        # rendered under an Url/Email ancestor must escape it. Tags that emit
+        # their own bracketed markup (ImageTag, UploadTag, etc.) skip this
+        # path entirely, so their structural brackets are preserved.
+        def in_link_label?(context)
+          context.has_parent?(AST::Url) || context.has_parent?(AST::Email)
+        end
       end
     end
   end

data/lib/markbridge/renderers/discourse/rendering_interface.rb

@@ -67,7 +67,7 @@ module Markbridge
         # Handles edge cases like existing markers and whitespace
         def wrap_inline(content, open_marker, close_marker = nil)
           close_marker ||= open_marker
-          return content unless content.match?(/\S/)
+          return content unless content.match?(/[^[:space:]]/)
 
           # Handle conflicts with existing markers
           if content.include?(open_marker) || content.include?(close_marker)
@@ -82,8 +82,9 @@ module Markbridge
             end
           end
 
-          # Preserve leading/trailing whitespace
-          content.sub(/\A(\s*)(.+?)(\s*)\z/m) do
+          # Preserve leading/trailing whitespace (Unicode-aware, since
+          # CommonMark's flanking rules treat e.g. nbsp as whitespace).
+          content.sub(/\A([[:space:]]*)(.+?)([[:space:]]*)\z/m) do
             match = Regexp.last_match
             "#{match[1]}#{open_marker}#{match[2]}#{close_marker}#{match[3]}"
           end

data/lib/markbridge/renderers/discourse/tag_library.rb

@@ -11,6 +11,15 @@ module Markbridge
           @tags = {}
         end
 
+        # When a TagLibrary is +dup+'d / +clone+'d, ensure the
+        # internal +@tags+ Hash is independent of the source. Without
+        # this, both copies would share the same underlying Hash and
+        # mutations to one would silently affect the other.
+        def initialize_copy(other)
+          super
+          @tags = @tags.dup
+        end
+
         # Register a tag for an element class
         # @param element_class [Class] the element class
         # @param tag [Tag] the tag instance
@@ -19,6 +28,38 @@ module Markbridge
           self
         end
 
+        # Remove a tag binding so the renderer falls through to
+        # +render_children+ for that element class. See
+        # +Renderer#render+ for the auto-passthrough path.
+        #
+        # @param element_class [Class]
+        # @return [self]
+        def unregister(element_class)
+          @tags.delete(element_class)
+          self
+        end
+
+        # Merge a Hash of class → Tag mappings on top of this library
+        # in-place. A +nil+ value unregisters the corresponding class
+        # (so the default auto-passthrough kicks in).
+        #
+        # Named with a trailing +!+ because it mutates +self+ —
+        # mirroring Ruby's Hash#merge / Hash#merge! convention. Use
+        # +dup+ first if you need a non-destructive merge.
+        #
+        # @param mapping [Hash{Class => Tag, nil}]
+        # @return [self]
+        def merge!(mapping)
+          mapping.each_pair do |klass, tag|
+            if tag.nil?
+              unregister(klass)
+            else
+              register(klass, tag)
+            end
+          end
+          self
+        end
+
         # Get tag for an element class
         # @param element_class [Class]
         # @return [Tag, nil]
@@ -59,8 +100,7 @@ module Markbridge
         # Create the default tag library for Discourse Markdown.
         #
         # Each call returns a *fresh* instance — mutations made to one will
-        # not be visible to another. If you want a process-wide singleton,
-        # use {Markbridge.default_tag_library} instead, which memoizes.
+        # not be visible to another.
         #
         # @return [TagLibrary]
         def self.default

data/lib/markbridge/renderers/discourse/tags/align_tag.rb

@@ -21,9 +21,9 @@ module Markbridge
             return content unless ALLOWED_ALIGNMENTS.include?(element.alignment)
 
             wrapper = %(<div align="#{element.alignment}">#{content}</div>)
-            # Skip the trailing blank line in html_mode: a blank line would
+            # Skip the blank-line bracketing in html_mode: a blank line would
             # terminate the surrounding HTML block (e.g. an enclosing <table>).
-            interface.html_mode? ? wrapper : "#{wrapper}\n\n"
+            interface.html_mode? ? wrapper : "\n\n#{wrapper}\n\n"
           end
         end
       end

data/lib/markbridge/renderers/discourse/tags/code_tag.rb

@@ -28,11 +28,13 @@ module Markbridge
             "`#{content}`"
           end
 
-          # Trailing blank line keeps an adjacent fence on the next block from
-          # being parsed as a continuation of this one.
+          # Leading and trailing blank lines: the trailing one keeps an
+          # adjacent fence on the next block from being parsed as a
+          # continuation of this one; the leading one separates the fence
+          # from prior raw text or inline content.
           def render_block(content, language)
             fence = calculate_fence(content)
-            "#{fence}#{language}\n#{content}\n#{fence}\n\n"
+            "\n\n#{fence}#{language}\n#{content}\n#{fence}\n\n"
           end
 
           def render_html_block(content, language)

data/lib/markbridge/renderers/discourse/tags/details_tag.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Markbridge
+  module Renderers
+    module Discourse
+      module Tags
+        # Renders {AST::Details} as a Discourse +[details=…]…[/details]+
+        # collapsible block.
+        #
+        # Markdown form: the BBCode is bracketed with leading and trailing
+        # blank lines so consecutive details blocks don't merge and
+        # adjacent inline content starts a new paragraph against the
+        # block. Inside, the rendered children are stripped so the
+        # +[details]+ opener and the body sit on adjacent lines without
+        # a stray blank between them — matching Discourse's BBCode
+        # parser expectations.
+        #
+        # HTML-block form (inside a CommonMark HTML block — when
+        # +interface.html_mode?+ is +true+): a raw
+        # +<details><summary>…</summary>…</details>+ element. The
+        # +title+ is HTML-escaped for the +<summary>+ text.
+        class DetailsTag < Tag
+          DEFAULT_TITLE = "Summary"
+          private_constant :DEFAULT_TITLE
+
+          def render(element, interface)
+            child_context = interface.with_parent(element)
+            content = interface.render_children(element, context: child_context)
+
+            return render_html(element.title, content) if interface.html_mode?
+
+            opener = element.title ? %([details="#{element.title}"]) : "[details]"
+            "\n\n#{opener}\n#{content.strip}\n[/details]\n\n"
+          end
+
+          private
+
+          def render_html(title, content)
+            label = title ? HtmlEscaper.escape(title) : DEFAULT_TITLE
+            "<details><summary>#{label}</summary>#{content}</details>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/markbridge/renderers/discourse/tags/heading_tag.rb

@@ -16,7 +16,7 @@ module Markbridge
 
             prefix = "#" * element.level
 
-            "#{prefix} #{content}\n\n"
+            "\n\n#{prefix} #{content}\n\n"
           end
         end
       end

data/lib/markbridge/renderers/discourse/tags/paragraph_tag.rb

@@ -21,8 +21,11 @@ module Markbridge
               return "<p>#{content}</p>"
             end
 
-            # Paragraph followed by blank line (two newlines)
-            "#{content}\n\n"
+            # Bracket with leading and trailing blank lines so adjacent
+            # non-block content (raw text, inline elements) stays separated
+            # from the paragraph. cleanup_markdown collapses any duplicate
+            # newlines that result when neighbours are themselves block tags.
+            "\n\n#{content}\n\n"
           end
         end
       end

data/lib/markbridge/renderers/discourse/tags/quote_tag.rb

@@ -27,9 +27,10 @@ module Markbridge
                 content.split("\n").map { |line| "> #{line}" }.join("\n")
               end
 
-            # Trailing blank line so consecutive quotes don't merge and
-            # following content starts a new paragraph.
-            "#{body}\n\n"
+            # Bracket with leading and trailing blank lines so consecutive
+            # quotes don't merge and adjacent non-block content (raw text,
+            # inline elements) starts a new paragraph against the quote.
+            "\n\n#{body}\n\n"
           end
         end
       end

data/lib/markbridge/renderers/discourse/tags/underline_tag.rb

@@ -8,17 +8,30 @@ module Markbridge
         # cooked by the BBCode plugin into `<span class="bbcode-u">`. The
         # BBCode plugin runs on Markdown source, not on raw HTML inside an
         # HTML block, so in html_mode we emit the cooked form directly.
+        #
+        # Inside Markdown link text (`[text](url)`) the BBCode plugin also
+        # does not re-cook nested BBCode, so `[[u]X[/u]](url)` would render
+        # literally. Drop the wrapper when rendering under a link ancestor.
         class UnderlineTag < Tag
           def render(element, interface)
             child_context = interface.with_parent(element)
             content = interface.render_children(element, context: child_context)
+            return content unless content.match?(/[^[:space:]]/)
 
             if interface.html_mode?
               %(<span class="bbcode-u">#{content}</span>)
+            elsif inside_link?(interface)
+              content
             else
               "[u]#{content}[/u]"
             end
           end
+
+          private
+
+          def inside_link?(interface)
+            interface.has_parent?(AST::Url) || interface.has_parent?(AST::Email)
+          end
         end
       end
     end

data/lib/markbridge/renderers/discourse.rb

@@ -5,7 +5,9 @@ require_relative "discourse/tag_library"
 require_relative "discourse/render_context"
 require_relative "discourse/rendering_interface"
 require_relative "discourse/markdown_escaper"
+require_relative "discourse/identity_escaper"
 require_relative "discourse/html_escaper"
+require_relative "discourse/postprocessor"
 
 # Builders
 require_relative "discourse/builders/list_item_builder"
@@ -16,6 +18,7 @@ require_relative "discourse/tags/attachment_tag"
 require_relative "discourse/tags/bold_tag"
 require_relative "discourse/tags/code_tag"
 require_relative "discourse/tags/color_tag"
+require_relative "discourse/tags/details_tag"
 require_relative "discourse/tags/email_tag"
 require_relative "discourse/tags/heading_tag"
 require_relative "discourse/tags/horizontal_rule_tag"

data/lib/markbridge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Markbridge
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end