phlexi-form 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f345a67190416cfdcc18fe2aca2afcdd34bf2105bed8660cdfd3e0b1a1b89b32
-  data.tar.gz: 94f2449fa3c5ff8122603da1b5c0fed9fd6b9ba17400962ee09a903aad9c8ada
+  metadata.gz: b2b5a56ff16834553f8f99764902656bef82869bedb49ccd2ee62c3f9a2bb074
+  data.tar.gz: ad2a47b6317b7f12278e5c74ece5f3056a8f18b458bdc1fd5210f3e8b458d453
 SHA512:
-  metadata.gz: 7b1f5154b5cad9217b03e62660241d67df061068849b09e912f1d6bdf97f7af51ffca6b9f485eb9bc4d8427d5c32e9368faa4e141aa9a6e4fff7b14f4fb21d91
-  data.tar.gz: f6acee1be466e4dae92139929cea531611142bac5a4fbf5ab57af3dacfdb402137d272b019cfd1c05f69593faadaa3ee36b9586ca77bb2203304083f363229a3
+  metadata.gz: e6c0e4adf1cce96a7d8b744bc1f0e965725aca7f3e9ff35aabecb0984a8dfe12e829eee7407d6204c46c9e2bc9465b1b97e42b1b0ac5a416ba4a3fb6bc7d81a7
+  data.tar.gz: 17435e4ed5c77af281100a14d54082787a32c33059b4d588d086b022cfd042abf1c8d9158e78a2490bb08385592005d6d16a73f2801a8664bf02b22e0e9e1b2d

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## [Unreleased]
 
+## [0.14.4]
+
+- A field's full error now names the attribute by the field's own label when it
+  is given one (`field(:oidc_issuer, label: "Issuer URL")`), so the message
+  under the field matches the label above it. Fields without a label, or with
+  `label: false`, keep ActiveModel's `human_attribute_name`. Per-model and
+  per-attribute `format` overrides still apply.
+- `input_tag` on a field inferred as `:string` now renders a text input with the
+  usual text attributes, instead of falling through to the unhandled-type branch.
+- Fix extracting input from an empty nested collection (`nest_many`), which
+  passed `nil` to the block.
+
+## [0.14.3]
+
+- Fix `Checkbox#checked?` so boolean-ish values from JSON/text columns or params
+  (`"f"`, `"F"`, `"FALSE"`, `"off"`, `"OFF"`, `0`, `:false`, ...) render unchecked.
+  The recognised falsey set now mirrors Rails' `ActiveModel::Type::Boolean::FALSE_VALUES`
+  instead of only `""`, `"0"` and lowercase `"false"`.
+
 ## [0.2.0] - 2024-07-31
 
 - Initial release

data/gemfiles/default.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.6.2)
+    phlexi-form (0.14.3)
       activesupport
-      phlex (~> 1.11)
-      phlexi-field
+      phlex (~> 2.0)
+      phlexi-field (~> 0.2.0)
       zeitwerk
 
 GEM
@@ -27,6 +27,8 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
     activesupport (7.2.1)
       base64
       bigdecimal
@@ -38,8 +40,8 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
     appraisal (2.5.0)
       bundler
@@ -104,18 +106,18 @@ GEM
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    phlex (1.11.0)
-    phlex-testing-capybara (0.1.0)
-      capybara (~> 3.38)
-      phlex (>= 0.5)
-    phlexi-field (0.0.11)
-      activesupport
+    phlex (2.4.1)
+      refract (~> 1.0)
+      zeitwerk (~> 2.7)
+    phlexi-field (0.2.0)
+      activesupport (>= 7.1)
       fiber-local
-      phlex (~> 1.11)
+      phlex (~> 2.0)
       zeitwerk
+    prism (1.9.0)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.1)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rack (3.1.7)
     rack-session (2.0.0)
@@ -144,6 +146,9 @@ GEM
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
+    refract (1.1.0)
+      prism
+      zeitwerk
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
@@ -187,19 +192,20 @@ GEM
     webrick (1.8.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   arm64-darwin-24
   x86_64-darwin
 
 DEPENDENCIES
+  activemodel
   appraisal
   bundle-audit
+  capybara
   combustion
   minitest
   minitest-reporters
-  phlex-testing-capybara
   phlexi-form!
   rake
   standard

data/gemfiles/rails_7.gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.3.1)
+    phlexi-form (0.14.3)
       activesupport
-      phlex (~> 1.11)
+      phlex (~> 2.0)
+      phlexi-field (~> 0.2.0)
       zeitwerk
 
 GEM
@@ -91,8 +92,8 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
+    base64 (0.3.0)
+    bigdecimal (4.1.3)
     builder (3.3.0)
     bundle-audit (0.1.0)
       bundler-audit
@@ -112,15 +113,18 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.8)
+    connection_pool (3.0.2)
     crass (1.0.6)
     date (3.3.4)
-    drb (2.2.1)
+    drb (2.2.3)
     erubi (1.13.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
     irb (1.14.0)
@@ -140,13 +144,15 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.25.1)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mutex_m (0.2.0)
+    mutex_m (0.3.0)
     net-imap (0.4.16)
       date
       net-protocol
@@ -157,16 +163,23 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.26.3)
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    phlex (1.11.0)
-    phlex-testing-capybara (0.1.0)
-      capybara (~> 3.38)
-      phlex (>= 0.5)
+    phlex (2.4.1)
+      refract (~> 1.0)
+      zeitwerk (~> 2.7)
+    phlexi-field (0.2.0)
+      activesupport (>= 7.1)
+      fiber-local
+      phlex (~> 2.0)
+      zeitwerk
+    prism (1.9.0)
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)
@@ -212,6 +225,9 @@ GEM
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
+    refract (1.1.0)
+      prism
+      zeitwerk
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
@@ -233,6 +249,7 @@ GEM
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
+    sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
     standard (1.40.0)
       language_server-protocol (~> 3.17.0.2)
@@ -258,18 +275,20 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.8.3)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-darwin
 
 DEPENDENCIES
+  activemodel
   appraisal
   bundle-audit
+  capybara
   combustion
   minitest
   minitest-reporters
-  phlex-testing-capybara
   phlexi-form!
   rails (~> 7.1.3, >= 7.1.3.4)
   rake

data/lib/phlexi/form/components/checkbox.rb

@@ -27,12 +27,20 @@ module Phlexi
           @include_hidden != false
         end
 
+        # Stringified form of Rails' ActiveModel::Type::Boolean::FALSE_VALUES.
+        # Kept as a literal set (rather than depending on activemodel) so a
+        # boolean-ish value from a JSON/text column or params — "f", "F",
+        # "FALSE", "off", 0, :false, ... — is recognised as unchecked. The
+        # component compares field.dom.value, which stringifies the underlying
+        # value, so the integer/symbol/boolean forms collapse onto these.
+        FALSE_VALUES = ["", "0", "f", "F", "false", "FALSE", "off", "OFF"].freeze
+
         def checked?
           return false if field.dom.value == @unchecked_value
 
           if @checked_value == "1" # using default values
             # handle nils, numbers and booleans
-            !["", "0", "false"].include?(field.dom.value)
+            !FALSE_VALUES.include?(field.dom.value)
           else # custom value, so explicit match
             field.dom.value == @checked_value
           end

data/lib/phlexi/form/components/input.rb

@@ -24,6 +24,7 @@ module Phlexi
 
         def build_input_attributes
           attributes.fetch(:type) { attributes[:type] = field.inferred_string_field_type || field.inferred_field_type }
+          attributes[:type] = :text if attributes[:type] == :string
           attributes.fetch(:disabled) { attributes[:disabled] = field.disabled? }
 
           case attributes[:type]

data/lib/phlexi/form/options/errors.rb

@@ -76,7 +76,7 @@ module Phlexi
         end
 
         def full_errors_on_attribute
-          object.errors.full_messages_for(key)
+          full_messages_for(key)
         end
 
         def errors_on_association
@@ -84,7 +84,39 @@ module Phlexi
         end
 
         def full_errors_on_association
-          association_reflection ? object.errors.full_messages_for(association_reflection.name) : []
+          association_reflection ? full_messages_for(association_reflection.name) : []
+        end
+
+        # ActiveModel names the attribute with human_attribute_name. A field
+        # given its own label names it as the form shows it, so the message
+        # under the field matches the label above it.
+        def full_messages_for(attribute)
+          return object.errors.full_messages_for(attribute) unless custom_label?
+
+          format, *defaults = full_message_formats(attribute)
+          object.errors.messages_for(attribute).map do |message|
+            I18n.t(format, default: defaults, attribute: label, message: message)
+          end
+        end
+
+        # The format keys ActiveModel::Error.full_message looks up, so per-model
+        # and per-attribute formats still apply when the label is swapped in.
+        def full_message_formats(attribute)
+          formats = []
+          if ActiveModel::Error.i18n_customize_full_message && object.class.respond_to?(:i18n_scope)
+            scope = "#{object.class.i18n_scope}.errors.models"
+            formats = object.class.lookup_ancestors.flat_map do |klass|
+              [
+                :"#{scope}.#{klass.model_name.i18n_key}.attributes.#{attribute}.format",
+                :"#{scope}.#{klass.model_name.i18n_key}.format"
+              ]
+            end
+          end
+          formats + [:"errors.format", "%{attribute} %{message}"]
+        end
+
+        def custom_label?
+          label.present? && label != calculate_label
         end
 
         def has_custom_error?

data/lib/phlexi/form/structure/namespace_collection.rb

@@ -9,7 +9,7 @@ module Phlexi
         def extract_input(params)
           namespace = namespaces[0]
           unless namespace
-            build_namespace(0)
+            namespace = build_namespace(0)
             @block.call(namespace)
           end
 

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.14.2"
+    VERSION = "0.14.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: phlex-testing-capybara
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="