Merge pull request #277 from joyofrails/feat/page-timestamps

Add page timestamps

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/jobs/pages/batch_analyze_topics_job.rb

@@ -3,10 +3,7 @@ class BatchAnalyzeTopicsJob < ApplicationJob
     queue_as :default
 
     def perform
-      scope = Page.where.missing(:topics)
-        .and(Page.where(request_path: SitepressArticle.published.map(&:request_path)))
-
-      scope.find_each do |page|
+      Page.published.where.missing(:topics).find_each do |page|
         Pages::AnalyzeTopicsJob.perform_later(page)
       end
     end

app/jobs/pages/batch_upsert_pages_job.rb

@@ -3,7 +3,7 @@ class BatchUpsertPagesJob < ApplicationJob
     queue_as :default
 
     def perform(limit: nil)
-      Page.upsert_from_sitepress!(limit: limit)
+      Page.upsert_collection_from_sitepress!(limit: limit)
     end
   end
 end

app/jobs/pages/refresh_search_index_job.rb

@@ -0,0 +1,7 @@
+module Pages
+  class RefreshSearchIndexJob < ApplicationJob
+    def perform
+      Page.published.find_each(&:update_in_search_index)
+    end
+  end
+end

app/jobs/pages/search_index_refresh_job.rb

@@ -6,12 +6,16 @@
 # Table name: pages
 #
 #  id           :string           not null, primary key
+#  indexed_at   :datetime
+#  published_at :datetime
 #  request_path :string           not null
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #
 # Indexes
 #
+#  index_pages_on_indexed_at    (indexed_at)
+#  index_pages_on_published_at  (published_at)
 #  index_pages_on_request_path  (request_path) UNIQUE
 #
 class Page < ApplicationRecord
@@ -27,29 +31,29 @@ def data = NullData.new(title: nil, description: nil)
   has_many :topics, through: :page_topics
   has_many :approved_topics, -> { approved }, through: :page_topics, source: :topic, inverse_of: :pages
 
+  scope :published, -> { where(["published_at < ?", Time.zone.now]) }
+  scope :indexed, -> { where(["indexed_at < ?", Time.zone.now]) }
+
   # 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.
-  def self.as_published_articles
-    SitepressArticle.take_published(all.map { |page| SitepressArticle.new(page.resource) })
-  end
+  # 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.upsert_collection_from_sitepress!(limit: nil)
+    enum = SitepressPage.all.resources.lazy
+
+    if limit
+      enum = enum.filter do |sitepress_resource|
+        Page.find_by(request_path: sitepress_resource.request_path).nil?
+      end
+    end
 
-  def self.upsert_from_sitepress!(limit: nil)
-    # Targeting specific Sitepress models until we have a better way to make
-    # Page model aware of published state
-    enum = [
-      SitepressArticle,
-      SitepressSlashPage
-    ].lazy.flat_map { |model| model.all.resources }
-
-    enum = enum.filter do |sitepress_resource|
-      Page.find_by(request_path: sitepress_resource.request_path).nil?
-    end.map do |sitepress_resource|
-      Page.create!(request_path: sitepress_resource.request_path)
+    enum = enum.map do |sitepress_resource|
+      upsert_page_from_sitepress!(sitepress_resource)
     end
 
     if limit
@@ -59,20 +63,44 @@ 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 image = resource.data.image
+
+  def meta_image = resource.data.meta_image
+
+  def toc = resource.data.toc
+
+  def enable_twitter_widgets = resource.data.toc
+
+  def upsert_page_from_sitepress!
+    self.class.upsert_page_from_sitepress!(resource)
+  end
 end

app/models/page.rb

@@ -6,8 +6,6 @@ module Searchable
     ConfigurationError = Class.new(Error)
 
     included do
-      after_create_commit :create_in_search_index
-      after_update_commit :update_in_search_index
       after_destroy_commit :remove_from_search_index
 
       scope :search, ->(query) do
@@ -57,6 +55,7 @@ def update_in_search_index
       transaction do
         remove_from_search_index
         create_in_search_index
+        touch(:indexed_at)
       end
     end
 
@@ -65,10 +64,6 @@ def remove_from_search_index
     end
 
     class_methods do
-      def refresh_search_index
-        find_each(&:update_in_search_index)
-      end
-
       def create_search_index(page)
         id, title, body = [:id, :title, :body_text].map { |attr| page.send(attr) }
         Rails.logger.info "[#{self}] Creating search index: #{id} #{title}"

app/models/page/searchable.rb

@@ -1,3 +1,24 @@
+# == Schema Information
+#
+# Table name: page_topics
+#
+#  id         :integer          not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  page_id    :string           not null
+#  topic_id   :integer          not null
+#
+# Indexes
+#
+#  index_page_topics_on_page_id               (page_id)
+#  index_page_topics_on_page_id_and_topic_id  (page_id,topic_id) UNIQUE
+#  index_page_topics_on_topic_id              (topic_id)
+#
+# Foreign Keys
+#
+#  page_id   (page_id => pages.id)
+#  topic_id  (topic_id => topics.id)
+#
 class PageTopic < ApplicationRecord
   belongs_to :page
   belongs_to :topic, counter_cache: :pages_count

app/models/page_topic.rb

@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: topics
+#
+#  id          :integer          not null, primary key
+#  description :text
+#  name        :string
+#  pages_count :integer          default(0), not null
+#  slug        :string           not null
+#  status      :string           default("pending"), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+# Indexes
+#
+#  index_topics_on_pages_count  (pages_count)
+#  index_topics_on_slug         (slug) UNIQUE
+#  index_topics_on_status       (status)
+#
 class Topic < ApplicationRecord
   include Sluggable
 

app/models/topic.rb

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