Refactor methods for rendering Page text and html inline

Author: rossta

app/content/models/sitepress_page.rb

@@ -1,17 +1,4 @@
 class SitepressPage < Sitepress::Model
   collection glob: "**/*.html*"
   data :title
-
-  def self.render_html(resource, format: :atom)
-    type = (format == :atom && resource.handler.to_sym == :mdrb) ? :"mdrb-atom" : resource.handler
-    content_type = (format == :atom) ? "application/atom+xml" : "text/html"
-
-    ApplicationController.render(
-      inline: resource.body,
-      type:,
-      content_type:,
-      layout: false,
-      assigns: {format:}
-    )
-  end
 end

app/models/page.rb

@@ -53,7 +53,9 @@ def title = resource.data.title
 
   def body = resource.body
 
-  def body_text = Nokogiri::HTML(SitepressPage.render_html(resource)).text.squish
+  def body_text = Nokogiri::HTML(body_html(format: :atom)).text.squish
+
+  def body_html(format: :html, **) = self.class.render_html(self, format:, **)
 
   def description = resource.data.description
 
@@ -65,9 +67,7 @@ def toc = resource.data.toc
 
   def enable_twitter_widgets = resource.data.enable_twitter_widgets
 
-  def atom_feed_id
-    resource.data.uuid.presence || id
-  end
+  def atom_feed_id = resource.data.uuid.presence || id
 
   def author = resource.data.author
 end

app/models/page/sitepressed.rb

@@ -25,6 +25,8 @@ def upsert_page_from_sitepress!
 
     def resource_missing? = sitepress_resource.is_a?(NullResource)
 
+    def handler = sitepress_resource.handler
+
     class_methods do
       # We currently have a dual system of content management between Sitepress and
       # Page models for handling static pages While not ideal, it currently allows
@@ -63,6 +65,19 @@ def upsert_page_from_sitepress!(sitepress_resource)
         page.save!
         page
       end
+
+      def render_html(page, format: :html, assigns: {})
+        type = (format == :atom && page.handler.to_sym == :mdrb) ? :"mdrb-atom" : page.handler
+        content_type = (format == :atom) ? "application/atom+xml" : "text/html"
+
+        ApplicationController.render(
+          inline: page.body,
+          type:,
+          content_type:,
+          layout: false,
+          assigns: {format:, current_page: page}.merge(assigns)
+        )
+      end
     end
   end
 end

spec/models/page_spec.rb

@@ -29,9 +29,48 @@
   describe "#body" do
     it "delegates to resource" do
       page = FactoryBot.build(:page, request_path: "/articles/introducing-joy-of-rails")
+      body = page.body
 
-      expect(page.body).to be_present
-      expect(page.body).to eq page.resource.body
+      expect(body).to be_present
+      expect(body).to eq page.resource.body
+
+      expect(body).to match(/##/)
+    end
+  end
+
+  describe "#body_text" do
+    it "renders processed text from body" do
+      page = FactoryBot.build(:page, request_path: "/articles/introducing-joy-of-rails")
+
+      text = page.body_text
+      expect(text).to be_present
+      expect(text).to_not match(/<[^>]+>/)
+    end
+
+    it "works for article that references `current_page` helper" do
+      page = FactoryBot.build(:page, request_path: "/articles/what-you-need-to-know-about-sqlite")
+
+      text = page.body_text
+      expect(text).to be_present
+      expect(text).to_not match(/<[^>]+>/)
+    end
+  end
+
+  describe "#body_html" do
+    it "renders processed text from body" do
+      page = FactoryBot.build(:page, request_path: "/articles/introducing-joy-of-rails")
+
+      html = page.body_html
+      expect(html).to be_present
+      expect(html).to match(/<[^>]+>/)
+    end
+
+    it "works for article that references `current_page` helper" do
+      page = FactoryBot.build(:page, request_path: "/articles/what-you-need-to-know-about-sqlite")
+
+      html = page.body_html
+      expect(html).to be_present
+      expect(html).to match(/<[^>]+>/)
     end
   end