Merge pull request #313 from joyofrails/feat/current-page-fix

rossta · web-flow · commit fc6f1d6d9ef2 · 2024-12-10T12:06:00.000-05:00
Refactor away from Current.page
diff --git a/app/content/layouts/article.html.erb b/app/content/layouts/article.html.erb
@@ -1,12 +1,11 @@
-<% page = @page %>
 <% set_meta_tags(
-     title: page.title,
-     description: page.description,
+     title: current_page.title,
+     description: current_page.description,
      keywords: %w[rails hotwire],
      og: {
        type: "article",
-       url: page.request_path,
-       image: page.meta_image && asset_url(page.meta_image)
+       url: current_page.request_path,
+       image: current_page.meta_image && asset_url(current_page.meta_image)
      },
      twitter: {
        card: "summary"
@@ -16,11 +15,11 @@
 <%= render_layout "application" do %>
   <article itemscope itemtype="http://schema.org/Article" class="mb-3xl">
     <%= render Pages::Header::Container.new do |c| %>
-      <%= c.title { page.title } %>
-      <%= c.description { page.description } if page.description %>
-      <%= render Pages::Timestamp.new published_on: page.published_on, updated_on: page.revised_on, class: "text-small block" %>
+      <%= c.title { current_page.title } %>
+      <%= c.description { current_page.description } if current_page.description %>
+      <%= render Pages::Timestamp.new published_on: current_page.published_on, updated_on: current_page.revised_on, class: "text-small block" %>
       <div class="text-small">
-        <% topics = @page.topics.approved.pluck(:slug) %>
+        <% topics = current_page.topics.approved.pluck(:slug) %>
         <% if topics.present? %>
           <%= render Pages::Topics.new(topics: topics) %>
         <% end %>
@@ -29,8 +28,8 @@
     <div class="article-content container" itemprop="articleBody">
       <%= yield %>
 
-      <% cache [@page, :related_pages] do %>
-        <% related_pages = @page.related_pages.published.limit(3) %>
+      <% cache [@current_page, :related_pages] do %>
+        <% related_pages = @current_page.related_pages.published.limit(3) %>
         <% if related_pages.present? %>
           <h3>More articles to enjoy</h3>
           <ul class="list-none">
@@ -54,6 +53,6 @@
   </section>
 <% end %>
 
-<% if page.enable_twitter_widgets %>
+<% if current_page.enable_twitter_widgets %>
 <%= javascript_include_tag "https://platform.twitter.com/widgets.js", charset: "utf-8", async: true %>
 <% end %>
diff --git a/app/content/models/sitepress_page.rb b/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
diff --git a/app/content/pages/articles/what-you-need-to-know-about-sqlite.html.mdrb b/app/content/pages/articles/what-you-need-to-know-about-sqlite.html.mdrb
@@ -17,7 +17,7 @@ It’s basically this: computers have gotten faster, and Rails has finally figur
 
 With the recent release of Rails 8, it’s easier than ever to choose SQLite as your primary database for production. The question is, _should you?_
 
-<%= render Share::Polls::LazyPagePoll.new(Current.page, "SQLite on Rails Live Poll", "How likely are you to use SQLite in your next Rails app?" => ["Definitely! 🎸", "Strongly considering 💪", "On the fence ⚖️", "Maybe, but not likely 👻", "No way 🚫"]) %>
+<%= render Share::Polls::LazyPagePoll.new(@current_page, "SQLite on Rails Live Poll", "How likely are you to use SQLite in your next Rails app?" => ["Definitely! 🎸", "Strongly considering 💪", "On the fence ⚖️", "Maybe, but not likely 👻", "No way 🚫"]) %>
 
 ## SQLite3::Database.open
 
diff --git a/app/content/pages/articles/zee-kitchen-sink-permanent-draft.html.mdrb b/app/content/pages/articles/zee-kitchen-sink-permanent-draft.html.mdrb
@@ -13,4 +13,4 @@ tags:
 
 ## Inline Poll Demo
 
-<%= render Share::Polls::LazyPagePoll.new(Current.page, "SQLite on Rails Poll", "How likely are you to use SQLite in your Rails app?" => ["100%", "Strongly considering", "On the fence", "Not very, but open minded", "No way"]) if Current.page %>
+<%= render Share::Polls::LazyPagePoll.new(@current_page, "SQLite on Rails Poll", "How likely are you to use SQLite in your Rails app?" => ["100%", "Strongly considering", "On the fence", "Not very, but open minded", "No way"]) %>
diff --git a/app/content/pages/index.html.erb b/app/content/pages/index.html.erb
@@ -9,7 +9,7 @@ title: Joy of Rails
       Experience the<br><span class="text-gradient">Joy of Ruby on Rails</span>
     <% end %>
     <p>
-      Interactive lessons to learn the framework that will make you fall in love with building web apps all over again 💜
+      Interactive lessons in the framework that will make you fall in love with building web apps all over again 💜
     </p>
   </div>
 <% end %>
diff --git a/app/controllers/concerns/current_page.rb b/app/controllers/concerns/current_page.rb
@@ -0,0 +1,11 @@
+module CurrentPage
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :current_page
+  end
+
+  def current_page
+    @current_page
+  end
+end
diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
@@ -1,4 +1,6 @@
 class FeedController < ApplicationController
+  include CurrentPage
+
   def index
     @articles = Page.published.order(published_at: :desc).limit(50)
 
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
@@ -1,13 +1,18 @@
 class SiteController < Sitepress::SiteController
+  include CurrentPage
+
+  before_action do
+    @current_page = Page.find_or_initialize_by(request_path: request.path)
+  end
+
   # This is the default controller for Sitepress. It is used to render the pages of the site.
   # We prefer not to override this method but instead use the hooks provided by Sitepress below.
   #
   # render_resource is a helper method provided by Sitepress to render the current resource.
   # requested_resource is the Sitepress::Resource object that represents the current page.
   #
-  def show
-    Current.page = @page = Page.find_or_initialize_by(request_path: request.path)
 
+  def show
     super
   end
 
diff --git a/app/javascript/test/fixtures/views/searches/combobox.html b/app/javascript/test/fixtures/views/searches/combobox.html
@@ -5,7 +5,7 @@
             dialog:open@window->search-combobox#openInTarget
           "><form data-controller="autosubmit-form" data-autosubmit-delay-value="300" data-autosubmit-minimum-length-value="3" data-turbo-frame="search" action="/search" accept-charset="UTF-8" method="post"><div class="flex items-center flex-row pl-2 col-gap-xs"><svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1200 1200" class="w-[32px] fill-current text-theme">
   <path d="m1135.2 986.4-254.4-226.8c124.8-181.2 105.6-430.8-55.199-591.6-181.2-182.4-476.4-182.4-657.6 0-182.4 181.2-182.4 476.4 0 658.8 160.8 160.8 410.4 178.8 591.6 55.199l226.8 253.2c38.398 43.199 105.6 45.602 146.4 3.6016l6-6c40.801-40.801 39.598-108-3.6016-146.4zm-422.4-273.6c-120 120-313.2 120-432 0-120-120-120-313.2 0-432 120-120 313.2-120 432 0 120 120 120 313.2 0 432z"></path>
-</svg><label for="query" class="sr-only">Query</label> <input value="Rails" autofocus="autofocus" role="combobox" aria-expanded="false" aria-autocomplete="none" aria-controls="search-listbox" aria-owns="search-listbox" aria-haspopup="listbox" aria-activedescendant="" id="search-combobox" data-action="
+</svg><label for="search-combobox" class="sr-only">Query</label> <input value="Rails" autofocus="autofocus" role="combobox" aria-expanded="false" aria-autocomplete="none" aria-controls="search-listbox" aria-owns="search-listbox" aria-haspopup="listbox" aria-activedescendant="" id="search-combobox" data-action="
                   focus-&gt;combobox#tryOpen
                   input-&gt;autosubmit-form#submit
                 " placeholder="Search Joy of Rails" class="w-full step-1" type="search" name="query" /></div><input value="search" autocomplete="off" type="hidden" name="name" id="name" /></form><ul id="search-listbox" role="listbox" class="grid" data-controller="search-listbox"><li aria-label="Here’the thing" role="option" id="search-option_search_result_articles-heres-the-thing" class="rounded"><a href="/articles/heres-the-thing"><div>Here’the thing</div><div>Ruby is a programming language</div></a></li><li aria-label="Introducing Joy of Rails" role="option" id="search-option_search_result_articles-joy-of-rails" class="rounded"><a href="/articles/joy-of-rails"><div>Introducing Joy of Rails</div><div>Rails is a web application framework</div></a></li></ul></div>
diff --git a/app/models/current.rb b/app/models/current.rb
@@ -2,5 +2,4 @@ class Current < ActiveSupport::CurrentAttributes
   attribute :admin_user
   attribute :user
   attribute :color_scheme
-  attribute :page
 end
diff --git a/app/models/page.rb b/app/models/page.rb
@@ -42,32 +42,31 @@ def published? = !!published_at
 
   def published_on = published_at&.to_date
 
-  def revised_on = resource.data.updated&.to_date
-
   def indexed? = !!indexed_at
 
+  def body_text = Nokogiri::HTML(body_html(format: :atom)).text.squish
+
+  def body_html(format: :html, **) = self.class.render_html(self, format:, **)
+
   # alias
-  def resource = sitepress_resource
 
-  def title = resource.data.title
+  def revised_on = resource.updated_on
 
-  def body = resource.body
+  def title = resource.title
 
-  def body_text = Nokogiri::HTML(SitepressPage.render_html(resource)).text.squish
+  def body = resource.body
 
-  def description = resource.data.description
+  def description = resource.description
 
-  def image = resource.data.image
+  def image = resource.image
 
-  def meta_image = resource.data.meta_image
+  def meta_image = resource.meta_image
 
-  def toc = resource.data.toc
+  def toc = resource.toc
 
-  def enable_twitter_widgets = resource.data.enable_twitter_widgets
+  def enable_twitter_widgets = resource.enable_twitter_widgets
 
-  def atom_feed_id
-    resource.data.uuid.presence || id
-  end
+  def atom_feed_id = resource.uuid.presence || id
 
-  def author = resource.data.author
+  def author = resource.author
 end
diff --git a/app/models/page/sitepressed.rb b/app/models/page/sitepressed.rb
@@ -2,28 +2,82 @@ class Page
   module Sitepressed
     extend ActiveSupport::Concern
 
-    NullResource = Data.define(:request_path) do
-      def data = NullData.new(title: nil, description: nil)
+    Resource = Data.define(
+      :request_path,
+      :body,
+      :title,
+      :description,
+      :image,
+      :meta_image,
+      :toc,
+      :enable_twitter_widgets,
+      :uuid,
+      :author,
+      :published_on,
+      :updated_on
+    ) do
+      def published_at = published_on&.to_time&.middle_of_day
+
+      def revised_at = updated_on&.to_time&.middle_of_day
+
+      def self.from(sitepress_resource)
+        Resource.new \
+          request_path: sitepress_resource.request_path,
+          body: sitepress_resource.body,
+          title: sitepress_resource.data.title,
+          description: sitepress_resource.data.description,
+          image: sitepress_resource.data.image,
+          meta_image: sitepress_resource.data.meta_image,
+          toc: sitepress_resource.data.toc,
+          enable_twitter_widgets: sitepress_resource.data.enable_twitter_widgets,
+          uuid: sitepress_resource.data.uuid,
+          author: sitepress_resource.data.author,
+          published_on: sitepress_resource.data.published&.to_date,
+          updated_on: sitepress_resource.data.updated&.to_date
+      end
+    end
+
+    NullSitepressResource = Data.define(:request_path) do
+      def data = NullSitpressData.new
+
+      def handler = "html"
 
       def body = ""
     end
 
-    NullData = Data.define(:title, :description) do
+    class NullSitpressData
+      def title = nil
+
+      def description = nil
+
+      def toc = nil
+
+      def enable_twitter_widgets = nil
+
       def uuid = nil
 
+      def author = nil
+
+      def published = nil
+
+      def updated = nil
+
       def image = "articles/placeholder.jpg"
 
-      def author = nil
+      def meta_image = image
     end
 
-    def sitepress_resource = Sitepress.site.get(request_path) ||
-      NullResource.new(request_path: request_path)
+    def resource = Resource.from(sitepress_resource)
 
-    def upsert_page_from_sitepress!
-      self.class.upsert_page_from_sitepress!(sitepress_resource)
-    end
+    def sitepress_resource = @sitepress_resource ||= Sitepress.site.get(request_path) || NullSitepressResource.new(request_path: request_path)
+
+    def upsert_page_from_sitepress! = upsert_page_from_resource!
+
+    def upsert_page_from_resource! = self.class.upsert_page_from_resource!(resource)
 
-    def resource_missing? = sitepress_resource.is_a?(NullResource)
+    def resource_missing? = sitepress_resource.is_a?(NullSitepressResource)
+
+    def handler = sitepress_resource.handler
 
     class_methods do
       # We currently have a dual system of content management between Sitepress and
@@ -33,16 +87,16 @@ def resource_missing? = sitepress_resource.is_a?(NullResource)
       # the split personality for now.
       #
       def upsert_collection_from_sitepress!(limit: nil)
-        enum = SitepressPage.all.resources.lazy
+        enum = SitepressPage.all.resources.lazy.map { |s| Resource.from(s) }
 
         if limit
-          enum = enum.filter do |sitepress_resource|
-            find_by(request_path: sitepress_resource.request_path).nil?
+          enum = enum.filter do |resource|
+            find_by(request_path: resource.request_path).nil?
           end
         end
 
-        enum = enum.map do |sitepress_resource|
-          upsert_page_from_sitepress!(sitepress_resource)
+        enum = enum.map do |resource|
+          upsert_page_from_resource!(resource)
         end
 
         if limit
@@ -52,17 +106,30 @@ def upsert_collection_from_sitepress!(limit: nil)
         enum.to_a
       end
 
-      def upsert_page_by_request_path!(request_path)
-        upsert_page_from_sitepress!(Sitepress.site.get(request_path))
-      end
+      def upsert_page_by_request_path!(request_path) = upsert_page_from_sitepress!(Sitepress.site.get(request_path))
+
+      def upsert_page_from_sitepress!(sitepress_resource) = upsert_page_from_resource! Resource.from(sitepress_resource)
 
-      def upsert_page_from_sitepress!(sitepress_resource)
-        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
+      def upsert_page_from_resource!(resource)
+        page = find_or_initialize_by(request_path: resource.request_path)
+        page.published_at = resource.published_at if resource.published_at
+        page.updated_at = resource.revised_at if resource.revised_at # Should use a `Page#revised_at` column instead
         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
diff --git a/app/views/components/atom/entry_content.rb b/app/views/components/atom/entry_content.rb
diff --git a/app/views/feed/index.atom.builder b/app/views/feed/index.atom.builder
diff --git a/spec/jobs/pages/analyze_topics_job_spec.rb b/spec/jobs/pages/analyze_topics_job_spec.rb
diff --git a/spec/models/page_spec.rb b/spec/models/page_spec.rb
diff --git a/spec/views/components/atom/entry_content_spec.rb b/spec/views/components/atom/entry_content_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ tags:`
`13`	`13`
`14`	`14`	`## Inline Poll Demo`
`15`	`15`
`16`		`-<%= render Share::Polls::LazyPagePoll.new(Current.page, "SQLite on Rails Poll", "How likely are you to use SQLite in your Rails app?" => ["100%", "Strongly considering", "On the fence", "Not very, but open minded", "No way"]) if Current.page %>`
	`16`	`+<%= render Share::Polls::LazyPagePoll.new(@current_page, "SQLite on Rails Poll", "How likely are you to use SQLite in your Rails app?" => ["100%", "Strongly considering", "On the fence", "Not very, but open minded", "No way"]) %>`