Update to phlex 2.0 (rc1)

fnordfish · fnordfish · commit 1f4595814eb9 · 2025-01-02T14:50:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ### Changed
 
+- Update to phlex 2.0.
+
 ### Deprecated
 
 ### Removed
diff --git a/Gemfile b/Gemfile
@@ -6,10 +6,10 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-gem "capybara"
+gem "rspec", "~> 3.13"
+gem "rack-test", "~> 2.1"
+gem "capybara", "~> 3.35"
 gem "puma"
-gem "rack-test"
 
-gem "standard", "~> 1.3"
+gem "standard", "~> 1.43"
+gem "debug"
diff --git a/roda-phlex.gemspec b/roda-phlex.gemspec
@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "phlex", ">= 1.7.0"
+  spec.add_dependency "phlex", ">= 2.0.0.rc1", "<3"
   spec.add_dependency "roda", ">= 3.0.0"
 end
diff --git a/spec/roda/phlex_spec.rb b/spec/roda/phlex_spec.rb
@@ -86,7 +86,7 @@
     it "outputs the full response with an explicit layout" do
       last_response = get_capybara("/stream/explicit")
       expect(last_response.body).to eq <<~HTML.chomp
-        <!DOCTYPE html><html><head></head><body>Layout Start<p>View Data</p>Layout End</body></html>
+        <!doctype html><html><head></head><body>Layout Start<p>View Data</p>Layout End</body></html>
       HTML
       # Indicates that streaming is being used.
       expect(last_response["Content-Length"]).to be_nil
diff --git a/spec/support/views.rb b/spec/support/views.rb
@@ -80,7 +80,7 @@ def view_template
     html do
       head do
         meta(charset: "UTF-8")
-        meta("http-equiv" => "UTF-8", "content" => "IE=edge")
+        meta("http-equiv" => safe("UTF-8"), "content" => "IE=edge")
         meta(
           name: "viewport",
           content: "width=device-width, initial-scale=1.0"
@@ -114,7 +114,7 @@ def view_template
 
 module ExplicitLayout
   class Layout < Phlex::HTML
-    def view_template(&block)
+    def view_template
       doctype
       html {
         head {
@@ -124,7 +124,7 @@ def view_template(&block)
         # benefit all pages that opt in to streaming.
         body {
           plain "Layout Start"
-          yield_content(&block)
+          yield
           plain "Layout End"
         }
       }
@@ -133,15 +133,15 @@ def view_template(&block)
 
   class MyView < Phlex::HTML
     def view_template
-      render Layout.new {
+      render(Layout.new do
         # Knowing that this page can take a while to generate we can choose to
         # flush here so the browser can render the site header while downloading
         # the rest of the page - which should help minimise the First Contentful
         # Paint metric.
         flush
 
         p { "View Data" }
-      }
+      end)
     end
   end
 end
