klods-ruby 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69d689812ff62a2d4e4e81169ca4d572eee1c7036af0b17e5b6ad66b6c73c2d
-  data.tar.gz: 0cc52609f3b1fe61aeb480e1a289269dbec20e1a50690bb95b8c645ead2b7506
+  metadata.gz: fa5215d6f8d8d6fdce3f82098a17b2dd9fc5f4047a62bac0a1dfeeca7a2cd62f
+  data.tar.gz: d31d4138d47a2c3677abbfb83393b6fb64f1724ee6c81276d410a41c2ccfe58f
 SHA512:
-  metadata.gz: 1e64fd8cf5a7927ae1edd8486e4fe21ed63fe56db8b53f6021984914c7f1add7dfa44aceb61c258d1b23f4faa64430578a7ebce392a2822170b722344f18a7a0
-  data.tar.gz: 6e2dcccafe102221366b77f3ea062957fde302f4729b9c1475ee9c361b4f96210c40e2b3f6f62479c7e4084132aba6beb2020840ce521b9b30a38473c182fb44
+  metadata.gz: '0516894ed0e82205daa3c7df426842938bbc30281a4c1267a998405736a0e1fcd1844e383d653c1c4236e85974d48216b40ba893ea1a6c19ed0ddd733c707aa0'
+  data.tar.gz: 7fe64308e30edcda9caf2415b08afd4c1b489e35f8bd12c5162a61996aafce0a496f258207f8d0fb2e5c232b31e52fccbc323e82e97718a11ea9686ae24148ca

data/lib/klods/form_builder.rb

@@ -1,13 +1,50 @@
 module Klods
   class FormBuilder < ActionView::Helpers::FormBuilder
-    # Renders a fully wired klods form field: wrapper div, label, input, and
-    # optional help/error text. Error state is read from object.errors automatically.
+    # Renders a fully wired klods input field: wrapper div, label, input, and
+    # optional help/error text. For textarea use f.klods_textarea; for select use f.klods_select.
     #
     # = f.klods_field :email, label: "Email", type: :email, autocomplete: "email"
     # = f.klods_field :password, label: "Password", type: :password, required: true
-    # = f.klods_field :bio, label: "Bio", type: :textarea
     # = f.klods_field :name, label: "Name", help: "Your display name"
     def klods_field(method, label: nil, type: :text, help: nil, required: false, **options)
+      render_klods_wrapper(method, label: label, help: help, required: required) do |aria|
+        send(input_helper_for(type), method, class: "klods-input", **aria, **options)
+      end
+    end
+
+    # Renders a klods textarea field with wrapper, label, and error/help wiring.
+    #
+    # = f.klods_textarea :bio, label: "Bio", help: "Tell us about yourself"
+    def klods_textarea(method, label: nil, help: nil, required: false, **options)
+      render_klods_wrapper(method, label: label, help: help, required: required) do |aria|
+        render_textarea_input(method, class: "klods-textarea", **aria, **options)
+      end
+    end
+
+    # Renders a klods select field with wrapper, label, and error/help wiring.
+    # choices is an array of ["Label", value] pairs (or plain values).
+    #
+    # = f.klods_select :role, [["Admin", "admin"], ["User", "user"]], label: "Role"
+    def klods_select(method, choices = [], label: nil, help: nil, required: false, **options)
+      render_klods_wrapper(method, label: label, help: help, required: required) do |aria|
+        select_el = render_select_input(method, choices, class: "klods-select", **aria, **options)
+        @template.content_tag(:div, select_el, class: "klods-select-wrapper")
+      end
+    end
+
+    # Renders a submit button styled as a primary klods button.
+    #
+    # = f.klods_submit "Save"
+    # = f.klods_submit "Sign up", class: "klods-button--wide"  # extra class merged in
+    def klods_submit(label = nil, **options)
+      extra = options.delete(:class)
+      options[:class] = ["klods-button", "klods-button--primary", extra].compact.join(" ")
+      submit(label, **options)
+    end
+
+    private
+
+    def render_klods_wrapper(method, label:, help:, required:, &input_block)
       errors = Array(object&.errors&.[](method))
       error_msg = errors.first
       is_invalid = !error_msg.nil?
@@ -25,24 +62,12 @@ module Klods
 
       @template.content_tag(:div, class: field_cls) do
         label(method, label || method.to_s.humanize, class: label_cls) +
-          send(input_helper_for(type), method, class: "klods-input", **aria, **options) +
+          input_block.call(aria) +
           ((help && !is_invalid) ? @template.content_tag(:p, help, id: help_id, class: "klods-help") : "".html_safe) +
           (error_msg ? @template.content_tag(:p, error_msg, id: error_id, class: "klods-error", role: "alert") : "".html_safe)
       end
     end
 
-    # Renders a submit button styled as a primary klods button.
-    #
-    # = f.klods_submit "Save"
-    # = f.klods_submit "Sign up", class: "klods-button--wide"  # extra class merged in
-    def klods_submit(label = nil, **options)
-      extra = options.delete(:class)
-      options[:class] = ["klods-button", "klods-button--primary", extra].compact.join(" ")
-      submit(label, **options)
-    end
-
-    private
-
     def input_helper_for(type)
       {
         email: :email_field,
@@ -52,9 +77,25 @@ module Klods
         number: :number_field,
         date: :date_field,
         time: :time_field,
-        search: :search_field,
-        textarea: :text_area
+        search: :search_field
       }.fetch(type, :text_field)
     end
+
+    # Rails 8 FormBuilder#text_area calls @template.textarea(...), which is shadowed
+    # by the klods textarea builder. Build the textarea directly to avoid the conflict.
+    def render_textarea_input(method, **options)
+      name = @object_name.present? ? "#{@object_name}[#{method}]" : method.to_s
+      value = object&.public_send(method).to_s
+      @template.content_tag(:textarea, value, name: name, id: field_id(method), **options)
+    end
+
+    # FormBuilder#select calls @template.select(...), which is shadowed by the klods
+    # select builder. Build the select directly using options_for_select + content_tag.
+    def render_select_input(method, choices, **options)
+      name = @object_name.present? ? "#{@object_name}[#{method}]" : method.to_s
+      selected = object&.public_send(method)
+      options_html = @template.options_for_select(choices, selected)
+      @template.content_tag(:select, options_html, name: name, id: field_id(method), **options)
+    end
   end
 end

data/lib/klods/version.rb

@@ -1,3 +1,3 @@
 module Klods
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klods-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Drue Wilding