Refactor atom article rendering with new Page#body_html method

Author: rossta

app/views/components/atom/entry_content.rb

@@ -8,55 +8,51 @@
 class Atom::EntryContent
   include ActionView::Helpers::UrlHelper
 
-  # @param article [Sitepress::Model] the article to render for atom feed
-  def initialize(article, request: nil)
-    @article = article
+  # @param page [Page] the Page instance to render for atom feed
+  def initialize(page, request: nil)
+    @page = page
     @request = request
   end
 
   def render
-    html = render_template_html
+    html = page.body_html(format: :atom)
 
     doc = Nokogiri::HTML.fragment(html)
 
     doc.css("turbo-frame").each do |frame|
-      frame.add_next_sibling(link_to("Click here to see content", article_url))
+      frame_url = base_uri.merge(path: page.request_path, fragment: (frame["id"] if frame["id"])).to_s
+      frame.add_next_sibling("(" + link_to("Go to the article to see dynamic content", frame_url) + ")")
       frame.remove
     end
 
     doc.css("img").each do |img|
-      img["src"] = base_url + img["src"] if img["src"].start_with?("/")
+      img["src"] = url(img["src"]) if img["src"].start_with?("/")
     end
 
     doc.css("a").each do |a|
-      a["href"] = base_url + a["href"] if a["href"].start_with?("/")
+      a["href"] = url(a["href"]) if a["href"].start_with?("/")
     end
 
     doc.to_html
   end
 
   private
 
-  attr_reader :article, :request
+  attr_reader :page, :request
+
+  def base_uri
+    @base_uri ||= Addressable::URI.parse(base_url)
+  end
+
+  def url(path)
+    base_uri.join(path).to_s
+  end
 
   def base_url
     request&.base_url || ""
   end
 
   def article_url
-    base_url + article.request_path
-  end
-
-  def render_template_html
-    ApplicationController.render(
-      inline: article.body,
-      type: :"mdrb-atom",
-      layout: false,
-      content_type: "application/atom+xml",
-      assigns: {
-        current_page: article,
-        format: :atom
-      }
-    )
+    url page.request_path
   end
 end

spec/views/components/atom/entry_content_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Atom::EntryContent do
-  let(:article) { SitepressArticle.published.find { |a| a.title == "Introducing Joy of Rails" } } # introducing_joy_of_rails.mdrb
+  let(:article) { FactoryBot.create(:page, request_path: "/articles/introducing-joy-of-rails") }
 
   describe "#render" do
     it "renders the article body as html without enhanced markdown" do
@@ -13,7 +13,7 @@
     it "rewrites turbo frame content" do
       html = described_class.new(article).render
       expect(html).not_to include("<turbo-frame")
-      expect(html).to include("<a href=\"/articles/introducing-joy-of-rails\">Click here to see content</a>")
+      expect(html).to include("<a href=\"/articles/introducing-joy-of-rails#new_examples_counter\">Go to the article to see dynamic content</a>")
     end
 
     it "replaces relative urls with absolute urls" do