Improve Markdown rendering

app/components/ui/code_block.html.erb

@@ -1,7 +1,5 @@
-<pre class="rouge border border-gray-300 rounded overflow-scroll">
-<%== formatter.format(lexer.lex(content)) %>
-</pre>
+<pre id="<%= id %>" class="rouge border border-gray-300 rounded overflow-scroll px-4 py-2"><%== formatter.format(lexer.lex(content)) %></pre>
 
 <style type="text/css">
-  <%= Rouge::Themes::Github.render(scope: 'pre.rouge') %>
+  <%= Rouge::Themes::Github.render(scope: "pre##{id}.rouge") %>
 </style>

app/components/ui/code_block.rb

@@ -10,6 +10,12 @@ def formatter
   end
 
   def lexer
-    @lexer ||= Rouge::Lexers::Ruby.new
+    "Rouge::Lexers::#{@language.camelize}".constantize.new
+  rescue StandardError
+    Rouge::Lexers::PlainText.new
+  end
+
+  def id
+    @id ||= "code-block-#{rand(10_000)}"
   end
 end

app/helpers/markdown_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MarkdownHelper
+  def render_markdown(content)
+    MarkdownRenderer.new(sanitize(content)).render
+  end
+end

app/models/gem_spec.rb

@@ -183,16 +183,6 @@ def guide_files
     metadata.files.select { |file| (file.include?("guide/") || file.include?("guides/")) && file.end_with?(".md") }
   end
 
-  def content_for_markdown(file)
-    file = "#{file}.md"
-
-    if markdown_files.include?(file)
-      sanitize(File.read("#{unpack_data_path}/#{file}"))
-    else
-      %(File "#{file}" not found)
-    end
-  end
-
   def rbs_files
     metadata.files.select { |file| file.end_with?(".rbs") }
   end
@@ -201,18 +191,24 @@ def readme
     markdown_files.find { |file| file.downcase.include?("readme") } || markdown_files.first
   end
 
-  def sanitize(content)
-    Rails::HTML5::FullSanitizer.new.sanitize(content)
-  end
-
   def readme_content
     if readme
-      sanitize(File.read("#{unpack_data_path}/#{readme}"))
+      File.read("#{unpack_data_path}/#{readme}")
     else
       "No README"
     end
   end
 
+  def content_for_markdown(file)
+    file = "#{file}.md"
+
+    if markdown_files.include?(file)
+      File.read("#{unpack_data_path}/#{file}")
+    else
+      %(File "#{file}" not found)
+    end
+  end
+
   def download_path
     "tmp/gems/#{name}".tap do |path|
       FileUtils.mkdir_p(path)

app/models/markdown_renderer.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class MarkdownRenderer
+  class DefaultRenderer < Redcarpet::Render::HTML
+    include Redcarpet::Render::SmartyPants
+
+    def block_code(code, language)
+      ApplicationController.render(UI::CodeBlock.new(language:).with_content(code), layout: false)
+    end
+  end
+
+  def initialize(content)
+    @content = content
+  end
+
+  def render
+    return "" if content.blank?
+
+    renderer.render(content)
+  end
+
+  private
+
+  attr_reader :content
+
+  def renderer
+    Redcarpet::Markdown.new(
+      DefaultRenderer.new(**markdown_settings),
+      renderer_settings,
+    )
+  end
+
+  def markdown_settings
+    {
+      hard_wrap: true,
+      no_images: false,
+      no_links: false,
+      with_toc_data: false,
+    }
+  end
+
+  def renderer_settings
+    {
+      autolink: true,
+      disable_indented_code_blocks: true,
+      fenced_code_blocks: true,
+      footnotes: true,
+      gh_blockcode: true,
+      highlight: true,
+      lax_spacing: true,
+      no_intra_emphasis: true,
+      strikethrough: true,
+      superscript: true,
+      tables: true,
+      underline: true,
+    }
+  end
+end

app/views/gems/docs/show.html.erb

@@ -4,14 +4,6 @@
   </div>
 
   <div class="prose max-w-full border border-gray-200 rounded p-8 mt-6">
-    <% markdown = Redcarpet::Markdown.new(
-        Redcarpet::Render::HTML,
-        autolink: true,
-        tables: true,
-        fenced_code_blocks: true,
-        lax_spacing: true
-      ) %>
-
-    <%== markdown.render(@gem.content_for_markdown(params[:id])) %>
+    <%== render_markdown(@gem.content_for_markdown(params[:id])) %>
   </div>
 <% end %>

app/views/gems/guides/show.html.erb

@@ -4,14 +4,6 @@
   </div>
 
   <div class="prose max-w-full border border-gray-200 rounded p-8 mt-6">
-    <% markdown = Redcarpet::Markdown.new(
-        Redcarpet::Render::HTML,
-        autolink: true,
-        tables: true,
-        fenced_code_blocks: true,
-        lax_spacing: true
-      ) %>
-
-    <%== markdown.render(@gem.content_for_markdown(params[:id])) %>
+    <%== render_markdown(@gem.content_for_markdown(params[:id])) %>
   </div>
 <% end %>

app/views/gems/pages/readme.html.erb

@@ -2,14 +2,6 @@
 
 <%= render Gems::Wrapper.new(gem: @gem, modules: @gem.top_level_modules, classes: @gem.top_level_classes, class_methods: @gem.class_methods, instance_methods: @gem.instance_methods) do %>
   <div class="prose max-w-full border border-gray-200 rounded p-8 mt-6">
-    <% markdown = Redcarpet::Markdown.new(
-        Redcarpet::Render::HTML,
-        autolink: true,
-        tables: true,
-        fenced_code_blocks: true,
-        lax_spacing: true
-      ) %>
-
-    <%== markdown.render(@gem.readme_content) %>
+    <%== render_markdown(@gem.readme_content) %>
   </div>
 <% end %>