lifeform 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef99043fb289f536c1a3b6986a48675dc741854ffef6e99c596c5d9abca303a
-  data.tar.gz: 61821150d087888c5b243e2c52916534f7fc8b4fb8a14ced79692d3bb1ed1f45
+  metadata.gz: 3f4e4bde45197eefcdc0b683d50f2f3474fc7ebdd5f270c8f00fb3e59443c50c
+  data.tar.gz: 40a91e75586e7335bb0322c13f0acb98de1eb7b83623f229aebb10a4f0a9f395
 SHA512:
-  metadata.gz: 8b64f7550a79f0e7667ac422a9cecb364943c544e9583f724842326d4cb9b28b74ae0dee19427be1121fcfd4e9b1a9e5e7878ff1cc8a2e22ee65dd734a0c69e1
-  data.tar.gz: adec1d8e7d8a800f667953ef4e91f90935878a9e1dc6095a82536625bf675ee9f1be74ee3ed31f1857807c9ee75dcd3b36f95a42c32ba79aa10cca0395240dc8
+  metadata.gz: e6e3a2dfe4a53d67c9cb9f902113e44721a0cc05c23ffb997c93af5363de15f9a265abf32e9a66da3157066004e9ebc371107857f04b6dee6e874df03385412e
+  data.tar.gz: a3881f17b6db8e0b33fff0ad609f8a2f0bf48cd276a5bb9cf06cbf4e55892308f2df5155c2cdd1649c30004680d9aea64d2a6a2ba98cd51a831c78d55f6257fa

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - lib/lifeform/phlex_renderable.rb

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.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    lifeform (0.10.0)
-      activesupport (>= 6.0)
-      phlex (~> 1.0)
+    lifeform (0.11.0)
+      activesupport (>= 7.0)
+      phlex (>= 1.7)
       zeitwerk (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -19,59 +19,65 @@ GEM
     backport (1.2.0)
     benchmark (0.2.1)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    cgi (0.3.6)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
-    i18n (1.12.0)
+    erb (4.0.2)
+      cgi (>= 0.3.3)
+    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)
+    minitest (5.18.1)
+    minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.13.10-arm64-darwin)
+    nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    phlex (1.0.0)
+      racc
+    phlex (1.8.1)
+      concurrent-ruby (~> 1.2)
+      erb (>= 4)
       zeitwerk (~> 2.6)
-    racc (1.6.1)
+    racc (1.7.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rubocop (1.40.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.3)
       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.0, < 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.29.0)
+      parser (>= 3.2.1.0)
     rubocop-minitest (0.20.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     solargraph (0.45.0)
       backport (~> 1.2)
       benchmark
@@ -87,15 +93,13 @@ 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)
+    thor (1.2.2)
+    tilt (2.2.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.4.2)
+    yard (0.9.34)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-21

data/lib/lifeform/form.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/string/inflections"
+require "active_support/ordered_options"
 
 module Lifeform
   FieldDefinition = Struct.new(:type, :library, :parameters)
@@ -17,19 +18,27 @@ module Lifeform
       end
 
       # Helper to point to `I18n.t` method
-      def t(...)
-        I18n.t(...)
-      end
+      def t(...) = I18n.t(...)
+
+      def configuration = @configuration ||= ActiveSupport::OrderedOptions.new
 
+      # @param block [Proc, nil]
       # @return [Hash<Symbol, FieldDefinition>]
-      def fields
+      def fields(&block)
         @fields ||= {}
+        @fields_setup_block = block if block_given?
+
+        @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)
@@ -88,14 +97,10 @@ module Lifeform
       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]
@@ -124,6 +129,8 @@ module Lifeform
       @library = Libraries.const_get(@library_name.to_s.classify)
       @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
@@ -191,8 +198,6 @@ module Lifeform
       end
     end
 
-    def auto_render_fields
-      self.class.fields.map { |k, _v| render(field(k)) }
-    end
+    def auto_render_fields = self.class.fields.map { |k, _v| render(field(k)) }
   end
 end

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

@@ -40,9 +40,7 @@ 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

data/lib/lifeform/phlex_renderable.rb

@@ -62,9 +62,7 @@ module Lifeform
       end
     end
 
-    def capture
-      super.html_safe
-    end
+    def capture = super.html_safe
 
     # Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
     def set_original_view_context(view_context)

data/lib/lifeform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lifeform
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 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.
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   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 "activesupport", ">= 7.0"
+  spec.add_dependency "phlex", ">= 1.7"
   spec.add_dependency "zeitwerk", "~> 2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifeform
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: phlex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,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:
   - - ">="