Factor out Sitepress in favor of Page for article layout

Author: rossta

app/content/layouts/article.html.erb

@@ -1,11 +1,12 @@
+<% page = @page %>
 <% set_meta_tags(
-     title: current_page.data.title!,
-     description: current_page.data.description,
+     title: page.title,
+     description: page.description,
      keywords: %w[rails hotwire],
      og: {
        type: "article",
-       url: current_page.url,
-       image: current_page.data.meta_image && asset_url(current_page.data.meta_image)
+       url: page.request_path,
+       image: page.meta_image && asset_url(page.meta_image)
      },
      twitter: {
        card: "summary"
@@ -15,24 +16,11 @@
 <%= render_layout "application" do %>
   <article itemscope itemtype="http://schema.org/Article" class="mb-3xl">
     <%= render Pages::Header.new(
-          title: current_page.data.title!,
-          description: current_page.data.description,
-          published_on: current_page.data.published&.to_date,
-          updated_on: current_page.data.updated&.to_date
+          title: page.title,
+          description: page.description,
+          published_on: page.published_on,
+          updated_on: page.updated_on
         ) %>
-    <%- if current_page.data.toc -%>
-      <aside>
-        <h2 class="font-semibold mb-4 text-sm leading-6 uppercase tracking-widest">Table of Contents</h2>
-        <!-- Disable Turbolinks for same-page Table of Contents navigation
-        -->
-        <nav
-          data-controller="table-of-contents"
-          data-turbo="false"
-          class="toc">
-          <%= render_toc(current_page) %>
-        </nav>
-      </aside>
-    <%- end -%>
     <div class="article-content container" itemprop="articleBody">
       <%= yield %>
     </div>
@@ -47,6 +35,6 @@
   </section>
 <% end %>
 
-<% if current_page.data.enable_twitter_widgets %>
+<% if page.enable_twitter_widgets %>
 <%= javascript_include_tag "https://platform.twitter.com/widgets.js", charset: "utf-8", async: true %>
 <% end %>

app/models/page.rb

@@ -34,10 +34,12 @@ def data = NullData.new(title: nil, description: nil)
   # def resource_data
   delegate :data, to: :resource, allow_nil: true, prefix: true
 
-  # We currently have a split system of Sitepress and Page models for handling static pages
-  # While not ideal, it currently allows us to live in both worlds depending on the context.
-  # Ultimately, migrating away from Sitepress for indexed content may be what‘s needed, but
-  # keeping the split personality for now.
+  # We currently have a dual system of content management between Sitepress and
+  # Page models for handling static pages While not ideal, it currently allows
+  # us to live in both worlds depending on the context.  Ultimately, migrating
+  # away from Sitepress for indexed content may be what‘s needed, but keeping
+  # the split personality for now.
+  #
   def self.as_published_articles
     SitepressArticle.take_published(all.map { |page| SitepressArticle.new(page.resource) })
   end
@@ -63,20 +65,38 @@ def self.upsert_from_sitepress!(limit: nil)
     enum.to_a
   end
 
-  def sitepress_article
-    SitepressArticle.new(resource)
+  def self.upsert_page_from_sitepress!(sitepress_resource)
+    page = Page.find_or_initialize_by(request_path: sitepress_resource.request_path)
+    page.published_at = sitepress_resource.data.published.to_time.middle_of_day if sitepress_resource.data.published
+    page.updated_at = sitepress_resource.data.updated.to_time.middle_of_day if sitepress_resource.data.updated
+    page.save!
+    page
   end
 
+  def published? = !!published_at
+
+  def published_on = published_at&.to_date
+
+  def updated_on = updated_at&.to_date
+
+  def indexed? = !!indexed_at
+
+  def sitepress_article = SitepressArticle.new(resource)
+
   def resource = Sitepress.site.get(request_path) ||
     NullResource.new(request_path: request_path)
 
   def body_text = Nokogiri::HTML(SitepressPage.render_html(resource)).text.squish
 
-  def url = request_path
-
   def title = resource.data.title
 
   def body = resource.body
 
   def description = resource.data.description
+
+  def meta_image = resource.data.meta_image
+
+  def toc = resource.data.toc
+
+  def enable_twitter_widgets = resource.data.toc
 end

app/views/searches/results/page.rb

@@ -9,7 +9,7 @@ def initialize(page)
 
       def view_template
         a(
-          href: page.url,
+          href: page.request_path,
           data: {
             turbo_frame: "_top"
           },