pxs-forms 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324b3ef527145d19d5c6a532dfc4ee187d44f1dfbb4982e49638bd9e971be45c
-  data.tar.gz: ac81d5570b80ff460e4d7f2264e06e1cc2aa10881a4722de455b1571dda73aab
+  metadata.gz: efd3c44a4990b55513ce3a025fa5a3e763667733668cdc3ecbd16859fec1629a
+  data.tar.gz: c3274a8654d27e4785b4ae937218dc5c48f12e283038b052ccaaf385df94c91b
 SHA512:
-  metadata.gz: bf6f2f4f433ac338c0e269524222e35552a7ef9274de4fde57f5cedaf48d7cdc51006c009dac83d0c7b971fc4e4584968a7b6ed1fd78b30e815191cb3a44ad05
-  data.tar.gz: 02c2b704d7d9fe619df0e0e160156cdaba5bdea9f245c028a1725e8ecc7c289b8f03d9ca636e1b2f22fd45d5c9ea0a8bf30ab7776e96d57c9a37a1be09fb5588
+  metadata.gz: f9eb444f40f1f9b869c29a2dfdb64f7206ea546f557296c880a704ce1d2f0d8ed5a3e1e2eef316dfdfafbcedf38735cf9df765d33e98cdf7ceba485ea3693b85
+  data.tar.gz: b529cad7defd4dc231af3a7e77324a54e7fb03c9c7df3ee2bf475f85dc6ec8410ca59d9d81ceb08b1d8d70ca9a942118177e5b8b5a527c111e8a242636fc1d86

data/lib/pxs/forms/model_form_builder.rb

@@ -2,30 +2,22 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     delegate :tag, :safe_join, to: :@template
 
-    # define a model field
-    # the format is deduced from the column type or attribute name
     def field(attribute, options = {})
         @form_options = options
-
-        # extract the object type from the attribute
         object_type = object_type_for_attribute(attribute)
 
-        # set the input type depending on the attribute type
         input_type = case object_type
             when :date then :string
             when :integer then :string
             else object_type
         end
 
-        # if as: :input_type is set, use it to set input type
         override_input_type = if options[:as]
             options[:as]
-        # for collections, use a Select
         elsif options[:collection]
             :select
         end
 
-        # return result of [input_type]_input method
         send("#{override_input_type || input_type}_input", attribute, options)
     end
 
@@ -57,7 +49,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
         field_block(attribute, options) do
             safe_join [
                 (field_label(attribute, options[:label]) unless options[:label] == false),
-                string_field(attribute, merge_input_options({class: "form-control #{"is-invalid" if has_error?(attribute)}"}, options[:input_html])),
+                string_field(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options)),
             ]
         end
     end
@@ -66,7 +58,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
         field_block(attribute, options) do
             safe_join [
             (field_label(attribute, options[:label]) unless options[:label] == false),
-            text_area(attribute, merge_input_options({class: "form-control #{"is-invalid" if has_error?(attribute)}"}, options[:input_html])),
+            text_area(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options)),
             ]
         end
     end
@@ -75,7 +67,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
         field_block(attribute, options) do
             tag.div(class: "checkbox-field") do
             safe_join [
-                check_box(attribute, merge_input_options({class: "checkbox-input"}, options[:input_html])),
+                check_box(attribute, merge_input_options({class: "checkbox-input"}, options)),
                 label(attribute, options[:label], class: "checkbox-label"),
             ]
             end
@@ -93,16 +85,14 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def select_input(attribute, options = {})
 
-        # default value method to :id
-        value_method = options[:value_method] || :id
-        # default text method to :name
-        text_method = options[:text_method] || :name
-        input_options = options[:input_html] || {}
+        value_method = options[:value_method] || :to_s
+        text_method = options[:text_method] || :to_s
+        input_options = options || {}
 
         multiple = input_options[:multiple]
 
         collection_input(attribute, options) do
-            collection_select(attribute, options[:collection], value_method, text_method, options, merge_input_options({class: "#{"custom-select" unless multiple} form-control #{"is-invalid" if has_error?(attribute)}"}, options[:input_html]))
+            collection_select(attribute, options[:collection], value_method, text_method, options, merge_input_options({class: "#{"custom-select" unless multiple} #{"is-invalid" if has_error?(attribute)}"}, options))
         end
     end
 
@@ -110,7 +100,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
         # We probably need to go back later and adjust this for more customization
         collection_input(attribute, options) do
-        grouped_collection_select(attribute, options[:collection], :last, :first, :to_s, :to_s, options, merge_input_options({class: "custom-select form-control #{"is-invalid" if has_error?(attribute)}"}, options[:input_html]))
+        grouped_collection_select(attribute, options[:collection], :last, :first, :to_s, :to_s, options, merge_input_options({class: "custom-select #{"is-invalid" if has_error?(attribute)}"}, options))
       end
     end
 
@@ -176,7 +166,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
     end
 
     def field_block(attribute, options = {}, &block)
-        tag.div class: "field #{attribute}", id: options[:field_id] do
+        tag.div class: "field #{attribute}" do
             safe_join [
                 block.call,
                 hint_text(options[:hint]),
@@ -197,7 +187,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def error_text(attribute)
         if has_error? attribute
-            tag.div @object.errors[attribute].join("<br />").html_safe, class: "form-errors"
+            tag.div @object.errors[method].join("<br />").html_safe, class: "form-errors"
         end
     end
 

data/lib/pxs/forms/version.rb

@@ -2,6 +2,6 @@
 
 module Pxs
   module Forms
-    VERSION = "0.0.8"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxs-forms
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Poubelle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: