willamette 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ba226dec5ae8415607d57cd071bd83677e191c9e8d8f165fd664b8a15ede8eb
-  data.tar.gz: 69037fb05b3ba2dd3398db6ecbcc32db312a5cf2487820d9cff2c036e0d36d50
+  metadata.gz: b14600bc1b9466fbdeaae3e1add8e22c329a429809c59a352078980a79f12632
+  data.tar.gz: f5df323495a95da1c249714d97872e0e0502ca7804927988f8e6396a46d5d4b9
 SHA512:
-  metadata.gz: 580fc1a9c6f76ac9043d9bf1cccde630cfa90d9891039eab5eda0fd1b48bb3262aeca64d5445c3220b386dae119a20138f862ab26c97f959ff5814a12a740073
-  data.tar.gz: b5722b5511bbf10a521495246209e83f9f26ff49bb4da13a857d73ad8a8004631094ee889f09393a8dcebe54e25fd6d8f785b82a3d8a05192da520863d646199
+  metadata.gz: 5fd4dff6fc3f50dab2807d5a55b03219a9e7c84fcf40f9a8782f7826162676dc4157447bf7b14cfc87a5a10803f3cd663f4aabbfbac0edcccc1a462720405953
+  data.tar.gz: b7d4a23d04a9490b52d2eb139bbc0127b81a3f9b3a9725ca830c66c590e1b9d0e4bed76a96b1a11741390db5cda0d63a566a4b0760726c7d09a264ac8700788e

data/CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - ...
 
+## [0.6.0] - 2026-04-23
+
+- Clean up layout settings, improve blockquotes and image bleeds
+- Add post metadata component, icons, improved styles
+
+## [0.5.2] - 2026-04-03
+
+- Add `author_name` resource extension method
+
 ## [0.5.1] - 2026-04-02
 
 - Remove `swap` display from fonts CSS

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    willamette (0.5.1)
+    willamette (0.6.0)
       bridgetown (>= 2.1, < 3.0)
       nokolexbor (>= 0.6)
 

data/automations/components.automation.rb

@@ -70,7 +70,7 @@ create_file "src/_components/shared/sidebar.erb" do <<~HTML
 
   <% if strategy.explore? %>
     <details open>
-      <summary><h2><wa-icon class="show-for-mobile" name="bars"></wa-icon>
+      <summary><h2><wa-icon class="show-small-screen" name="bars"></wa-icon>
         <%= t "documentation.explore" %>
       </h2></summary>
 
@@ -82,7 +82,7 @@ create_file "src/_components/shared/sidebar.erb" do <<~HTML
 
   <% if strategy.follow? %>
     <details open>
-      <summary><h2><wa-icon class="show-for-mobile" name="bars"></wa-icon> <%= t "marketing.follow" %></h2></summary>
+      <summary><h2><wa-icon class="show-small-screen" name="bars"></wa-icon> <%= t "marketing.follow" %></h2></summary>
 
       <nav>
         <%= strategy.follow_links %>

data/automations/layouts.automation.rb

@@ -40,22 +40,17 @@ create_file "src/_layouts/post.erb" do <<~ERB
       image_alt = data.image.is_a?(String) ? t("content.featured_post_image") : data.image.alt
       image_caption = data.image.is_a?(String) ? nil : data.image.caption
   %>
-    <figure class="full-main-<%= data.image_bleed ? "bleed" : "size" %>">
+    <figure class="<%= data.image_bleed ? "inline-bleed" : "" %>">
       <img src="<%= image_path %>" alt="" />
       <% if image_caption %>
         <figcaption><%= markdownify image_caption %></figcaption>
       <% end %>
     </figure>
   <% end %>
- 
+
   <%= yield %>
- 
-  <hr />
- 
-  <wa-icon class="article-metadata" name="newspaper"></wa-icon>
-  <p class="article-metadata"><article-author>by So and So</article-author></p>
-  <p class="article-metadata"><time><%= pipe(resource.date) { to_date | l(format: :long) } %></time></p>
-  <p class="article-metadata"><article-tags>#foo #BarBaz</article-tags></p>
+
+  <%= render Willamette::PostMetadata.new(post: resource) %>
 
   </article>
 ERB

data/components/willamette/post_metadata.erb

@@ -0,0 +1,15 @@
+<wll-post-metadata>
+  <wa-icon class="wll-decoration" name="newspaper"></wa-icon>
+  <p><wa-icon name="calendar"></wa-icon> <time><%= pipe(@post.date) { to_date | l(format: :long) } %></time></p>
+  <p><wa-icon name="user-pen"></wa-icon> <wll-post-author>by <%= @post.author_name %></wll-post-author></p>
+  <% if @post.data.categories.length.positive? %>
+    <p><wa-icon name="paperclip"></wa-icon> <% @post.data.categories.each do |category| %>
+      <wll-post-category><%= t("categories.#{category}", default: category) %></wll-post-category>
+    <% end %></p>
+  <% end %>
+  <% if @post.data.tags.length.positive? %>
+    <p><wa-icon name="tags"></wa-icon> <% @post.data.tags.each do |tag| %>
+      <wll-post-tag>#<%= tag %></wll-post-tag>
+    <% end %></p>
+  <% end %>
+</wll-post-metadata>

data/components/willamette/post_metadata.rb

@@ -0,0 +1,5 @@
+class Willamette::PostMetadata < Bridgetown::Component
+  def initialize(post:)
+    @post = post
+  end
+end

data/layouts/willamette/default.erb

@@ -3,14 +3,18 @@
   <head>
     <%= render "head", metadata: site.metadata, title: data.title %>
   </head>
-  <body class="OFF:wll-grid-lines OFF:wll-code-dark <%= data.layout %> <%= data.page_class %>">
+  <body class="<%=
+    class_map("wll-grid-lines": site.config.willamette.layout.grid_lines, "wll-code-dark": site.config.willamette.layout.code_dark)
+  %> <%= data.layout %> <%= data.page_class %>">
     <%= dsd do %>
       <%= render Willamette::HolyGrailLayout.new %>
     <% end %>
     <%= render Shared::Navbar.new(metadata: site.metadata, resource:) %>
 
     <main slot="content" id="content">
-      <div hidden class="show-for-tablet" style="position: absolute; right: var(--wa-space-m)"><button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="list"></wa-icon></button></div>
+      <div hidden class="show-mid-screen">
+        <button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="list"></wa-icon></button>
+      </div>
 
       <main-contents <%= "data-pagefind-body" unless data.exclude_from_pagefind %>>
         <%= yield %>
@@ -26,15 +30,16 @@
     </aside>
 
     <aside slot="sidebar-end" hidden>
-      <!-- TODO: this should be in a shared component -->
-      <div class="show-for-tablet" style="position: absolute; right: var(--wa-space-m)"><button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="close"></wa-icon></button></div>
+      <div class="show-mid-screen">
+        <button type="button" class="wa-outlined" onclick="document.body.classList.toggle('sidebar-end-open')"><wa-icon name="close"></wa-icon></button>
+      </div>
       <h2><%= t "documentation.contents" %></h2>
 
       <%= slotted :toc %>
 
       <hr />
 
-      <!-- TOC will be relocated here -->
+      <!-- TOC insertion -->
     </aside>
 
     <%= render "footer", metadata: site.metadata %>

data/lib/willamette/builders/author_extension.rb

@@ -0,0 +1,33 @@
+module Willamette
+  class Builders::AuthorExtension < Bridgetown::Builder
+    def build
+      define_resource_method :author_name
+    end
+
+    def author_name # rubocop:todo Metrics/CyclomaticComplexity
+      anon = "Anonymous"
+      return anon unless resource
+
+      resource_author = resource.data.author
+      found_author = case resource_author
+                     when String
+                       site.signals.authors ?
+                         site.signals.authors[resource_author]&.name :
+                         resource_author
+                     when Hash
+                       resource_author.name
+                     end
+
+      found_author || default_metadata || anon
+    end
+
+    def default_metadata
+      case site.metadata.author
+      when String
+        site.metadata.author
+      when Hash
+        site.metadata.author.name
+      end
+    end
+  end
+end

data/lib/willamette/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Willamette
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/willamette.rb

@@ -10,6 +10,7 @@ module Willamette
   end
 end
 
+require "willamette/builders/author_extension"
 require "willamette/builders/inspectors"
 require "willamette/builders/toc"
 require "willamette/strategies/link"
@@ -28,16 +29,17 @@ Kramdown::Converter::Html.class_eval do
 end
 
 # @param config [Bridgetown::Configuration::ConfigurationDSL]
-Bridgetown.initializer :willamette do |config, docs_url_segment: "docs"|
+Bridgetown.initializer :willamette do |config, docs_url_segment: "docs", layout: {}|
   # Add code here which will run when a site includes
   # `init :willamette`
   # in its configuration
 
   # Add default configuration data:
   config.willamette ||= {}
-  config.willamette.my_setting ||= 123
+  config.willamette.layout ||= layout
 
   # Register your builders:
+  config.builder Willamette::Builders::AuthorExtension
   config.builder Willamette::Builders::Inspectors
   config.builder Willamette::Builders::Toc
   config.builder :WillametteRegisterPermalinkPlaceholders do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willamette",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: willamette
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Bridgetown Team
 bindir: bin
 cert_chain: []
-date: 2026-04-02 00:00:00.000000000 Z
+date: 2026-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -101,6 +101,8 @@ files:
 - components/willamette/pagination.rb
 - components/willamette/post_item.css
 - components/willamette/post_item.rb
+- components/willamette/post_metadata.erb
+- components/willamette/post_metadata.rb
 - components/willamette/previous_next.erb
 - components/willamette/previous_next.rb
 - components/willamette/search_dialog.rb
@@ -109,6 +111,7 @@ files:
 - content/willamette/style-guide.md
 - layouts/willamette/default.erb
 - lib/willamette.rb
+- lib/willamette/builders/author_extension.rb
 - lib/willamette/builders/inspectors.rb
 - lib/willamette/builders/toc.rb
 - lib/willamette/locales/en.yml