lifeform 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef99043fb289f536c1a3b6986a48675dc741854ffef6e99c596c5d9abca303a
-  data.tar.gz: 61821150d087888c5b243e2c52916534f7fc8b4fb8a14ced79692d3bb1ed1f45
+  metadata.gz: b73201515b3b27e577ed299923e2e2b0dbe4e8597761947c47d4c67eb3d2a8c0
+  data.tar.gz: 47f7c3d4bb4eb9f82c1f02ebd70066f2509cc1b0b685cd11f88377fb4ef2b7d4
 SHA512:
-  metadata.gz: 8b64f7550a79f0e7667ac422a9cecb364943c544e9583f724842326d4cb9b28b74ae0dee19427be1121fcfd4e9b1a9e5e7878ff1cc8a2e22ee65dd734a0c69e1
-  data.tar.gz: adec1d8e7d8a800f667953ef4e91f90935878a9e1dc6095a82536625bf675ee9f1be74ee3ed31f1857807c9ee75dcd3b36f95a42c32ba79aa10cca0395240dc8
+  metadata.gz: 2ce0937077dbae812e9c88707f40c22815e3f72c95afa3d85717cc8957fb024f311f123cc487d2107fba117129f756198e2aea346b1d6ff46e03afede3f4d574
+  data.tar.gz: 53b27483e4125eec6c6e9f5ca44f56702c9f2b2913523981f8ec94eae01726441288716e91381a545bd392fbe49d1bb85697955e7b59a02dd43a861be3076d63

data/.rubocop.yml

@@ -1,14 +1,31 @@
 require:
+ - rubocop-bridgetown
  - rubocop-minitest
  - rubocop-rake
 
+inherit_gem:
+  rubocop-bridgetown: .rubocop.yml
+
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
+
   Exclude:
-    - lib/lifeform/phlex_renderable.rb
+    - .gitignore
+    - .rubocop.yml
+    - "*.gemspec"
+
+    - Gemfile.lock
+    - CHANGELOG.md
+    - LICENSE.txt
+    - README.md
+    - Rakefile
+
+    - bin/**/*
+    - test/fixtures/**/*
+    - vendor/**/*
 
-Lint/MissingSuper:
+Layout/MultilineBlockLayout:
   Enabled: false
 
 Metrics/AbcSize:
@@ -20,32 +37,8 @@ Metrics/ClassLength:
   - test/**/*.rb
 
 Metrics/MethodLength:
-  Max: 20
   Exclude:
   - test/**/*.rb
 
-Style/Documentation:
-  Enabled: false
-
-Style/Lambda:
-  Enabled: false
-
-Style/LambdaCall:
-  Enabled: false
-
-Style/MultilineBlockChain:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/ParallelAssignment:
-  Enabled: false
-
 Layout/LineLength:
   Max: 120

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.11.0] - 2023-06-22
+
+- Upgrade to Phlex 1.7+, Ruby 3.0+
+- Provide a form-wide configuration object
+- Allow field definitions to be added via `fields` block (useful for when you need to reference runtime configuration)
+
 ## [0.10.0] - 2022-12-23
 
 - Support Phlex 1.0 and conditional `render_in` support for Bridgetown

data/Gemfile

@@ -11,6 +11,7 @@ gem "minitest", "~> 5.0"
 gem "minitest-reporters", "~> 1.5"
 
 gem "rubocop", "~> 1.21"
+gem "rubocop-bridgetown", "~> 0.4"
 
 gem "solargraph", "~> 0.45.0"
 

data/Gemfile.lock

@@ -1,77 +1,106 @@
 PATH
   remote: .
   specs:
-    lifeform (0.10.0)
-      activesupport (>= 6.0)
-      phlex (~> 1.0)
+    lifeform (0.12.0)
+      hash_with_dot_access (>= 1.2)
+      sequel (>= 5.72)
+      streamlined (>= 0.2.0)
       zeitwerk (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ansi (1.5.0)
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.1.1)
     benchmark (0.2.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
     e2mmap (0.1.0)
-    i18n (1.12.0)
+    erubi (1.12.0)
+    hash_with_dot_access (1.2.0)
+      activesupport (>= 5.0.0, < 8.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.6)
     json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.16.3)
-    minitest-reporters (1.5.0)
+    language_server-protocol (3.17.0.3)
+    minitest (5.20.0)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.13.10-arm64-darwin)
+    mutex_m (0.1.2)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    phlex (1.0.0)
-      zeitwerk (~> 2.6)
-    racc (1.6.1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      racc
+    racc (1.7.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
+    rake (13.1.0)
+    regexp_parser (2.8.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
-    rubocop (1.40.0)
+    rexml (3.2.6)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-bridgetown (0.4.0)
+      rubocop (~> 1.23)
+      rubocop-performance (~> 1.12)
     rubocop-minitest (0.20.1)
       rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.19.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sequel (5.74.0)
+      bigdecimal
+    serbea (2.1.0)
+      erubi (>= 1.10)
+      tilt (~> 2.0)
     solargraph (0.45.0)
       backport (~> 1.2)
       benchmark
@@ -87,15 +116,16 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
+    streamlined (0.2.0)
+      serbea (>= 2.1)
+      zeitwerk (~> 2.5)
+    thor (1.3.0)
+    tilt (2.3.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
-    zeitwerk (2.6.6)
+    unicode-display_width (2.5.0)
+    yard (0.9.34)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-21
@@ -108,6 +138,7 @@ DEPENDENCIES
   rails-dom-testing (~> 2.0)
   rake (~> 13.0)
   rubocop (~> 1.21)
+  rubocop-bridgetown (~> 0.4)
   rubocop-minitest (~> 0.20.0)
   rubocop-rake (~> 0.6.0)
   solargraph (~> 0.45.0)

data/README.md

@@ -1,6 +1,6 @@
 # Lifeform
 
-Component-centric form object rendering for Ruby. Powered by [Phlex](https://www.phlex.fun)
+Component-centric form object rendering for Ruby. Rails and Bridgetown both supported.
 
 ## Installation
 
@@ -10,8 +10,6 @@ Add Lifeform to your application's Gemfile by running:
 bundle add lifeform
 ```
 
-If you're in a Rails app, you'll want to `bundle add phlex-rails` as well for Action View rendering support.
-
 ## Usage
 
 Full documentation coming as the library begins to mature. TL;DR:
@@ -38,17 +36,6 @@ And a template rendering of:
 <% end %>
 ```
 
-```rb
-# Or Phlex:
-def template
-  render TestForm.new(url: "/path") do |f|
-    render f.field(:occupation)
-    render f.field(:age, value: 47)
-    render f.field(:submit)
-  end
-end
-```
-
 You get the following HTML output:
 
 ```html
@@ -69,7 +56,7 @@ You get the following HTML output:
 
 Nested names based on models (aka `profile[name]`) and inferred action paths are supported as well.
 
-Multiple component libraries and input types—and easy customizability via [Phlex](https://github.com/joeldrapper/phlex) templates—are a fundamental aspect of the architecture of Lifeform.
+Multiple component libraries and input types—and easy customizability using string interpolation templates and helpers—are a fundamental aspect of the architecture of Lifeform. Until further docs have been written, you can look in `lib/lifeform/libraries` to see how some initial field types were constructed.
 
 ### Automatic Field Rendering
 

data/lib/lifeform/form.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/string/inflections"
+require "hash_with_dot_access"
+require "sequel/model/default_inflections"
+require "sequel/model/inflections"
 
 module Lifeform
   FieldDefinition = Struct.new(:type, :library, :parameters)
 
   # A form object which stores field definitions and can be rendered as a component
-  class Form < Phlex::HTML # rubocop:todo Metrics/ClassLength
-    include CapturingRenderable
+  class Form
+    include Streamlined::Renderable
+    extend Sequel::Inflections
+
     MODEL_PATH_HELPER = :polymorphic_path
 
     class << self
@@ -17,22 +21,30 @@ module Lifeform
       end
 
       # Helper to point to `I18n.t` method
-      def t(...)
-        I18n.t(...)
-      end
+      def t(...) = I18n.t(...)
 
+      def configuration = @configuration ||= HashWithDotAccess::Hash.new
+
+      # @param block [Proc, nil]
       # @return [Hash<Symbol, FieldDefinition>]
-      def fields
+      def fields(&block)
         @fields ||= {}
+        @fields_setup_block = block if block
+
+        @fields
       end
 
-      def subforms
-        @subforms ||= {}
+      def initialize_field_definitions!
+        return unless @fields_setup_block
+
+        @fields_setup_block.(configuration)
       end
 
+      def subforms = @subforms ||= {}
+
       def field(name, type: :text, library: self.library, **parameters)
         parameters[:name] = name.to_sym
-        fields[name] = FieldDefinition.new(type, Libraries.const_get(library.to_s.classify), parameters)
+        fields[name] = FieldDefinition.new(type, Libraries.const_get(camelize(library)), parameters)
       end
 
       def subform(name, klass, parent_name: nil)
@@ -83,19 +95,15 @@ module Lifeform
           model.to_model.model_name.param_key
         else
           # Or just use basic underscore
-          model.class.name.underscore.tr("/", "_")
+          underscore(model.class.name).tr("/", "_")
         end
       end
 
       # @return [Array<Symbol>]
-      def param_keys
-        fields.keys
-      end
+      def param_keys = fields.keys
 
       # @return [Array<String>]
-      def param_string_keys
-        fields.keys.map(&:to_s)
-      end
+      def param_string_keys = fields.keys.map(&:to_s)
     end
 
     # @return [Object]
@@ -121,9 +129,11 @@ module Lifeform
     )
       @model, @url, @library_name, @parameters, @emit_form_tag, @parent_name =
         model, url, library, parameters, emit_form_tag, parent_name
-      @library = Libraries.const_get(@library_name.to_s.classify)
+      @library = Libraries.const_get(self.class.send(:camelize, @library_name))
       @subform_instances = {}
 
+      self.class.initialize_field_definitions!
+
       @method = parameters[:method] ||= model.respond_to?(:persisted?) && model.persisted? ? :patch : :post
       parameters[:accept_charset] ||= "UTF-8"
       verify_method
@@ -132,25 +142,23 @@ module Lifeform
     def verify_method
       return if %w[get post].include?(parameters[:method].to_s.downcase)
 
-      @method_tag = Class.new(Phlex::HTML) do # TODO: break this out into a real component
-        def initialize(method:)
-          @method = method
-        end
+      method_value = @parameters[:method].to_s.downcase
 
-        def template
-          input type: "hidden", name: "_method", value: @method, autocomplete: "off"
-        end
-      end.new(method: @parameters[:method].to_s.downcase)
+      @method_tag = -> {
+        <<~HTML
+          <input type="hidden" name="_method" value="#{text -> { method_value }}" autocomplete="off">
+        HTML
+      }
 
       parameters[:method] = :post
     end
 
-    def add_authenticity_token # rubocop:disable Metrics/AbcSize
+    def add_authenticity_token
       if helpers.respond_to?(:token_tag, true) # Rails
         helpers.send(:token_tag, nil, form_options: {
-                       action: parameters[:action].to_s,
-                       method: parameters[:method].to_s.downcase
-                     })
+          action: parameters[:action].to_s,
+          method: parameters[:method].to_s.downcase,
+        })
       elsif helpers.respond_to?(:csrf_tag, true) # Roda
         helpers.send(:csrf_tag, parameters[:action].to_s, @method.to_s)
       else
@@ -184,15 +192,20 @@ module Lifeform
       form_tag = library::FORM_TAG
       parameters[:action] ||= url || (model ? helpers.send(self.class.const_get(:MODEL_PATH_HELPER), model) : nil)
 
-      send(form_tag, **attributes) do
-        unsafe_raw(add_authenticity_token) unless parameters[:method].to_s.downcase == "get"
-        unsafe_raw @method_tag&.() || ""
-        block ? yield_content(&block) : auto_render_fields
-      end
+      html -> { <<~HTML # rubocop:disable Bridgetown/HTMLEscapedHeredoc
+        <#{form_tag} #{html_attributes attributes}>
+          #{add_authenticity_token unless parameters[:method].to_s.casecmp("get").zero?}
+          #{@method_tag&.() || ""}
+          #{block ? capture(self, &block) : auto_render_fields}
+        </#{form_tag}>
+      HTML
+      }
     end
 
-    def auto_render_fields
-      self.class.fields.map { |k, _v| render(field(k)) }
+    def auto_render_fields = html_map(self.class.fields) { |k, _v| render(field(k)) }
+
+    def render(field_object)
+      field_object.render_in(helpers || self)
     end
   end
 end

data/lib/lifeform/libraries/default/button.rb

@@ -3,17 +3,14 @@
 module Lifeform
   module Libraries
     class Default
-      class Button < Phlex::HTML
-        using RefineProcToString
-        include CapturingRenderable
+      class Button
+        include Streamlined::Renderable
 
         attr_reader :form, :field_definition, :attributes
 
         WRAPPER_TAG = :form_button
         BUTTON_TAG = :button
 
-        register_element WRAPPER_TAG
-
         def initialize(form, field_definition, **attributes)
           @form = form
           @field_definition = field_definition
@@ -24,20 +21,24 @@ module Lifeform
         end
 
         def template(&block)
-          return if !@if.nil? && !@if
+          return "" if !@if.nil? && !@if
+
+          wrapper_tag = dashed self.class.const_get(:WRAPPER_TAG)
+          button_tag = dashed self.class.const_get(:BUTTON_TAG)
 
-          wrapper_tag = self.class.const_get(:WRAPPER_TAG)
-          button_tag = self.class.const_get(:BUTTON_TAG)
+          label_text = block ? capture(self, &block) : @label.is_a?(Proc) ? @label.pipe : @label # rubocop:disable Style/NestedTernaryOperator
 
-          field_body = proc {
-            send(button_tag, **@attributes) do
-              unsafe_raw(@label.to_s) unless block
-              yield_content(&block)
-            end
+          field_body = html -> { <<~HTML # rubocop:disable Bridgetown/HTMLEscapedHeredoc
+            <#{button_tag}#{html_attributes @attributes, prefix_space: true}>#{text -> { label_text }}</#{button_tag}>
+          HTML
           }
-          return field_body.() unless wrapper_tag
 
-          send wrapper_tag, name: @attributes[:name], &field_body
+          return field_body unless wrapper_tag
+
+          html -> { <<~HTML # rubocop:disable Bridgetown/HTMLEscapedHeredoc
+            <#{wrapper_tag} #{html_attributes name: @attributes[:name]}>#{field_body}</#{wrapper_tag}>
+          HTML
+          }
         end
       end
     end

data/lib/lifeform/libraries/default/input.rb

@@ -3,17 +3,14 @@
 module Lifeform
   module Libraries
     class Default
-      class Input < Phlex::HTML
-        using RefineProcToString
-        include CapturingRenderable
+      class Input
+        include Streamlined::Renderable
 
         attr_reader :form, :field_definition, :attributes
 
         WRAPPER_TAG = :form_field
         INPUT_TAG = :input
 
-        register_element WRAPPER_TAG
-
         def initialize(form, field_definition, **attributes)
           @form = form
           @field_definition = field_definition
@@ -30,7 +27,8 @@ module Lifeform
           @if = attributes.delete(:if)
           attributes[:value] ||= value_for_model if form.model
           attributes[:name] = "#{model_name}[#{attributes[:name]}]" if @model
-          attributes[:id] ||= attributes[:name].parameterize(separator: "_")
+          # TODO: validate if this is enough
+          attributes[:id] ||= attributes[:name].tr("[]", "_").gsub("__", "_").chomp("_") if attributes[:name]
           @label = handle_labels if attributes[:label]
         end
 
@@ -40,35 +38,42 @@ module Lifeform
           form.parent_name ? "#{form.parent_name}[#{name_of_model}]" : name_of_model
         end
 
-        def value_for_model
-          @model.send(attributes[:name])
-        end
+        def value_for_model = @model.send(attributes[:name])
 
         def handle_labels
-          label_text = attributes[:label].to_s
+          label_text = attributes[:label].is_a?(Proc) ? attributes[:label].pipe : attributes[:label]
           label_name = (attributes[:id] || attributes[:name]).to_s
 
           @attributes = attributes.filter_map { |k, v| [k, v] unless k == :label }.to_h
 
-          proc {
-            label(for: label_name) { unsafe_raw label_text }
+          -> { <<~HTML
+            <label for="#{text -> { label_name }}">#{text -> { label_text }}</label>
+          HTML
           }
         end
 
-        def template(&block)
-          return if !@if.nil? && !@if
+        def template(&block) # rubocop:disable Metrics/AbcSize
+          return "" if !@if.nil? && !@if
 
-          wrapper_tag = self.class.const_get(:WRAPPER_TAG)
-          input_tag = self.class.const_get(:INPUT_TAG)
+          wrapper_tag = dashed self.class.const_get(:WRAPPER_TAG)
+          input_tag = dashed self.class.const_get(:INPUT_TAG)
+          closing_tag = input_tag != "input"
 
-          field_body = proc {
-            @label&.()
-            send input_tag, type: @field_type.to_s, **@attributes
-            yield_content(&block)
+          field_body = html -> { <<~HTML # rubocop:disable Bridgetown/HTMLEscapedHeredoc
+            #{html(@label || -> {}).to_s.strip}
+            <#{input_tag} #{html_attributes type: @field_type.to_s, **@attributes}>#{
+              "</#{input_tag}>" if closing_tag
+            }
+            #{html -> { capture(self, &block) } if block}
+          HTML
           }
-          return field_body.() unless wrapper_tag
 
-          send wrapper_tag, name: @attributes[:name], &field_body
+          return field_body unless wrapper_tag
+
+          html -> { <<~HTML # rubocop:disable Bridgetown/HTMLEscapedHeredoc
+            <#{wrapper_tag} #{html_attributes name: @attributes[:name]}>#{field_body.to_s.strip}</#{wrapper_tag}>
+          HTML
+          }
         end
       end
     end

data/lib/lifeform/libraries/default.rb

@@ -10,7 +10,7 @@ module Lifeform
       # @param attributes [Hash]
       # @return [Input]
       def self.object_for_field_definition(form, field_definition, attributes)
-        type_classname = field_definition[:type].to_s.classify
+        type_classname = Lifeform::Form.send(:camelize, field_definition[:type])
         if const_defined?(type_classname)
           const_get(type_classname)
         else

data/lib/lifeform/libraries/shoelace/button.rb

@@ -5,8 +5,6 @@ module Lifeform
     class Shoelace
       class Button < Default::Button
         BUTTON_TAG = :sl_button
-
-        register_element BUTTON_TAG
       end
     end
   end

data/lib/lifeform/libraries/shoelace/input.rb

@@ -6,8 +6,6 @@ module Lifeform
       class Input < Default::Input
         INPUT_TAG = :sl_input
 
-        register_element :sl_input
-
         # no-op
         def handle_labels; end
       end

data/lib/lifeform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lifeform
-  VERSION = "0.10.0"
+  VERSION = "0.12.0"
 end

data/lib/lifeform.rb

@@ -1,22 +1,12 @@
 # frozen_string_literal: true
 
-require "phlex"
-require "active_support/core_ext/string/output_safety"
-
+require "streamlined"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module Lifeform
   class Error < StandardError; end
-
-  module RefineProcToString
-    refine Proc do
-      def to_s
-        call.to_s
-      end
-    end
-  end
 end
 
 if defined?(Bridgetown)
@@ -24,6 +14,5 @@ if defined?(Bridgetown)
   raise "The Lifeform support for Bridgetown requires v1.2 or newer" if Bridgetown::VERSION.to_f < 1.2
 
   Bridgetown.initializer :lifeform do # |config|
-    require "lifeform/phlex_renderable" unless Phlex::HTML.instance_methods.include?(:render_in)
   end
 end

data/lifeform.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Component-centric form object rendering for Ruby"
   spec.homepage = "https://github.com/bridgetownrb/lifeform"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activesupport", ">= 6.0"
-  spec.add_dependency "phlex", "~> 1.0"
+  spec.add_dependency "hash_with_dot_access", ">= 1.2"
+  spec.add_dependency "sequel", ">= 5.72"
+  spec.add_dependency "streamlined", ">= 0.2.0"
   spec.add_dependency "zeitwerk", "~> 2.5"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: lifeform
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: hash_with_dot_access
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: phlex
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.72'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.72'
+- !ruby/object:Gem::Dependency
+  name: streamlined
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +86,6 @@ files:
 - bin/rubocop
 - bin/setup
 - lib/lifeform.rb
-- lib/lifeform/capturing_renderable.rb
 - lib/lifeform/form.rb
 - lib/lifeform/libraries/default.rb
 - lib/lifeform/libraries/default/button.rb
@@ -82,7 +95,6 @@ files:
 - lib/lifeform/libraries/shoelace/button.rb
 - lib/lifeform/libraries/shoelace/input.rb
 - lib/lifeform/libraries/shoelace/submit_button.rb
-- lib/lifeform/phlex_renderable.rb
 - lib/lifeform/version.rb
 - lifeform.gemspec
 homepage: https://github.com/bridgetownrb/lifeform
@@ -98,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/lifeform/capturing_renderable.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Lifeform
-  module CapturingRenderable
-    # NOTE: the previous `with_output_buffer` stuff is for some reason incompatible with Serbea.
-    # So we'll use a simpler capture.
-    def render_in(view_context, &block)
-      if block
-        call(view_context: view_context) do |*args, **kwargs|
-          unsafe_raw(view_context.capture(*args, **kwargs, &block))
-        end.html_safe
-      else
-        call(view_context: view_context).html_safe
-      end
-    end
-  end
-end

data/lib/lifeform/phlex_renderable.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-# Bridgetown-specific workaround that got copied over from the phlex-rails gem (for now)
-module Lifeform
-  module PhlexRenderable
-    def helpers
-      @_view_context
-    end
-
-    def render(renderable, *args, **kwargs, &block)
-      return super if renderable.is_a?(Phlex::HTML)
-      return super if renderable.is_a?(Class) && renderable < Phlex::HTML
-
-      @_target << @_view_context.render(renderable, *args, **kwargs, &block)
-
-      nil
-    end
-
-    def render_in(view_context, &block)
-      if block_given?
-        call(view_context: view_context) do |*args|
-          view_context.with_output_buffer(self) do
-            original_length = @_target.length
-            output = yield(*args)
-            unchanged = (original_length == @_target.length)
-
-            if unchanged
-              if output.is_a?(ActiveSupport::SafeBuffer)
-                unsafe_raw(output)
-              else
-                text(output)
-              end
-            end
-          end
-        end.html_safe
-      else
-        call(view_context: view_context).html_safe
-      end
-    end
-
-    def safe_append=(value)
-      return unless value
-
-      @_target << case value
-        when String then value
-        when Symbol then value.name
-        else value.to_s
-      end
-    end
-
-    def append=(value)
-      return unless value
-
-      if value.html_safe?
-        self.safe_append = value
-      else
-        @_target << case value
-          when String then ERB::Util.html_escape(value)
-          when Symbol then ERB::Util.html_escape(value.name)
-          else ERB::Util.html_escape(value.to_s)
-        end
-      end
-    end
-
-    def capture
-      super.html_safe
-    end
-
-    # Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
-    def set_original_view_context(view_context)
-    end
-  end
-end
-
-Phlex::HTML.prepend(Lifeform::PhlexRenderable)