Merge pull request #273 from joyofrails/feat/topics

Add Topics

Author: rossta

Gemfile

@@ -55,6 +55,7 @@ gem "honeybadger" # Error monitoring and uptime reporting [https://www.honeybadg
 gem "litestream" # Standalone streaming replication for SQLite [https://litestream.io]
 gem "web-push" # Web Push library for Ruby [https://github.com/pushpad/web-push]
 gem "aws-sdk-s3" # Official AWS Ruby gem for Amazon S3 [https://github.com/aws/aws-sdk-ruby]
+gem "ruby-openai" # Use OpenAPI in Ruby [https://github.com/alexrudall/ruby-openai]
 
 # Admin
 gem "flipper-ui" # UI for the Flipper gem [https://www.flippercloud.io/docs/ui]

Gemfile.lock

@@ -194,13 +194,22 @@ GEM
     erubis (2.7.0)
     et-orbi (1.2.11)
       tzinfo
+    event_stream_parser (1.0.0)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.3.0)
+      net-http
     ferrum (0.15)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
@@ -317,7 +326,10 @@ GEM
       stimulus-rails
       turbo-rails
     msgpack (1.7.3)
+    multipart-post (2.4.1)
     nested_form (0.3.2)
+    net-http (0.5.0)
+      uri
     net-imap (0.5.0)
       date
       net-protocol
@@ -466,6 +478,10 @@ GEM
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-openai (7.3.1)
+      event_stream_parser (>= 0.3.0, < 2.0.0)
+      faraday (>= 1)
+      faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
@@ -587,8 +603,6 @@ GEM
     zeitwerk (2.7.1)
 
 PLATFORMS
-  arm64-darwin-22
-  arm64-darwin-23
   arm64-darwin-24
   x86_64-linux
 
@@ -637,6 +651,7 @@ DEPENDENCIES
   reek
   rouge
   rspec-rails
+  ruby-openai
   scout_apm
   simplecov
   simplecov-cobertura

app/content/layouts/article.html.erb

@@ -13,7 +13,7 @@
    ) %>
 <%= render "application/skip_to_content" %>
 <%= render_layout "application" do %>
-  <article itemscope itemtype="http://schema.org/Article">
+  <article itemscope itemtype="http://schema.org/Article" class="mb-3xl">
     <%= render Pages::Header.new(
           title: current_page.data.title!,
           description: current_page.data.description,
@@ -33,9 +33,14 @@
         </nav>
       </aside>
     <%- end -%>
-    <div class="article-content container mb-3xl" itemprop="articleBody">
+    <div class="article-content container" itemprop="articleBody">
       <%= yield %>
     </div>
+    <% if @page.topics.any? %>
+      <section id="article-topics" class="section-content container">
+        <%= render Pages::Topics.new(topics: @page.topics.pluck(:slug)) %>
+      </section>
+    <% end %>
   </article>
   <section id="newsletter-signup">
     <%= render "users/newsletter_subscriptions/banner" %>

app/content/models/sitepress_article.rb

@@ -5,12 +5,16 @@ class SitepressArticle < Sitepress::Model
   collection glob: "articles/*.html*"
   data :title, :published, :updated, :summary, :description, :tags, :image
 
-  delegate :mime_type, :handler, to: :page
+  delegate :resource_path, :mime_type, :handler, to: :page
 
   def self.published(params = {})
-    all
+    take_published(all)
+  end
+
+  def self.take_published(articles, params = {})
+    articles
       .filter { |article| article.published?(preview: params[:preview]) }
-      .sort { |a, b| b.published_on <=> a.published_on } # DESC order
+      .sort { |a, b| b.published_on <=> a.published_on }
   end
 
   def self.draft

app/content/models/sitepress_page.rb

@@ -1,4 +1,17 @@
 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

app/content/models/sitepress_slash_page.rb

@@ -4,6 +4,6 @@
 # https://slashpages.net/
 #
 class SitepressSlashPage < Sitepress::Model
-  collection glob: "{about,contact,settings}/**/*.html*"
+  collection glob: "{about,contact,settings,deploy}/**/*.html*"
   data :title
 end

app/content/pages/articles/web-push-notifications-from-rails.html.mdrb

@@ -18,7 +18,9 @@ You may have heard news: Rails 8 will extract a new framework for Web Push in Ra
 
 <%= image_tag "articles/web-push-notifications-from-rails/a-web-push-notification.jpg", alt: "A Web Push Notification" %>
 
-In advance of [Rails Action Notifier](https://github.com/rails/rails/issues/50454), it may be helpful to know how things will work under the hood. In this article, we’ll cover the basics of implementing Web Push yourself with Rails.
+Web Push is a technology enabled by making your Rails app a Progressive Web Application (PWA). With Rails 8, new apps are PWAs by default.
+
+And with the pending release [Rails Action Notifier](https://github.com/rails/rails/issues/50454), due in Rails 8.1, it may be helpful to know how things will work under the hood. In this article, we’ll cover the basics of implementing Web Push yourself with Rails.
 
 This article has something you won’t find in most posts about Web Push: a working demo! (in supporting browsers and devices) 😅. Try it below.
 

app/content/pages/index.html.erb

@@ -9,7 +9,8 @@ title: Joy of Rails
       <%= render Pages::Summary.from_page(page, side: side) %>
     <% end %>
 
-    <%= render Pages::List.new(articles.drop(3).take(6), class: "mt-16") %>
+    <h3 class="mt-16">More articles</h3>
+    <%= render Pages::List.new(articles.drop(3).take(6)) %>
   </div>
 </section>
 <section>

app/controllers/site_controller.rb

@@ -5,9 +5,11 @@ class SiteController < Sitepress::SiteController
   # 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
-  #   render_resource requeste_resource
-  # end
+  def show
+    @page = Page.find_or_initialize_by(request_path: request.path)
+
+    super
+  end
 
   protected
 
@@ -19,7 +21,7 @@ class SiteController < Sitepress::SiteController
   #
   # For example, the rendition could be modified via `Nokogiri::HTML5::DocumentFragment(rendition)`.
   #
-  # @param rendition [Sitepress::Rendition] Rendered representatio of current_resource
+  # @param rendition [Sitepress::Rendition] Rendered representation of current_resource
   #
   def process_rendition(rendition)
   end

app/controllers/topics_controller.rb

@@ -0,0 +1,10 @@
+class TopicsController < ApplicationController
+  def index
+    @topics = Topic.approved.with_pages.order(name: :asc)
+  end
+
+  def show
+    @topics = Topic.approved.with_pages.order(name: :asc)
+    @topic = Topic.find_by!(slug: params[:slug])
+  end
+end