Update ArticlePage.published logic

Author: rossta

app/content/models/article_page.rb

@@ -8,21 +8,26 @@ class ArticlePage < Sitepress::Model
   delegate :mime_type, :handler, to: :page
 
   def self.published
-    all
-      .filter { |article| article.published.present? }
+    all.filter(&:published?)
       .sort { |a, b| b.published_on <=> a.published_on } # DESC order
   end
 
   def self.draft
-    all.filter { |article| article.published.blank? }
+    all.filter(&:draft?)
   end
 
+  def published?
+    published_on.presence && published_on <= Date.today
+  end
+
+  def draft? = !published?
+
   def persisted?
     false
   end
 
   def published_on
-    published.to_date
+    published&.to_date
   end
   alias_method :published_at, :published_on
   alias_method :created_at, :published_on

app/content/pages/articles/index.html.erb

@@ -1,3 +1,7 @@
+---
+title: Articles
+description: Read the latest articles from Joy of Rails
+---
 <section>
   <div class="main-content container py-gap lg:py-3xl">
     <% ArticlePage.published.take(20).zip(%w[left right]).each do |(page, side)| %>

spec/requests/site/articles_spec.rb

@@ -0,0 +1,30 @@
+require "rails_helper"
+
+RSpec.describe "Site: articles" do
+  let(:first_article) { ArticlePage.published.first }
+
+  # Filter out index.html.erb from article pages before selecting first draft
+  let(:first_draft) { ArticlePage.draft.lazy.filter { |article| article.page.request_path != "/articles" }.first }
+
+  describe "GET /articles" do
+    it "lists published articles" do
+      get "/articles"
+
+      expect(response).to have_http_status(:ok)
+
+      expect(response.body).to include(first_article.title)
+      expect(response.body).not_to include(first_draft.title)
+    end
+  end
+
+  describe "GET /drafts" do
+    it "lists draft articles" do
+      get "/drafts"
+
+      expect(response).to have_http_status(:ok)
+
+      expect(response.body).to include(first_draft.title)
+      expect(response.body).not_to include(first_article.title)
+    end
+  end
+end

spec/requests/site_spec.rb renamed to spec/requests/site/conditional_get_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "site: http caching" do
+RSpec.describe "Site: http caching" do
   let(:file_path) { Rails.root.join("app", "content", "pages", "articles", "introducing-joy-of-rails.html.mdrb") }
   let(:file) { File.open(file_path) }