pxs-forms 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8da1ac34353aaecca98a9314d669053b8bd4212681349d2cb5a05b5cc555207
-  data.tar.gz: bb24505ddf539187c82ab89baff8a81213351e7ea8f3bdeae907e709e303f4de
+  metadata.gz: d104c5306510402433e059fc586670ef5e5a1b74e4b9bf2c77c06b2afcb4f670
+  data.tar.gz: d44594a3c375515f24a25b408a7823525d42ccd03825378d1cccf389b59890d1
 SHA512:
-  metadata.gz: e5174781bfef2632e8544bb3ac51ef58861c3f71a35bbb666bcdaab46a3ef2957ebf67d650ba33439ef1fe98e15ca7792a13a6217c54f0d9d56fc4165af6099e
-  data.tar.gz: 92f020826fb32a28db8ee1a89aa16562195f026e56a9b70af3e234ef79b7e1901f074f762ed0d5c7ecf1ce1605b967a8ed3c5e714fed4ba5668b96cafc070344
+  metadata.gz: 0d582f3edaf4ba27891152fa3559fd217ddc23a348143b35d4d8fabd4a5696448733dbede256ba1df927d8da718d4703e3d2a740a22c363dc4014762afda989c
+  data.tar.gz: 5a48c1ae301869a9a27c797f552edff87e2aaa6587a3a28fc360a91d880865c0100ba1d0af8292d5d2c4c20e0592e7bc3be2d1f5da3189281c66d0de248caf61

data/lib/pxs/forms/{link_helpers.rb → links_helper.rb}

@@ -1,6 +1,6 @@
 module Pxs
     module Forms
-        module LinkHelpers
+        module LinksHelper
             def turbo_link_button(text, target, method = :get)
                 link_to text, target, class: "button", data: { turbo_stream: true, turbo_method: method }
             end
@@ -12,4 +12,4 @@ module Pxs
     end
 end
 
-ActionView::Base.send :include, Pxs::Forms::LinkHelpers
+ActionView::Base.send :include, Pxs::Forms::LinksHelper

data/lib/pxs/forms/model_form_builder.rb

@@ -2,22 +2,37 @@ 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 = {})
+        puts attribute
+        puts options.inspect
         @form_options = options
+
+        # extract the object type from the attribute
         object_type = object_type_for_attribute(attribute)
 
+        puts object_type.inspect
+        # 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
 
+        puts input_type.inspect
+
+        # 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
 
+        puts override_input_type.inspect
+
+        # return result of [input_type]_input method
         send("#{override_input_type || input_type}_input", attribute, options)
     end
 
@@ -74,10 +89,10 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
         end
     end
 
-    def collection_input(attriubte, options, &block)
-        field_block(method, options) do
+    def collection_input(attribute, options, &block)
+        field_block(attribute, options) do
             safe_join [
-                label(method, options[:label]),
+                label(attribute, options[:label]),
                 block.call,
             ]
         end
@@ -85,8 +100,10 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def select_input(attribute, options = {})
 
-        value_method = options[:value_method] || :to_s
-        text_method = options[:text_method] || :to_s
+        # 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] || {}
 
         multiple = input_options[:multiple]
@@ -166,7 +183,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
     end
 
     def field_block(attribute, options = {}, &block)
-        tag.div class: "field #{attribute}" do
+        tag.div class: "field #{attribute}", id: options[:field_id] do
             safe_join [
                 block.call,
                 hint_text(options[:hint]),
@@ -187,7 +204,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def error_text(attribute)
         if has_error? attribute
-            tag.div @object.errors[method].join("<br />").html_safe, class: "form-errors"
+            tag.div @object.errors[attribute].join("<br />").html_safe, class: "form-errors"
         end
     end
 

data/lib/pxs/forms/{model_helpers.rb → models_helper.rb}

@@ -1,6 +1,6 @@
 module Pxs
     module Forms
-        module ModelHelpers
+        module ModelsHelper
             # base_path: the model's CRUD base path as an URL string, like the result of article_path(:id)
             def model_edit_delete_actions(base_path)
                 [
@@ -47,10 +47,10 @@ module Pxs
 
             def model_form_with(model: nil, scope: nil, url: nil, format: nil, **options, &block)
                 options = options.reverse_merge(builder: ModelFormBuilder)
-                form_with(model: model, scope: scope, url: url, format: format, class: "form#{options.has_key? :class ? " #{options[:class]}" : ""}", **options, &block)
+                form_with(model: model, scope: scope, url: url, format: format, class: "form#{(options.has_key? :class) ? " #{options[:class]}" : ""}", **options, &block)
             end
         end
     end
 end
 
-ActionView::Base.send :include, Pxs::Forms::ModelHelpers
+ActionView::Base.send :include, Pxs::Forms::ModelsHelper

data/lib/pxs/forms/version.rb

@@ -2,6 +2,6 @@
 
 module Pxs
   module Forms
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

data/lib/pxs/forms.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "forms/version"
-require_relative "forms/link_helpers"
-require_relative "forms/model_helpers"
+require_relative "forms/links_helper"
+require_relative "forms/models_helper"
 require_relative "forms/model_form_builder"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxs-forms
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Poubelle
@@ -24,9 +24,9 @@ files:
 - README.md
 - Rakefile
 - lib/pxs/forms.rb
-- lib/pxs/forms/link_helpers.rb
+- lib/pxs/forms/links_helper.rb
 - lib/pxs/forms/model_form_builder.rb
-- lib/pxs/forms/model_helpers.rb
+- lib/pxs/forms/models_helper.rb
 - lib/pxs/forms/version.rb
 - pxs-forms.gemspec
 - sig/pxs/forms.rbs