brut 0.0.13 → 0.0.20

data/lib/brut/front_end/request_context.rb

@@ -8,6 +8,19 @@
 # and create an initializer for it that accepts the `clock:` keyword argument, the managed instance of {Clock} will be passed into it
 # when Brut creates an instance of the class.
 class Brut::FrontEnd::RequestContext
+
+  def self.current
+    Thread.current.thread_variable_get(:request_context)
+  end
+
+  # Create an instance of klass injected with the request context.
+  def self.inject(klass, request_params: nil)
+    self.current.then { |request_context|
+      request_context.as_constructor_args(klass,request_params:)
+    }.then { |constructor_args|
+      klass.new(**constructor_args) 
+    }
+  end
   # Create a new RequestContext based on some of the information provided by Rack
   #
   # @param [Hash] env the Rack `env` object, as available to any middleware

data/lib/brut/front_end/routing.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "phlex"
 
 # Holds the registered routes for this app.
 class Brut::FrontEnd::Routing
@@ -218,11 +219,11 @@ private
       end
       uri = URI(joined_path)
       uri.query = URI.encode_www_form(query_string_params)
-      uri
+      uri.extend(Phlex::SGML::SafeObject)
     end
 
     def url(**query_string_params)
-      request_context = Thread.current.thread_variable_get(:request_context)
+      request_context = Brut::FrontEnd::RequestContext.current
       path = self.path(**query_string_params)
       host = if request_context
                request_context[:host]

data/lib/brut/front_end.rb

@@ -0,0 +1,41 @@
+# In Brut, the _front end_ is considered anything that interacts directly with a web browser or HTTP.  This includes rendering HTML,
+# managing JavaScript and CSS, and processing form submissions.  It contrasts to {Brut::BackEnd}, which handles the business logic
+# and database.
+#
+# You {Brut::App} defines pages, forms, and actions. A page is backed by a subclass of {Brut::FrontEnd::Page}, which provides
+# dynamic data for rendering. A page can reference {Brut::FrontEnd::Component} subclasses to allow functional decomposition of front
+# end logic and markup, as well as re-use.  Both pages and components have ERB files that describe the HTML to be rendered.
+#
+# A {Brut::FrontEnd::Form} subclass defines a form that a browser will submit to your app. That
+# submission is processed by a {Brut::FrontEnd::Handler} subclass.  Handlers can also respond to other HTTP requests.
+#
+# In addition to responding to requests, you can subclass {Brut::FrontEnd::RouteHook} or {Brut::FrontEnd::Middleware} to perform
+# further manipulation of the request.
+#
+# The entire front-end is based on Rack, so you should be able to achieve anything you need to.
+module Brut::FrontEnd
+  autoload(:AssetMetadata, "brut/front_end/asset_metadata")
+  autoload(:AssetPathResolver, "brut/front_end/asset_path_resolver")
+  autoload(:Component, "brut/front_end/component")
+  autoload(:Components, "brut/front_end/component")
+  autoload(:Download, "brut/front_end/download")
+  autoload(:Flash, "brut/front_end/flash")
+  autoload(:Form, "brut/front_end/form")
+  autoload(:GenericResponse, "brut/front_end/generic_response")
+  autoload(:Handler, "brut/front_end/handler")
+  autoload(:Handlers, "brut/front_end/handler")
+  autoload(:HandlingResults, "brut/front_end/handling_results")
+  autoload(:HttpMethod, "brut/front_end/http_method")
+  autoload(:HttpStatus, "brut/front_end/http_status")
+  autoload(:InlineSvgLocator, "brut/front_end/inline_svg_locator")
+  autoload(:Layout, "brut/front_end/layout")
+  autoload(:Middleware, "brut/front_end/middleware")
+  autoload(:Middlewares, "brut/front_end/middleware")
+  autoload(:Page, "brut/front_end/page")
+  autoload(:Pages, "brut/front_end/page")
+  autoload(:RequestContext, "brut/front_end/request_context")
+  autoload(:RouteHook, "brut/front_end/route_hook")
+  autoload(:RouteHooks, "brut/front_end/route_hook")
+  autoload(:Routing, "brut/front_end/routing")
+  autoload(:Session, "brut/front_end/session")
+end

data/lib/brut/i18n/base_methods.rb

@@ -1,6 +1,11 @@
-# Interface for translations.  This is prefered over using Ruby's I18n directly.
-# This is intended to be mixed-in to any class that requires this, so that you can more
-# expediently access the `t` method.
+# Interface for translations, preferred over Ruby's I18n classes. Note that this is a
+# base module and not intended to be directly used in your classes.  Include one of
+# the other modules in this namespace:
+#
+# * {Brut::I18n::ForHTML} for components or pages, or anything use Phlex
+# * {Brut::I18n::ForCLI} for CLI apps
+# * {Brut::I18n::ForBackEnd} for back-end classes that aren't generating HTML
+#
 module Brut::I18n::BaseMethods
 
   # Access a translation and insert interpolated elemens as needed. This will use the provided key to determine
@@ -101,7 +106,7 @@ module Brut::I18n::BaseMethods
   #   }
   #   # in your code for HomePage
   #   t(page: [ :captions, :new ]) # => New Widgets
-  def t(key=:look_in_rest,**rest)
+  def t(key=:look_in_rest,**rest,&block)
     if key == :look_in_rest
 
       page      = rest.delete(:page)
@@ -126,13 +131,14 @@ module Brut::I18n::BaseMethods
       key = Array(key).join('.')
       key = [key,"general.#{key}"]
     end
-    if block_given?
+    if !block.nil?
       if rest[:block]
         raise ArgumentError,"t was given a block and a block: param. You can't do both "
       end
-      rest[:block] = html_safe(yield.to_s.strip)
+      block_contents = safe(capture(&block))
+      rest[:block] = block_contents
     end
-    html_safe(t_direct(key,**rest))
+    t_direct(key,**rest)
   rescue I18n::MissingInterpolationArgument => ex
     if ex.key.to_s == "block"
       raise ArgumentError,"One of the keys #{key.join(", ")} contained a %{block} interpolation value: '#{ex.string}'. This means you must use t_html *and* yield a block to it"
@@ -168,7 +174,7 @@ module Brut::I18n::BaseMethods
     }
     escaped_interpolated_values = interpolated_values.map { |key,value|
       if value.kind_of?(String)
-        [ key, Brut::FrontEnd::Template.escape_html(value) ]
+        [ key, CGI.escapeHTML(value) ]
       else
         [ key, value ]
       end

data/lib/brut/i18n/for_back_end.rb

@@ -0,0 +1,5 @@
+module Brut::I18n::ForBackEnd
+  include Brut::I18n::BaseMethods
+  def safe(string) = string
+  def capture(&block) = block.()
+end

data/lib/brut/i18n/for_cli.rb

@@ -1,4 +1,5 @@
 module Brut::I18n::ForCLI
   include Brut::I18n::BaseMethods
-  def html_safe(string) = string
+  def safe(string) = string
+  def capture(&block) = block.()
 end

data/lib/brut/i18n/for_html.rb

@@ -1,4 +1,12 @@
+# I18n for components or pages, which are assumed to be Phlex components.
+# To use this outside of a Phlex context, you must define these two
+# methods to ensure proper HTML escaping happens:
+#
+# * `safe` to accept a string and return a string.
+# * `capture` to accept a block and return its contents as a string.
 module Brut::I18n::ForHTML
   include Brut::I18n::BaseMethods
-  def html_safe(string) = Brut::FrontEnd::Templates::HTMLSafeString.from_string(string)
+  def t(...)
+    safe(super)
+  end
 end

data/lib/brut/i18n.rb

@@ -1,6 +1,7 @@
 # I18n holds all the code useful for translating and localizing information. It's based on Ruby's I18n.
 module Brut::I18n
   autoload(:BaseMethods, "brut/i18n/base_methods")
+  autoload(:ForBackEnd, "brut/i18n/for_back_end")
   autoload(:ForCLI, "brut/i18n/for_cli")
   autoload(:ForHTML, "brut/i18n/for_html")
   autoload(:HTTPAcceptLanguage, "brut/i18n/http_accept_language")

data/lib/brut/sinatra_helpers.rb

@@ -77,15 +77,16 @@ module Brut::SinatraHelpers
 
         Brut.container.instrumentation.span(page_class.name) do |span|
           span.add_prefixed_attributes("brut", type: :page, class: page_class)
-          request_context = Thread.current.thread_variable_get(:request_context)
-          constructor_args = request_context.as_constructor_args(
+          constructor_args = Brut::FrontEnd::RequestContext.current.as_constructor_args(
             page_class,
             request_params: params,
             route: brut_route,
           )
           span.add_prefixed_attributes("brut.initializer.args", constructor_args.map { |k,v| [k.to_s,v.class.name] }.to_h)
           page_instance = page_class.new(**constructor_args)
+
           result = page_instance.handle!
+
           span.add_prefixed_attributes("brut", result_class: result.class)
           case result
           in URI => uri
@@ -177,7 +178,6 @@ module Brut::SinatraHelpers
             form_class: form_class,
           )
 
-          request_context = Thread.current.thread_variable_get(:request_context)
           handler = handler_class.new
           form = if form_class.nil?
                    nil
@@ -185,7 +185,7 @@ module Brut::SinatraHelpers
                    form_class.new(params: params)
                  end
 
-          process_args = request_context.as_method_args(handler,:handle,request_params: params,form: form,route:brut_route)
+          process_args = Brut::FrontEnd::RequestContext.current.as_method_args(handler,:handle,request_params: params,form: form,route:brut_route)
 
           result = handler.handle!(**process_args)
 
@@ -193,12 +193,17 @@ module Brut::SinatraHelpers
           in URI => uri
             redirect to(uri.to_s)
           in Brut::FrontEnd::Component => component_instance
-            render_html(component_instance).to_s
-          in [ Brut::FrontEnd::Component => component_instance, Brut::FrontEnd::HttpStatus => http_status ]
+            component_instance.call.to_s
+          in [
+            Brut::FrontEnd::Component  => component_instance,
+            Brut::FrontEnd::HttpStatus => http_status,
+          ]
+
             [
               http_status.to_i,
-              render_html(component_instance).to_s,
+              component_instance.call.to_s,
             ]
+
           in Brut::FrontEnd::HttpStatus => http_status
             http_status.to_i
           in Brut::FrontEnd::Download => download

data/lib/brut/spec_support/component_support.rb

@@ -8,7 +8,7 @@ module Brut::SpecSupport::ComponentSupport
   include Brut::SpecSupport::FlashSupport
   include Brut::SpecSupport::SessionSupport
   include Brut::SpecSupport::ClockSupport
-  include Brut::I18n::ForHTML
+  include Brut::I18n::BaseMethods
 
   # Render a component into its text representation.  This mimics what happens when a component is used
   # inside a template.  You typically don't want this, but should use {#render_and_parse}, since that will
@@ -20,8 +20,13 @@ module Brut::SpecSupport::ComponentSupport
       end
       component.handle!
     else
-      component.yielded_block = block
-      component.render
+      if block.nil?
+        component.call
+      else
+        component.call do
+          component.raw(component.safe(block.()))
+        end
+      end
     end
   end
 
@@ -41,7 +46,7 @@ module Brut::SpecSupport::ComponentSupport
   # @return [Brut::SpecSupport::EnhancedNode] a wrapper around a Nokogiri node to provide convienience methods.
   def render_and_parse(component,&block)
     rendered_text = render(component,&block)
-    if !rendered_text.kind_of?(String) && !rendered_text.kind_of?(Brut::FrontEnd::Templates::HTMLSafeString)
+    if !rendered_text.kind_of?(String)
       if rendered_text.kind_of?(URI::Generic)
         raise "#{component.class} redirected to #{rendered_text} instead of rendering"
       else
@@ -80,9 +85,4 @@ module Brut::SpecSupport::ComponentSupport
   def routing_for(klass,**args)
     Brut.container.routing.path(klass,**args)
   end
-
-  # Escape HTML using the same code Brut uses for rendering templates.
-  def escape_html(...)
-    Brut::FrontEnd::Templates::EscapableFilter.escape_html(...)
-  end
 end

data/lib/brut/spec_support/e2e_support.rb

@@ -0,0 +1,4 @@
+# Convienience methods for writing E2E tests
+module Brut::SpecSupport::E2eSupport
+  include Brut::I18n::BaseMethods
+end

data/lib/brut/spec_support/matchers/have_i18n_string.rb

@@ -1,5 +1,10 @@
 RSpec::Matchers.define :have_i18n_string do |key,**args|
   include Brut::I18n::ForHTML
+
+  # XXX: Figure out how to not have to do this
+  def safe(x) = x
+  def capture(&block) = block.()
+
   match do |nokogiri_node|
 
     text        = nokogiri_node.text.strip

data/lib/brut/spec_support/rspec_setup.rb

@@ -80,6 +80,7 @@ class Brut::SpecSupport::RSpecSetup
     @config.include Brut::SpecSupport::GeneralSupport
     @config.include Brut::SpecSupport::ComponentSupport, component: true
     @config.include Brut::SpecSupport::HandlerSupport, handler: true
+    @config.include Brut::SpecSupport::E2eSupport, e2e: true
     @config.include Playwright::Test::Matchers, e2e: true
 
     @config.around do |example|

data/lib/brut/spec_support.rb

@@ -5,11 +5,12 @@ module Brut
   module SpecSupport
   end
 end
-require_relative "spec_support/matcher"
 require_relative "spec_support/component_support"
-require_relative "spec_support/handler_support"
-require_relative "spec_support/general_support"
+require_relative "spec_support/e2e_support"
 require_relative "spec_support/e2e_test_server"
+require_relative "spec_support/general_support"
+require_relative "spec_support/handler_support"
+require_relative "spec_support/matcher"
 require_relative "spec_support/rspec_setup"
 require_relative "factory_bot"
 # Convention here is different. We don't want to autoload

data/lib/brut/version.rb

@@ -1,4 +1,4 @@
 module Brut
   # @!visibility private
-  VERSION = "0.0.13"
+  VERSION = "0.0.20"
 end

data/lib/brut.rb

@@ -9,52 +9,8 @@ require_relative "brut/framework"
 #
 # Have fun!
 module Brut
-  # In Brut, the _front end_ is considered anything that interacts directly with a web browser or HTTP.  This includes rendering HTML,
-  # managing JavaScript and CSS, and processing form submissions.  It contrasts to {Brut::BackEnd}, which handles the business logic
-  # and database.
-  #
-  # You {Brut::App} defines pages, forms, and actions. A page is backed by a subclass of {Brut::FrontEnd::Page}, which provides
-  # dynamic data for rendering. A page can reference {Brut::FrontEnd::Component} subclasses to allow functional decomposition of front
-  # end logic and markup, as well as re-use.  Both pages and components have ERB files that describe the HTML to be rendered.
-  #
-  # A {Brut::FrontEnd::Form} subclass defines a form that a browser will submit to your app. That
-  # submission is processed by a {Brut::FrontEnd::Handler} subclass.  Handlers can also respond to other HTTP requests.
-  #
-  # In addition to responding to requests, you can subclass {Brut::FrontEnd::RouteHook} or {Brut::FrontEnd::Middleware} to perform
-  # further manipulation of the request.
-  #
-  # The entire front-end is based on Rack, so you should be able to achieve anything you need to.
-  module FrontEnd
-    autoload(:AssetMetadata, "brut/front_end/asset_metadata")
-    autoload(:Component, "brut/front_end/component")
-    autoload(:Components, "brut/front_end/component")
-    autoload(:Download, "brut/front_end/download")
-    autoload(:Flash, "brut/front_end/flash")
-    autoload(:Form, "brut/front_end/form")
-    autoload(:Handler, "brut/front_end/handler")
-    autoload(:Handlers, "brut/front_end/handler")
-    autoload(:HandlingResults, "brut/front_end/handling_results")
-    autoload(:HttpMethod, "brut/front_end/http_method")
-    autoload(:HttpStatus, "brut/front_end/http_status")
-    autoload(:GenericResponse, "brut/front_end/generic_response")
-    autoload(:Middleware, "brut/front_end/middleware")
-    autoload(:Middlewares, "brut/front_end/middleware")
-    autoload(:Page, "brut/front_end/page")
-    autoload(:Pages, "brut/front_end/page")
-    autoload(:RequestContext, "brut/front_end/request_context")
-    autoload(:RouteHook, "brut/front_end/route_hook")
-    autoload(:RouteHooks, "brut/front_end/route_hook")
-    autoload(:Routing, "brut/front_end/routing")
-    autoload(:Session, "brut/front_end/session")
-  end
-  # The _back end_ of a Brut app is where your app's business logic and database are managed.  While the bulk of your Brut app's code
-  # will be in the back end, Brut is far less prescriptive about how to manage that than it is the front end.
-  module BackEnd
-    autoload(:Validators, "brut/back_end/validator")
-    autoload(:Sidekiq, "brut/back_end/sidekiq")
-    # Do not put SeedData here - it must be loaded only when needed
-  end
-  # I18n is where internationalization and localization support lives.
+  autoload(:FrontEnd, "brut/front_end")
+  autoload(:BackEnd, "brut/back_end")
   autoload(:I18n, "brut/i18n")
   autoload(:Instrumentation,"brut/instrumentation")
   autoload(:SinatraHelpers, "brut/sinatra_helpers")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brut
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.20
 platform: ruby
 authors:
 - David Bryant Copeland
@@ -80,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: prism
+  name: phlex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-protection
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rackup
+  name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,34 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: temple
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -454,6 +426,7 @@ files:
 - dx/start
 - dx/stop
 - lib/brut.rb
+- lib/brut/back_end.rb
 - lib/brut/back_end/seed_data.rb
 - lib/brut/back_end/sidekiq.rb
 - lib/brut/back_end/sidekiq/middlewares.rb
@@ -491,7 +464,9 @@ files:
 - lib/brut/framework/mcp.rb
 - lib/brut/framework/patch_semantic_logger.rb
 - lib/brut/framework/project_environment.rb
+- lib/brut/front_end.rb
 - lib/brut/front_end/asset_metadata.rb
+- lib/brut/front_end/asset_path_resolver.rb
 - lib/brut/front_end/component.rb
 - lib/brut/front_end/components/constraint_violations.rb
 - lib/brut/front_end/components/form_tag.rb
@@ -504,7 +479,7 @@ files:
 - lib/brut/front_end/components/inputs/textarea.rb
 - lib/brut/front_end/components/locale_detection.rb
 - lib/brut/front_end/components/page_identifier.rb
-- lib/brut/front_end/components/time.rb
+- lib/brut/front_end/components/time_tag.rb
 - lib/brut/front_end/components/traceparent.rb
 - lib/brut/front_end/download.rb
 - lib/brut/front_end/flash.rb
@@ -527,6 +502,8 @@ files:
 - lib/brut/front_end/handling_results.rb
 - lib/brut/front_end/http_method.rb
 - lib/brut/front_end/http_status.rb
+- lib/brut/front_end/inline_svg_locator.rb
+- lib/brut/front_end/layout.rb
 - lib/brut/front_end/layouts/_internal.html.erb
 - lib/brut/front_end/middleware.rb
 - lib/brut/front_end/middlewares/annotate_brut_owned_paths.rb
@@ -545,15 +522,9 @@ files:
 - lib/brut/front_end/route_hooks/setup_request_context.rb
 - lib/brut/front_end/routing.rb
 - lib/brut/front_end/session.rb
-- lib/brut/front_end/template.rb
-- lib/brut/front_end/templates/block_filter.rb
-- lib/brut/front_end/templates/erb_engine.rb
-- lib/brut/front_end/templates/erb_parser.rb
-- lib/brut/front_end/templates/escapable_filter.rb
-- lib/brut/front_end/templates/html_safe_string.rb
-- lib/brut/front_end/templates/locator.rb
 - lib/brut/i18n.rb
 - lib/brut/i18n/base_methods.rb
+- lib/brut/i18n/for_back_end.rb
 - lib/brut/i18n/for_cli.rb
 - lib/brut/i18n/for_html.rb
 - lib/brut/i18n/http_accept_language.rb
@@ -565,6 +536,7 @@ files:
 - lib/brut/spec_support.rb
 - lib/brut/spec_support/clock_support.rb
 - lib/brut/spec_support/component_support.rb
+- lib/brut/spec_support/e2e_support.rb
 - lib/brut/spec_support/e2e_test_server.rb
 - lib/brut/spec_support/enhanced_node.rb
 - lib/brut/spec_support/flash_support.rb

data/lib/brut/front_end/template.rb

@@ -1,47 +0,0 @@
-require "temple"
-
-# Holds code related to rendering ERB templates
-module Brut::FrontEnd::Templates
-  autoload(:HTMLSafeString,"brut/front_end/templates/html_safe_string")
-  autoload(:ERBParser,"brut/front_end/templates/erb_parser")
-  autoload(:EscapableFilter,"brut/front_end/templates/escapable_filter")
-  autoload(:BlockFilter,"brut/front_end/templates/block_filter")
-  autoload(:ERBEngine,"brut/front_end/templates/erb_engine")
-  autoload(:Locator,"brut/front_end/templates/locator")
-end
-
-# Handles rendering HTML templates written in ERB.  This is a light wrapper around `Tilt`.
-# This also configured a few customizations to allow a Rails-like rendering of ERB:
-#
-# * HTML escaping by default
-# * Helpers that return {Brut::FrontEnd::Templates::HTMLSafeString}s won't be escaped
-#
-# @see https://github.com/rtomayko/tilt
-class Brut::FrontEnd::Template
-
-  # @!visibility private
-  # This sets up global state somewhere, even though we aren't using `TempleTemplate`
-  # anywhere.
-  TempleTemplate = Temple::Templates::Tilt(Brut::FrontEnd::Templates::ERBEngine,
-                                           register_as: "html.erb")
-
-  attr_reader :template_file_path
-
-  # Wraps a string that is deemed safe to insert into
-  # HTML without escaping it.  This allows stuff like
-  # <%= component(SomeComponent) %> to work without
-  # having to remember to <%== all the time.
-  def initialize(template_file_path)
-    @template_file_path = template_file_path
-    @tilt_template = Tilt.new(@template_file_path)
-  end
-
-  def render_template(...)
-    @tilt_template.render(...)
-  end
-
-  # Convienience method to escape HTML in the canonical way.
-  def self.escape_html(string)
-    Brut::FrontEnd::Templates::EscapableFilter.escape_html(string)
-  end
-end

data/lib/brut/front_end/templates/block_filter.rb

@@ -1,61 +0,0 @@
-# Allows rendering blocks in ERB the way Rails' helpers like `form_with` do.
-# This is a slightly modified copy of Hanami's `Filters::Block`.
-#
-# @see https://github.com/hanami/view/blob/main/lib/hanami/view/erb/filters/block.rb
-class Brut::FrontEnd::Templates::BlockFilter < Temple::Filter
-  END_LINE_RE = /\bend\b/
-
-  # @!visibility private
-  def on_erb_block(escape, code, content)
-    tmp = unique_name
-
-    # Remove the last `end` :code sexp, since this is technically "outside" the block
-    # contents, which we want to capture separately below. This `end` is added back after
-    # capturing the content below.
-    case content.last
-    in [:code, c] if c =~ END_LINE_RE
-      content.pop
-    end
-
-    [:multi,
-     # Capture the result of the code in a variable. We can't do `[:dynamic, code]` because
-     # it's probably not a complete expression (which is a requirement for Temple).
-     # DBC: an example is that 'code' might be "form_for do" which is not an expression.
-     #      Because we later put an "end" in, the result will be
-     #
-     #      some_var = helper do
-     #      end
-     #
-     #      Which IS valid Ruby.
-     [:code, "#{tmp} = #{code}"],
-     # Capture the content of a block in a separate buffer. This means that `yield` will
-     # not output the content to the current buffer, but rather return the output.
-     [:capture, unique_name, compile(content)],
-     [:code, "end"],
-     # Output the content, without escaping it.
-     # Hanami has this ↴
-     # [:escape, escape, [:dynamic, tmp]]
-     [:escape, escape, [:dynamic, Brut::FrontEnd::Templates.name + "::HTMLSafeString.new(#{tmp})"]]
-    ]
-
-    # Details explaining the change:
-    #
-    # The sexps for template are quite convoluted and highly dynamic, so it is hard
-    # to understand exactly what effect they will have.  Basically, what this [:multi thing is
-    # doing is to capture the result of the block in a variable:
-    #
-    # some_var = form_for(args) do
-    #
-    # It then captures the inside of the block in a new variable:
-    #
-    # some_other_var = «whatever was inside that `do`»
-    #
-    # And follows it with an end.
-    #
-    # The first variable—some_var—now holds the return value of the helper, form_for in this case. To
-    # output this content to the actual view, it must be dereferenced, thus [ :dynamic, "some_var" ].
-    #
-    # We are going to treat the return value of the block helper as HTML safe.  Thus, we'll wrap it
-    # with HTMLSafeString.new(…).
-  end
-end

data/lib/brut/front_end/templates/erb_engine.rb

@@ -1,26 +0,0 @@
-# A temple "engine" that can be used to parse ERB and generate HTML
-# in just the way we need.
-class Brut::FrontEnd::Templates::ERBEngine < Temple::Engine
-  # Parse the ERB into sexps
-  use Brut::FrontEnd::Templates::ERBParser
-
-  # Handle block syntax used in a <%= 
-  use Brut::FrontEnd::Templates::BlockFilter
-
-  # Trim whitespace like ERB does
-  use Temple::ERB::Trimming
-
-  # Escape strings only if they are not HTMLSafeString
-  use Brut::FrontEnd::Templates::EscapableFilter
-  # This filter actually runs the Ruby code
-  use Temple::Filters::StaticAnalyzer
-  # Flattens nested :multi expressions which I'm not sure is needed, but
-  # have cargo-culted from hanami
-  use Temple::Filters::MultiFlattener
-  # merges sequential :static, which again, not sure is needed, but
-  # have cargo-culted from hanami
-  use Temple::Filters::StaticMerger
-
-  # This generates everything into a string
-  use Temple::Generators::ArrayBuffer
-end