Refactor to adapter model Page::Sitepressed::Resource

Author: rossta

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
 
-  # alias
-  def resource = sitepress_resource
+  def body_text = Nokogiri::HTML(body_html(format: :atom)).text.squish
 
-  def title = resource.data.title
+  def body_html(format: :html, **) = self.class.render_html(self, format:, **)
 
-  def body = resource.body
+  # alias
 
-  def body_text = Nokogiri::HTML(body_html(format: :atom)).text.squish
+  def revised_on = resource.updated_on
 
-  def body_html(format: :html, **) = self.class.render_html(self, format:, **)
+  def title = resource.title
+
+  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
+  def atom_feed_id = resource.uuid.presence || id
 
-  def author = resource.data.author
+  def author = resource.author
 end

app/models/page/sitepressed.rb

@@ -2,28 +2,80 @@ 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 resource_missing? = sitepress_resource.is_a?(NullResource)
+    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?(NullSitepressResource)
 
     def handler = sitepress_resource.handler
 
@@ -35,16 +87,16 @@ def handler = sitepress_resource.handler
       # 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
@@ -54,14 +106,14 @@ 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

spec/jobs/pages/analyze_topics_job_spec.rb

@@ -31,7 +31,7 @@
 
   describe Pages::AnalyzeTopicsJob::Batch do
     it "doesn’t blow up" do
-      allow(SitepressPage).to receive(:render_html).and_return(Faker::HTML.random)
+      allow(Page).to receive(:render_html).and_return(Faker::HTML.random)
 
       topics = FactoryBot.create_list(:topic, 2)
 

spec/models/page_spec.rb

@@ -22,7 +22,7 @@
     it "represents a sitepress resource" do
       page = FactoryBot.create(:page, request_path: "/")
 
-      expect(page.resource).to eq Sitepress.site.get("/")
+      expect(page.resource).to eq Page::Sitepressed::Resource.from(Sitepress.site.get("/"))
     end
   end
 
@@ -80,7 +80,7 @@
 
       %w[title description image meta_image toc author].each do |method|
         expect(page.send(method)).not_to be_nil, "Expected #{method} to be present"
-        expect(page.send(method)).to eq(page.resource.data.send(method)), "Expected #{method} to match"
+        expect(page.send(method)).to eq(page.sitepress_resource.data.send(method)), "Expected #{method} to match"
       end
     end
   end