Upgrade to Bridgetown 2.1 beta

Author: fpsvogel

Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ####
 # Welcome to your project's Gemfile, used by Rubygems & Bundler.
@@ -19,18 +18,18 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # If you need to upgrade/switch Bridgetown versions, change the line below
 # and then run `bundle update bridgetown`
-gem "bridgetown", "~>2", git: "https://github.com/bridgetownrb/bridgetown.git"
-gem "bridgetown-seo-tag"
+source "https://gems.bridgetownrb.com" do
+  gem "bridgetown", "~> 2.1.0.beta1"
+  gem "bridgetown-seo-tag"
+end
 gem "puma"
 gem "kramdown"
 gem "nokogiri"
 gem "debug"
 
 group :test, optional: true do
   gem "minitest"
-  gem "minitest-profile"
   gem "minitest-reporters"
-  gem "shoulda"
   gem "rails-dom-testing"
   gem "pretty-diffs"
 end

Gemfile.lock

@@ -1,47 +1,24 @@
-GIT
-  remote: https://github.com/bridgetownrb/bridgetown.git
-  revision: 2568daf68439197dd35a0bd919bf0b333380c61c
-  specs:
-    bridgetown (2.0.1)
-      bridgetown-builder (= 2.0.1)
-      bridgetown-core (= 2.0.1)
-      bridgetown-foundation (= 2.0.1)
-      bridgetown-paginate (= 2.0.1)
-
 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.bridgetownrb.com/
   specs:
-    activesupport (7.2.2.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)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    amazing_print (1.8.1)
-    ansi (1.5.0)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.3.1)
-    bridgetown-builder (2.0.1)
-      bridgetown-core (= 2.0.1)
-    bridgetown-core (2.0.1)
-      activesupport (>= 6.0, < 8.0)
+    bridgetown (2.1.0.beta1)
+      bridgetown-builder (= 2.1.0.beta1)
+      bridgetown-core (= 2.1.0.beta1)
+      bridgetown-foundation (= 2.1.0.beta1)
+      bridgetown-paginate (= 2.1.0.beta1)
+    bridgetown-builder (2.1.0.beta1)
+      bridgetown-core (= 2.1.0.beta1)
+    bridgetown-core (2.1.0.beta1)
       addressable (~> 2.4)
       amazing_print (~> 1.2)
-      bridgetown-foundation (= 2.0.1)
+      base64 (>= 0.3)
+      bigdecimal (>= 3.2)
+      bridgetown-foundation (= 2.1.0.beta1)
       csv (~> 3.2)
-      dry-inflector (>= 1.0)
       erubi (~> 1.9)
       faraday (~> 2.0)
       faraday-follow_redirects (~> 0.3)
+      freyia (>= 0.5)
       i18n (~> 1.0)
       irb (>= 1.14)
       kramdown (~> 2.1)
@@ -53,40 +30,69 @@ GEM
       rake (>= 13.0)
       roda (~> 3.46)
       rouge (>= 3.0, < 5.0)
-      serbea (~> 2.1)
+      samovar (>= 2.4)
+      securerandom (~> 0.4)
+      serbea (>= 2.4.1)
       signalize (~> 1.3)
       streamlined (>= 0.6.0)
-      thor (~> 1.1)
       tilt (~> 2.0)
-      zeitwerk (~> 2.5)
-    bridgetown-foundation (2.0.1)
+      zeitwerk (>= 2.7.3)
+    bridgetown-foundation (2.1.0.beta1)
+      dry-inflector (>= 1.0)
       hash_with_dot_access (~> 2.0)
       inclusive (~> 1.0)
       zeitwerk (~> 2.5)
-    bridgetown-paginate (2.0.1)
-      bridgetown-core (= 2.0.1)
-    bridgetown-seo-tag (7.0.0)
+    bridgetown-paginate (2.1.0.beta1)
+      bridgetown-core (= 2.1.0.beta1)
+    bridgetown-seo-tag (7.0.1)
       bridgetown (>= 1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.1.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    amazing_print (1.8.1)
+    ansi (1.5.0)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
     builder (3.3.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (3.0.2)
+    console (1.34.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     csv (3.3.5)
-    date (3.4.1)
-    debug (1.10.0)
+    date (3.5.0)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     drb (2.2.3)
     dry-inflector (1.2.0)
-    erb (5.1.1)
+    erb (6.0.0)
     erubi (1.13.1)
     faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.4.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-aarch64-linux-musl)
     ffi (1.17.2-arm-linux-gnu)
@@ -95,16 +101,21 @@ GEM
     ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.1)
+    freyia (0.5.3)
     hash_with_dot_access (2.2.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     inclusive (1.1.0)
     io-console (0.8.1)
-    irb (1.15.2)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.15.1)
+    json (2.17.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -114,31 +125,31 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    minitest (5.26.0)
-    minitest-profile (0.0.2)
+    mapping (1.1.3)
+    minitest (5.26.2)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    net-http (0.6.0)
-      uri
-    nio4r (2.7.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    net-http (0.8.0)
+      uri (>= 0.11.1)
+    nio4r (2.7.5)
+    nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
+    nokogiri (1.18.10-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-gnu)
+    nokogiri (1.18.10-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-musl)
+    nokogiri (1.18.10-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
+    nokogiri (1.18.10-x86_64-linux-musl)
       racc (~> 1.4)
     pp (0.6.3)
       prettyprint
@@ -147,54 +158,50 @@ GEM
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (6.6.0)
+    public_suffix (7.0.0)
+    puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.3)
-    rackup (2.2.1)
+    rack (3.2.4)
+    rackup (2.3.1)
       rack (>= 3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rake (13.3.0)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.15.0)
+    rdoc (6.17.0)
       erb
       psych (>= 4.0.0)
       tsort
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
     rexml (3.4.4)
-    roda (3.97.0)
+    roda (3.98.0)
       rack
     rouge (4.6.1)
     ruby-progressbar (1.13.0)
+    samovar (2.4.1)
+      console (~> 1.0)
+      mapping (~> 1.0)
     securerandom (0.4.1)
-    serbea (2.3.0)
-      erubi (>= 1.11)
-      tilt (>= 2.1)
-    shoulda (4.0.0)
-      shoulda-context (~> 2.0)
-      shoulda-matchers (~> 4.0)
-    shoulda-context (2.0.0)
-    shoulda-matchers (4.5.1)
-      activesupport (>= 4.2.0)
+    serbea (2.4.1)
+      erubi (>= 1.13)
+      tilt (>= 2.6)
     signalize (1.3.1)
       concurrent-ruby (~> 1.2)
-    streamlined (0.6.1)
+    streamlined (0.6.2)
       serbea (>= 2.1)
       zeitwerk (~> 2.5)
-    stringio (3.1.7)
-    thor (1.4.0)
+    stringio (3.1.9)
     tilt (2.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.4)
+    uri (1.1.1)
     zeitwerk (2.7.3)
 
 PLATFORMS
@@ -208,18 +215,16 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  bridgetown (~> 2)!
-  bridgetown-seo-tag
+  bridgetown (~> 2.1.0.beta1)!
+  bridgetown-seo-tag!
   debug
   kramdown
   minitest
-  minitest-profile
   minitest-reporters
   nokogiri
   pretty-diffs
   puma
   rails-dom-testing
-  shoulda
 
 BUNDLED WITH
    2.6.7

plugins/curriculum_parser.rb

@@ -29,8 +29,9 @@ def extract_title_and_intro(markdown_string)
       .split(/\n(?=## )/, 2)
       .then { |title_and_intro, content|
         title, intro = title_and_intro.strip.split("\n", 2)
-        title = title&.delete_prefix("# ")&.strip&.presence
-        intro = intro&.strip&.presence
+        title = title&.delete_prefix("# ")&.strip
+        intro = intro&.strip
+        intro = nil if intro && intro.empty?
 
         {
           title:,
@@ -102,7 +103,11 @@ def recursive_parse(content, heading_strings_and_procs:, exclude_sections: [])
         next_heading_proc.call(formatted_heading)
       }
       .reject { |k, v| exclude_sections.include?(k.downcase) }
-      .transform_values { it&.strip&.presence }
+      .transform_values {
+        value = it&.strip
+        value = nil if value && value.empty?
+        value
+      }
       .each { |heading, content_under|
         raise "No content under \"#{heading}\"" if content_under.nil?
       }
@@ -181,15 +186,19 @@ def parse_list(markdown_string)
             \z}x
           )
           &.named_captures
-          &.transform_values { it&.strip&.presence }
+          &.transform_values {
+            value = it&.strip
+            value = nil if value && value.empty?
+            value
+          }
           &.transform_keys(&:to_sym) ||
           (raise(ParsingError, "Could not parse: #{line}") \
             if line.strip.start_with?("- "))
       }
       .compact
       .each { |item|
         item[:url] ||= item[:description].match(/\[.+?\]\((.+?)\)/)&.captures&.first
-        item[:free] = item[:free].blank?
+        item[:free] = !item[:free] || item[:free].empty?
 
         ItemFormatter.new(item).format_item_for_site!
       }

test/helper.rb

@@ -1,10 +1,9 @@
 require "nokogiri"
 require "minitest/autorun"
 require "minitest/reporters"
-require "minitest/profile"
-require "shoulda"
 require "rails-dom-testing"
 require "pretty_diffs"
+require "bridgetown"
 
 module Minitest
   class Test