markbridge 0.1.1 → 0.1.2

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

@@ -15,7 +15,10 @@ module Markbridge
             if markdown_compatible?(rows_data, interface)
               render_markdown(rows_data)
             else
-              render_html(rows_data)
+              # Re-render cells in html_mode so inline Markdown like **bold** becomes
+              # <strong>bold</strong>; CommonMark would not parse Markdown inside an HTML block.
+              html_rows = extract_rows(element, interface, child_context.with_html_mode(true))
+              render_html(html_rows)
             end
           end
 
@@ -25,13 +28,15 @@ module Markbridge
           # @return [Array<Hash>] array of {cells: [{content:, header:}], ...}
           def extract_rows(element, interface, child_context)
             element.children.filter_map do |child|
-              next unless child.is_a?(AST::TableRow)
+              next unless child.instance_of?(AST::TableRow)
 
               cells =
                 child.children.filter_map do |cell|
-                  next unless cell.is_a?(AST::TableCell)
+                  next unless cell.instance_of?(AST::TableCell)
 
-                  cell_context = child_context.with_parent(child)
+                  # Push the cell itself into the parent chain so descendants
+                  # can detect they're inside a cell via has_parent?.
+                  cell_context = child_context.with_parent(cell)
                   content = interface.render_children(cell, context: cell_context).strip
                   { content:, header: cell.header? }
                 end
@@ -42,7 +47,6 @@ module Markbridge
 
           # Check if the table can be rendered as Markdown
           def markdown_compatible?(rows_data, interface)
-            return false if rows_data.empty?
             return false if interface.has_parent?(AST::Table)
 
             cell_count = rows_data.first[:cells].length
@@ -90,7 +94,7 @@ module Markbridge
 
               unless header_rows.empty?
                 lines << "<thead>"
-                header_rows.each { |row| lines << html_row(row, force_header: true) }
+                header_rows.each { |row| lines << html_row(row) }
                 lines << "</thead>"
               end
 
@@ -108,10 +112,10 @@ module Markbridge
           end
 
           # Render a single HTML table row
-          def html_row(row, force_header: false)
+          def html_row(row)
             cells_html =
               row[:cells].map do |cell|
-                tag = (cell[:header] || force_header) ? "th" : "td"
+                tag = cell[:header] ? "th" : "td"
                 "<#{tag}>#{cell[:content]}</#{tag}>"
               end
 

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

@@ -4,13 +4,20 @@ module Markbridge
   module Renderers
     module Discourse
       module Tags
-        # Tag for rendering underline text
+        # Discourse's HTML sanitizer strips raw `<u>`, but `[u]…[/u]` is
+        # 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.
         class UnderlineTag < Tag
           def render(element, interface)
             child_context = interface.with_parent(element)
             content = interface.render_children(element, context: child_context)
-            # Discourse uses HTML for underline
-            "<u>#{content}</u>"
+
+            if interface.html_mode?
+              %(<span class="bbcode-u">#{content}</span>)
+            else
+              "[u]#{content}[/u]"
+            end
           end
         end
       end

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

@@ -29,7 +29,9 @@ module Markbridge
         #     end
         #   end
         class UploadTag < Tag
-          def render(element, _interface)
+          def render(element, interface)
+            return build_upload_html(element) if interface.html_mode?
+
             # Return raw Markdown if available, otherwise reconstruct
             return element.raw if element.raw
 
@@ -56,7 +58,7 @@ module Markbridge
           def build_attachment_markdown(element)
             filename = element.filename || "attachment"
             url = build_upload_url(element)
-            size_part = element.size ? " (#{element.size})" : ""
+            size_part = " (#{element.size})" if element.size
 
             "[#{filename}|attachment](#{url})#{size_part}"
           end
@@ -73,6 +75,31 @@ module Markbridge
             filename = element.filename || element.sha1
             "upload://#{filename}"
           end
+
+          # html_mode reconstructs from the AST fields rather than reusing
+          # element.raw — raw is Markdown, which CommonMark passes through
+          # unchanged inside an HTML block (so the user would see the
+          # literal "![…](upload://…)" string instead of an image).
+          def build_upload_html(element)
+            if element.type == :image
+              build_image_html(element)
+            else
+              build_attachment_html(element)
+            end
+          end
+
+          def build_image_html(element)
+            src = HtmlEscaper.escape(build_upload_url(element))
+            alt = HtmlEscaper.escape(element.alt)
+            %(<img src="#{src}" alt="#{alt}">)
+          end
+
+          def build_attachment_html(element)
+            href = HtmlEscaper.escape(build_upload_url(element))
+            filename = HtmlEscaper.escape(element.filename || "attachment")
+            size_part = " (#{HtmlEscaper.escape(element.size)})" if element.size
+            %(<a href="#{href}">#{filename}</a>#{size_part})
+          end
         end
       end
     end

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

@@ -11,10 +11,12 @@ module Markbridge
             text = interface.render_children(element, context: child_context)
             href = element.href
 
-            if href&.match?(/^(https?|ftps?|mailto):/i)
-              "[#{text}](#{href})"
+            return text unless href&.match?(/\A(?:https?|ftps?|mailto):/i)
+
+            if interface.html_mode?
+              %(<a href="#{HtmlEscaper.escape(href)}">#{text}</a>)
             else
-              text
+              "[#{text}](#{href})"
             end
           end
         end

data/lib/markbridge/renderers/discourse.rb

@@ -5,6 +5,7 @@ require_relative "discourse/tag_library"
 require_relative "discourse/render_context"
 require_relative "discourse/rendering_interface"
 require_relative "discourse/markdown_escaper"
+require_relative "discourse/html_escaper"
 
 # Builders
 require_relative "discourse/builders/list_item_builder"

data/lib/markbridge/textformatter.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative "../markbridge"
+require_relative "parsers/text_formatter"

data/lib/markbridge/version.rb

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

data/lib/markbridge.rb

@@ -5,8 +5,6 @@ require_relative "markbridge/configuration"
 
 require_relative "markbridge/ast"
 require_relative "markbridge/renderers/discourse"
-require_relative "markbridge/parsers/media_wiki"
-require_relative "markbridge/parsers/text_formatter"
 require_relative "markbridge/processors"
 
 module Markbridge
@@ -70,21 +68,23 @@ module Markbridge
 
     # Parse MediaWiki wikitext to AST
     # @param input [String] MediaWiki source
+    # @param inline_tag_registry [Parsers::MediaWiki::InlineTagRegistry, nil] custom registry
     # @return [AST::Document]
-    def parse_mediawiki(input)
+    def parse_mediawiki(input, inline_tag_registry: nil)
       raise ArgumentError, "input cannot be nil" if input.nil?
 
       input = input.to_s
-      parser = Parsers::MediaWiki::Parser.new
+      parser = Parsers::MediaWiki::Parser.new(inline_tag_registry:)
       parser.parse(input)
     end
 
     # Convert MediaWiki wikitext to Discourse Markdown
     # @param input [String] MediaWiki source
+    # @param inline_tag_registry [Parsers::MediaWiki::InlineTagRegistry, nil] custom registry
     # @param tag_library [TagLibrary, nil] custom tag library or use default
     # @return [String] Markdown output
-    def mediawiki_to_markdown(input, tag_library: nil)
-      ast = parse_mediawiki(input)
+    def mediawiki_to_markdown(input, inline_tag_registry: nil, tag_library: nil)
+      ast = parse_mediawiki(input, inline_tag_registry:)
       render_to_markdown(ast, tag_library:)
     end
 
@@ -142,7 +142,7 @@ module Markbridge
       parser.parse(input.to_s)
     end
 
-    def render_to_markdown(ast, tag_library: nil)
+    def render_to_markdown(ast, tag_library:)
       tag_library ||= default_tag_library
       renderer = build_renderer(tag_library:)
       cleanup_markdown(renderer.render(ast))
@@ -159,7 +159,7 @@ module Markbridge
     def cleanup_markdown(text)
       text
         .gsub(/\n{3,}/, "\n\n") # Max 2 consecutive newlines
-        .gsub(/^[ \t]+$/m, "") # Remove whitespace-only lines
+        .gsub(/^[ \t]+$/, "") # Remove whitespace-only lines
         .strip # Trim leading/trailing whitespace
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markbridge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Discourse Team
@@ -52,8 +52,11 @@ files:
 - lib/markbridge/ast/underline.rb
 - lib/markbridge/ast/upload.rb
 - lib/markbridge/ast/url.rb
+- lib/markbridge/bbcode.rb
 - lib/markbridge/configuration.rb
 - lib/markbridge/gem_loader.rb
+- lib/markbridge/html.rb
+- lib/markbridge/mediawiki.rb
 - lib/markbridge/parsers/bbcode.rb
 - lib/markbridge/parsers/bbcode/closing_strategies/base.rb
 - lib/markbridge/parsers/bbcode/closing_strategies/reordering.rb
@@ -107,6 +110,7 @@ files:
 - lib/markbridge/parsers/html/parser.rb
 - lib/markbridge/parsers/media_wiki.rb
 - lib/markbridge/parsers/media_wiki/inline_parser.rb
+- lib/markbridge/parsers/media_wiki/inline_tag_registry.rb
 - lib/markbridge/parsers/media_wiki/parser.rb
 - lib/markbridge/parsers/text_formatter.rb
 - lib/markbridge/parsers/text_formatter/handler_registry.rb
@@ -133,6 +137,7 @@ files:
 - lib/markbridge/processors/discourse_markdown/scanner.rb
 - lib/markbridge/renderers/discourse.rb
 - lib/markbridge/renderers/discourse/builders/list_item_builder.rb
+- lib/markbridge/renderers/discourse/html_escaper.rb
 - lib/markbridge/renderers/discourse/markdown_escaper.rb
 - lib/markbridge/renderers/discourse/render_context.rb
 - lib/markbridge/renderers/discourse/renderer.rb
@@ -168,6 +173,7 @@ files:
 - lib/markbridge/renderers/discourse/tags/underline_tag.rb
 - lib/markbridge/renderers/discourse/tags/upload_tag.rb
 - lib/markbridge/renderers/discourse/tags/url_tag.rb
+- lib/markbridge/textformatter.rb
 - lib/markbridge/version.rb
 homepage: https://github.com/discourse/markbridge
 licenses:
@@ -183,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="