Merge pull request #5 from harrison-broadbent/v1.4

v1.4 — RSS feeds & updates

Author: harrison-broadbent

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.2.2

.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 # Standard Middleman Gems:
 #
-gem "middleman", "~> 4.5"
+gem "middleman", "~> 4.6"
 gem "middleman-autoprefixer", "~> 3.0"
 gem "middleman-blog", "~> 4.0.3"    # blog support
 gem "middleman-livereload"          # live dev reloading
@@ -17,6 +17,6 @@ gem "nokogiri"                      # blog post summaries
 # Misc gems (from Middleman):
 #
 gem "builder"                       # supports .builder.xml for sitemap
-gem "terser", "~> 1.1"              # minifies .js files
-gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby, :x64_mingw]
+gem "terser", "~> 1.2"              # minifies .js files
+gem "tzinfo-data"
 gem "wdm", "~> 0.1", platforms: [:mswin, :mingw, :x64_mingw]

Gemfile.lock

@@ -1,91 +1,110 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    autoprefixer-rails (10.4.19.0)
+    autoprefixer-rails (10.4.21.0)
       execjs (~> 2)
-    backports (3.25.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.4)
-    contracts (0.16.1)
-    dotenv (3.1.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.1)
+    contracts (0.17.2)
+    dotenv (3.1.8)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    erubis (2.7.0)
+    erubi (1.13.1)
     eventmachine (1.2.7)
-    execjs (2.9.1)
+    execjs (2.10.0)
     fast_blank (1.0.1)
-    fastimage (2.3.1)
-    ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
+    fastimage (2.4.0)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.6.0)
+    hashie (5.0.0)
     http_parser.rb (0.8.0)
-    i18n (1.6.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    kramdown (2.4.0)
-      rexml
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     memoist (0.16.2)
-    middleman (4.5.1)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.5.1)
-      middleman-core (= 4.5.1)
+    middleman (4.6.0)
+      middleman-cli (= 4.6.0)
+      middleman-core (= 4.6.0)
     middleman-autoprefixer (3.0.0)
       autoprefixer-rails (~> 10.0)
       middleman-core (>= 4.0.0)
     middleman-blog (4.0.3)
       addressable (~> 2.3)
       middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-cli (4.5.1)
+    middleman-cli (4.6.0)
       thor (>= 0.17.0, < 1.3.0)
-    middleman-core (4.5.1)
-      activesupport (>= 6.1, < 7.1)
+    middleman-core (4.6.0)
+      activesupport (>= 6.1)
       addressable (~> 2.4)
-      backports (~> 3.6)
       bundler (~> 2.0)
-      contracts (~> 0.13, < 0.17)
+      coffee-script (~> 2.2)
+      contracts
       dotenv
-      erubis
+      erubi
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
+      haml (>= 4.0.5)
       hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 1.6.0)
+      hashie (>= 3.4, < 6.0)
+      i18n (>= 1.6, < 1.15)
+      kramdown (~> 2.4)
       listen (~> 3.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.15.0)
       parallel
-      rack (>= 1.4.5, < 3)
+      rack (>= 3)
+      rackup
       sassc (~> 2.0)
       servolux
-      tilt (~> 2.0.9)
+      tilt (~> 2.2)
       toml
-      uglifier (~> 3.0)
+      uglifier (>= 3, < 5)
       webrick
     middleman-livereload (3.4.7)
       em-websocket (~> 0.5.1)
@@ -94,63 +113,83 @@ GEM
     middleman-syntax (3.4.0)
       middleman-core (>= 3.2)
       rouge (~> 3.2)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    minitest (5.25.5)
+    nokogiri (1.18.7-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.7-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.7-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.7-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.7-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.7-x86_64-linux-musl)
       racc (~> 1.4)
     padrino-helpers (0.15.3)
       i18n (>= 0.6.7, < 2)
       padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
     padrino-support (0.15.3)
-    parallel (1.26.3)
+    parallel (1.27.0)
     parslet (2.0.0)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (3.1.13)
     rack-livereload (0.3.17)
       rack
+    rackup (2.2.1)
+      rack (>= 3)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.5)
-      strscan
+    rexml (3.4.1)
     rouge (3.30.0)
     sassc (2.4.0)
       ffi (~> 1.9)
+    securerandom (0.4.1)
     servolux (0.13.0)
-    strscan (3.1.0)
     temple (0.10.3)
-    terser (1.2.3)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.2.2)
-    tilt (2.0.11)
+    tilt (2.6.0)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (3.2.0)
+    tzinfo-data (1.2025.2)
+      tzinfo (>= 1.0.0)
+    uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    webrick (1.8.1)
+    uri (1.0.3)
+    webrick (1.9.1)
 
 PLATFORMS
-  arm64-darwin-22
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   builder
   kramdown
   kramdown-parser-gfm
-  middleman (~> 4.5)
+  middleman (~> 4.6)
   middleman-autoprefixer (~> 3.0)
   middleman-blog (~> 4.0.3)
   middleman-livereload
   middleman-syntax (~> 3.4.0)
   nokogiri
-  terser (~> 1.1)
+  terser (~> 1.2)
   tzinfo-data
   wdm (~> 0.1)
 

README.md

@@ -1,4 +1,6 @@
-# Ruby Middleman Tailwind Starter Blog
+# Ruby, Middleman & Tailwind Starter Blog template
+
+Live demo: [Ruby, Middleman & Tailwind starter blog](https://ruby-middleman-tailwind-starter-blog.pages.dev)
 
 A Middleman blog template configured with TailwindCSS, markdown parsing, code highlighting, a sitemap.xml and more. It perfect for lightweight blogging or a personal website. Ruby knowledge is helpful, but not necessary.
 
@@ -15,8 +17,6 @@ A Middleman blog template configured with TailwindCSS, markdown parsing, code hi
 - Perfect 100/100 PageSpeed score (near perfect for mobile)
 - Github Action for image compression (see `compress_images.yml`).
 
-Visit the [live template demo](https://ruby-middleman-tailwind-starter-bl-harrison-broadbents-projects.vercel.app/) for a preview of how it looks (although of course, you can customize it yourself).
-
 I've used [Middleman](https://middlemanapp.com/) for years to build my [personal website](https://harrisonbroadbent.com/about), and this template consolidates everything I've learned.
 
 ## Getting started
@@ -26,19 +26,22 @@ Before you get started, make sure you've got Ruby installed. Currently, this tem
 Clone this template, then install the required packages and start the server:
 
 ```sh
-# install packages
-bundle        # Ruby
-npm install   # JS (only for TailwindCSS)
+# install packages (ruby packages + Tailwind CSS javascript package)
+bundle
+npm install
 
 # start dev server
 bin/dev
 ```
 
 ## Deploying
 
-This template is easy to deploy. Any static site host should work; I've included the Netlify + Vercel "Deploy" buttons below.
+This template is easy to deploy. Any static site host should work; I've included the Cloudflare, Netlify & Vercel "Deploy" buttons below.
+
+|            |                                                                                                                                                                                                   |
+| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Cloudflare | [![Deploy to Cloudflare](https://deploy.workers.cloudflare.com/button)](https://deploy.workers.cloudflare.com/?url=https://github.com/harrison-broadbent/ruby-middleman-tailwind-starter-blog)    |
+| Netlify    | [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/harrison-broadbent/ruby-middleman-tailwind-starter-blog) |
+| Vercel     | [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fharrison-broadbent%2Fruby-middleman-tailwind-starter-blog)              |
 
-|         |                                                                                                                                                                                                   |
-| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Netlify | [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/harrison-broadbent/ruby-middleman-tailwind-starter-blog) |
-| Vercel  | [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fharrison-broadbent%2Fruby-middleman-tailwind-starter-blog)              |
+> Note: These days I use Cloudflare for all my hosting and I can heartily recommend them. I [switched from Cloudflare to Netlify](https://harrisonbroadbent.com/blog/goodbye-netlify-hello-cloudflare/) a while ago and haven't looked back.

config.rb

@@ -1,13 +1,14 @@
 # Template config
 #
-set :site_url, "https://ruby-middleman-tailwind-starter-blog.netlify.app/" # for sitemap.xml.builder
-set :site_title, "Ruby+Middleman+Tailwind Starter Kit"                     # site title for <title> meta tag
+set :site_url, "https://ruby-middleman-tailwind-starter-blog.pages.dev" # for sitemap.xml.builder
+set :site_title, "Ruby, Middleman & Tailwind Starter Kit"                     # site title for <title> meta tag
 set :trailing_slash, false                                                 # turn site.com/home/ -> site.com/home
 
 # Extensions
 #
 activate :livereload                # live-reloading in dev
 activate :directory_indexes         # for pretty URLs
+activate :asset_hash          	    # hash assets for better caching
 activate :autoprefixer do |prefix|
   prefix.browsers = "last 2 versions"
 end

source/blog/other_template_features.html.md

@@ -26,11 +26,13 @@ server: middleman server
 css: npx @tailwindcss/cli -i ./source/stylesheets/main.css -o ./source/stylesheets/tailwind.css --watch
 ```
 
-## TailwindCSS
+## Tailwind CSS v4.1
 
 [TailwindCSS](https://tailwindcss.com/) is included in this template natively. You'll need `nodejs` / `npx` available to install and run it locally.
 
-Within `tailwind.config.js` I've configured TailwindCSS with the correct `content:` paths to parse the files in this template. I've also included the `typography` plugin for rendering markdown (once parsed into HTML via kramdown) using the `prose` class in the `markdown_layout.erb`.
+With Tailwind v4, we simply run Tailwind from the command line in the `Procfile.dev`, and it automatically rebuilds the stylesheet when anything changes.
+
+Tailwind CSS includes the `typography` plugin for rendering markdown (once parsed into HTML via kramdown) using the `prose` class in the `markdown_layout.erb`.
 
 ```erb
 <%# layouts/markdown_layout.erb %>
@@ -59,7 +61,7 @@ Everything should just work. When you save a file locally, the Middleman develop
 
 The `directory_indexes` extension is used for [pretty URLs](https://middlemanapp.com/advanced/pretty-urls/). With this activated, the URL paths Middleman generates look like `/blog` and `/about`, rather than `/blog.html` and `/about.html`.
 
-## Sitemaps
+## Sitemap & RSS feed
 
 I've included a sitemap at `source/sitemap.xml.builder`. This uses the `builder` gem to automatically generate a sitemap for your site:
 
@@ -76,3 +78,23 @@ end
 ```
 
 Make sure you update `site_url` to match the production URL of your website. You can preview your sitemap at `localhost:4567/sitemap.xml`.
+
+A similar file exists for your RSS feed, located in `source/feed.xml.builder`. It builds a valid RSS feed and renders it at `/feed.xml`.
+
+```ruby
+
+posts = blog.articles.sort_by(&:date).reverse
+
+xml.instruct! :xml, version: "1.0", encoding: "utf-8"
+xml.rss version: "2.0" do
+  xml.channel do
+    ...
+
+    posts.each do |post|
+      ...
+    end
+  end
+end
+```
+
+> If you interested in the `builder` gem and creating this RSS feed, I've written more about it here — [Add an RSS feed to your Middleman blog (harrisonbroadbent.com)](https://harrisonbroadbent.com/blog/middleman-rss-feed/)