view_component-form 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 869789c616058368805d6dba5564a79c4e2ddb9fe85919721a052da761d34e91
-  data.tar.gz: 58b02a2e260e61a97386e41d0c891d5aee3344ca4b5c6aebe3fb1f00514b75f4
+  metadata.gz: 72d1e925f6501a2af4458ca669c87bd9a947173fc4766ec4e72c466f794c649a
+  data.tar.gz: 6c8be1d09936f2ba0de85be506419472bbe84d9901628cbcbb4ea3f90c21b21f
 SHA512:
-  metadata.gz: 82b77433712fbe3b1453d6dceebaa02bb01be4deba4ddcab28e97b1fe60667feacfaf50cc0d8cf2dcecc18db83738ae5a07441255db4728fcfe8420ef4340d86
-  data.tar.gz: 2c08a19fa894929aaeb2a03afa0bd666fa05e9f63bed5e85671f74d32190d2a3d45f58c761a7da1bad2eb20744c7e498da3a9a6c2dcb40f9ba3c15e5afdcb967
+  metadata.gz: 524c3595df4a9891f036584ab79590a8bf2547c32cf74220fe6276ff3c3b6027e14b148ba558151513592a372e29c6ae0f9562c9ae23715500567a34e73c7b05
+  data.tar.gz: 20c3af9cacc78f509a3d10371ab117c6ec6e766ffd1fa418efce9fc0ac4eb87b5a751b4ec0d24a6aab4a0f2f0bc741a97b5064956ee34bfa822ab219e3a46964

data/CHANGELOG.md

@@ -5,6 +5,47 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+Nothing yet
+
+## [0.2.0] - 2022-03-02
+### Added
+- Test BuilderGenerator with generator\_spec (#64)
+- Add HintComponent and ErrorMessageComponent (#98)
+- Add `validation_context` option to `Form::Builder` (#101)
+- Add `validators` helper to `FieldComponent` (#101)
+- Add `optional?` and `required?` helpers to `FieldComponent` (#101)
+- Add `label_text` helper (#103)
+- Add `field_id` helper, backported from Rails 7.0 (#104)
+- Add `weekday_select` helper (#105)
+- Add README section about supported helpers (#106)
+- Setup zeitwerk (#107)
+- Add documentation for tests (#108)
+
+## [0.1.3] - 2022-01-11
+### Fixed
+- Update dependencies for Rails 7.0.0 (#96)
+- Bump to Rails 7 in Gemfile.lock (#99)
+
+## [0.1.2] - 2021-12-07
+### Added
+- Add missing component specs (#75)
+- Add missing builder specs for return values (#76)
+- Add accurate test cases for all helpers from ActionView::Helpers::FormBuilder
+  documentation (#85)
+
+### Changed
+- Cross-documented Rails form helpers (#84)
+- Made tag_klass optional when inheriting from a component class (#87)
+- Improve README: generator, html_class example (#88)
+- Make rails version condition used the same way (#92)
+- Add rails 7.0 and make rails head works (#94)
+- Allow `Base` and `FieldComponent` to support forms without objects (#95)
+
+### Fixed
+- Fix `phone_field` helper (#74)
+- Fix `datetime_local_field` helper (#76)
+- Fix `time_zone_select` helper (#76)
+- Resolve Rails 6.1 deprecation on ActiveModel::Errors#keys call (#91)
 
 ## [0.1.1] - 2021-09-27
 
@@ -17,7 +58,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.0] - 2021-09-16
 
 ### Added
-
 - `FormBuilder`: add `.namespace` method to allow local lookup of components (#54)
 - Add basic `ViewComponent::Form::Builder` that can be used in place of Rails' `ActionView::Helpers::FormBuilder` (#1)
 - Add all standard FormBuilder helpers provided by Rails, implemented as ViewComponents (#4)
@@ -25,6 +65,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add CHANGELOG (#50)
 - Add CI (#2)
 
-[Unreleased]: https://github.com/pantographe/view_component-form/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/pantographe/view_component-form/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/pantographe/view_component-form/compare/v0.1.3...v0.2.0
+[0.1.3]: https://github.com/pantographe/view_component-form/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/pantographe/view_component-form/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/pantographe/view_component-form/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/pantographe/view_component-form/releases/tag/v0.1.0

data/README.md

@@ -24,7 +24,7 @@ And then execute:
 
 ## Usage
 
-Add a `builder` param to your `form_for` of `form_with`:
+Add a `builder` param to your `form_for`, `form_with`, `fields_for` or `fields`:
 
 ```diff
 - <%= form_for @user do |f| %>
@@ -48,7 +48,13 @@ Then call your helpers as usual:
   <%= f.email_field :email %>       <%# renders a ViewComponent::Form::EmailFieldComponent %>
 
   <%= f.label :password %>          <%# renders a ViewComponent::Form::LabelComponent %>
-  <%= f.password_field :password %> <%# renders a ViewComponent::Form::PasswordFieldComponent %>
+  <%= f.password_field :password, aria: { describedby: f.field_id(:password, :description) } %>
+                                    <%# renders a ViewComponent::Form::PasswordFieldComponent %>
+  <div id="<%= f.field_id(:title, :description) %>">
+    <%= f.hint :password, 'The password should be at least 8 characters long' %>
+                                      <%# renders a ViewComponent::Form::HintComponent %>
+    <%= f.error_message :password %>  <%# renders a ViewComponent::Form::ErrorMessageComponent %>
+  </div>
 <% end %>
 ```
 
@@ -64,12 +70,15 @@ It should work out of the box, but does nothing particularly interesting for now
 
   <label for="user_last_name">Last name</label>
   <input type="text" value="Doe" name="user[last_name]" id="user_last_name" />
-  
+
   <label for="user_email">E-mail</label>
   <input type="email" value="john.doe@example.com" name="user[email]" id="user_email" />
-  
+
   <label for="user_password">Password</label>
-  <input type="password" name="user[password]" id="user_password" />
+  <input type="password" name="user[password]" id="user_password" aria-describedby="user_password_description" />
+  <div id="user_password_description">
+    <div>The password should be at least 8 characters long</div>
+  </div>
 </form>
 ```
 
@@ -91,14 +100,14 @@ This allows you to pick the namespace your components will be loaded from.
 # lib/custom_form_builder.rb
 class CustomFormBuilder < ViewComponent::Form::Builder
   # Set the namespace you want to use for your own components
-  namespace Form
+  namespace Custom::Form
 end
 ```
 
-You can change the default namespace and path:
+Use the generator options to change the default namespace or the path where the file will be created:
 
 ```console
-bin/rails generate vcf:builder AnotherCustomFormBuilder --namespace Forms::Components --path app/forms
+bin/rails generate vcf:builder AnotherCustomFormBuilder --namespace AnotherCustom::Form --path app/forms
 
       create  app/forms/another_custom_form_builder.rb
 ```
@@ -107,23 +116,22 @@ bin/rails generate vcf:builder AnotherCustomFormBuilder --namespace Forms::Compo
 # app/forms/another_custom_form_builder.rb
 class AnotherCustomFormBuilder < ViewComponent::Form::Builder
   # Set the namespace you want to use for your own components
-  namespace Forms::Components
+  namespace AnotherCustom::Form
 end
 ```
 
-:warning: **Everything below this line describes the future usage and is subject to change. It does not work yet as the gem is still under heavy development.**
-
-Now let's generate your own components to customize the rendering.
+Now let's generate your own components to customize their rendering. We can use the standard view_component generator:
 
 ```console
-bin/rails generate vcf:component Form::TextField
+bin/rails generate component Custom::Form::TextField --inline --parent ViewComponent::Form::TextFieldComponent
 
       invoke  test_unit
-      create  test/components/form/text_field_component_test.rb
-      create  app/components/form/text_field_component.rb
-      create  app/components/form/text_field_component.html.erb
+      create  test/components/custom/form/text_field_component_test.rb
+      create  app/components/custom/form/text_field_component.rb
 ```
 
+:warning: The `--parent` option is available since ViewComponent [`v2.41.0`](https://viewcomponent.org/CHANGELOG.html#2410). If you're using a previous version, you can always edit the generated `Custom::Form::CustomTextFieldComponent` class to make it inherit from `ViewComponent::Form::TextFieldComponent`.
+
 Change your forms to use your new builder:
 
 ```diff
@@ -131,26 +139,247 @@ Change your forms to use your new builder:
 + <%= form_for @user, builder: CustomFormBuilder do |f| %>
 ```
 
-You can then customize the behavior of your `Form::TextFieldComponent`:
+You can then customize the behavior of your `Custom::Form::CustomTextFieldComponent`:
 
 ```rb
-# app/components/form/text_field_component.rb
+# app/components/custom/form/text_field_component.rb
 
-module Form
-  class TextFieldComponent < ViewComponent::Form::TextFieldComponent
-    def html_class
-      class_names("text-field", "border-error": method_errors?)
-    end
+class Admin::Form::TextFieldComponent < ViewComponent::Form::TextFieldComponent
+  def html_class
+    class_names("custom-text-field", "has-error": method_errors?)
   end
 end
 ```
 
-The generated form field with now have your class names:
+In this case we leverage the [`#class_names`](https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-class_names) helper to:
+- always add the `custom-text-field` class;
+- add the `has-error` class if there is an error on the attribute (using `ViewComponent::Form::FieldComponent#method_errors?`).
+
+The rendered form field will now look like this:
+
+```html
+<input class="custom-text-field" type="text" value="John" name="user[first_name]" id="user_first_name">
+```
+
+You can use the same approach to inject options, wrap the input in a `<div>`, etc.
+
+We'll add more use cases to the documentation soon.
+
+### Building your own components
+
+When building your own ViewComponents for using in forms, it's recommended to inherit from `ViewComponent::Form::FieldComponent`, so you get access to the following helpers:
+
+#### `#label_text`
+
+Returns the translated text for the label of the field (looking up for `helpers.label.OBJECT.METHOD_NAME`), or humanized version of the method name if not available.
+
+```rb
+# app/components/custom/form/group_component.rb
+class Custom::Form::GroupComponent < ViewComponent::Form::FieldComponent
+end
+```
+
+```erb
+<%# app/components/custom/form/group_component.html.erb %>
+<div class="custom-form-group">
+  <label>
+    <%= label_text %><br />
+    <%= content %>
+  </label>
+</div>
+```
+
+```erb
+<%# app/views/users/_form.html.erb %>
+<%= form_for @user do |f| %>
+  <%= f.group :first_name do %>
+    <%= f.text_field :first_name %>
+  <% end %>
+<% end %>
+```
+
+```yml
+# config/locales/en.yml
+en:
+  helpers:
+    label:
+      user:
+        first_name: Your first name
+```
+
+Renders:
 
 ```html
-<input class="text-field" type="text" value="John" name="user[first_name]" id="user_first_name">
+<form class="edit_user" id="edit_user_1" action="/users/1" accept-charset="UTF-8" method="post">
+  <!-- ... -->
+  <label>
+    Your first name<br />
+    <input type="text" value="John" name="user[first_name]" id="user_first_name" />
+  </label>
+</form>
+```
+
+#### Validations
+
+Let's consider the following model for the examples below.
+
+```rb
+# app/models/user.rb
+class User < ActiveRecord::Base
+  validates :first_name, presence: true, length: { minimum: 2, maximum: 255 }
+end
+```
+
+##### Accessing validations with `#validators`
+
+Returns all validators for the method name.
+
+```rb
+# app/components/custom/form/group_component.rb
+class Custom::Form::GroupComponent < ViewComponent::Form::FieldComponent
+  private
+
+  def validation_hint
+    if length_validator
+      "between #{length_validator.options[:minimum]} and #{length_validator.options[:maximum]} chars"
+    end
+  end
+
+  def length_validator
+    validators.find { |v| v.is_a?(ActiveModel::Validations::LengthValidator) }
+  end
+end
+```
+
+```erb
+<%# app/components/custom/form/group_component.html.erb %>
+<div class="custom-form-group">
+  <label>
+    <%= label_text %> (<%= validation_hint %>)<br />
+    <%= content %>
+  </label>
+</div>
 ```
 
+##### Using `#required?` and `#optional?`
+
+```erb
+<%# app/components/custom/form/group_component.html.erb %>
+<div class="custom-form-group">
+  <label>
+    <%= label_text %><%= " (required)" if required? %><br />
+    <%= content %>
+  </label>
+</div>
+```
+
+##### Validation contexts
+
+When using [validation contexts](https://guides.rubyonrails.org/active_record_validations.html#on), you can specify a context to the helpers above.
+
+```rb
+# app/models/user.rb
+class User < ActiveRecord::Base
+  validates :first_name, presence: true, length: { minimum: 2, maximum: 255 }
+  validates :email, presence: true, on: :registration
+end
+```
+
+```erb
+<%# app/views/users/_form_.html.erb %>
+<%= form_with model: @user,
+              builder: ViewComponent::Form::Builder,
+              validation_context: :registration do |f| %>
+  <%= f.group :email do %>
+    <%= f.email_field :email %>
+  <% end %>
+<% end %>
+```
+
+In this case, `ViewComponent::Form::Builder` accepts a `validation_context` option and passes it as a default value to the `#validators`, `#required?` and `#optional?` helpers.
+
+Alternatively, you can pass the context to the helpers:
+
+```erb
+<%= "(required)" if required?(context: :registration) %>
+```
+
+```rb
+def length_validator
+  validators(context: :registration).find { |v| v.is_a?(ActiveModel::Validations::LengthValidator) }
+end
+```
+
+### Using your form components without a backing model
+
+If you want to ensure that your fields display consistently across your app, you'll need to lean on Rails' own helpers. You may be used to using form tag helpers such as `text_field_tag` to generate tags, or even writing out plain HTML tags. These can't be integrated with a form builder, so they won't offer you the benefits of this gem.
+
+You'll most likely want to use either:
+
+- [`form_with`](https://api.rubyonrails.org/v6.1.4/classes/ActionView/Helpers/FormHelper.html#method-i-form_with) and supply a route as the endpoint, e.g. `form_with url: users_path do |f| ...`, or
+- [`fields`](https://api.rubyonrails.org/v6.1.4/classes/ActionView/Helpers/FormHelper.html#method-i-fields), supplying a namespace if necessary. `fields do |f| ...` ought to work in the most basic case.
+
+[`fields_for`](https://api.rubyonrails.org/v6.1.4/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for) may also be of interest. To make consistent use of `view_component-form`, you'll want to be using these three helpers to build your forms wherever possible.
+
+## Supported helpers
+
+The following helpers are currently supported by `ViewComponent::Form`.
+
+### `ActionView::Helpers::FormBuilder`
+
+**Supported:** `button` `check_box` `collection_check_boxes` `collection_radio_buttons` `collection_select` `color_field` `date_field` `date_select` `datetime_field` `datetime_local_field` `datetime_select` `email_field` `fields` `fields_for` `file_field` `field_id` `grouped_collection_select` `hidden_field` `month_field` `number_field` `password_field` `phone_field` `radio_button` `range_field` `search_field` `select` `submit` `telephone_field` `text_area` `text_field` `time_field` `time_select` `time_zone_select` `to_model` `to_partial_path` `url_field` `week_field` `weekday_select`
+
+**Partially supported:** `label` (blocks not supported) `rich_text_area` (untested)
+
+**Unsupported for now:** `field_name`
+
+### Specific to `ViewComponent::Form`
+
+**Supported:** `error_message` `hint`
+
+## Testing your components
+
+### RSpec
+
+#### Configuration
+
+This assumes your already have read and configured [tests for `view_component`](https://viewcomponent.org/guide/testing.html#rspec-configuration).
+
+```rb
+# spec/rails_helper.rb
+require "view_component/test_helpers"
+require "view_component/form/test_helpers"
+require "capybara/rspec"
+
+RSpec.configure do |config|
+  config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponent::Form::TestHelpers, type: :component
+  config.include Capybara::RSpecMatchers, type: :component
+end
+```
+
+#### Example
+
+```rb
+# spec/components/form/text_field_component_spec.rb
+RSpec.describe Form::TextFieldComponent, type: :component do
+  let(:object)  { User.new } # replace with a model of your choice
+  let(:form)    { form_with(object) }
+  let(:options) { {} }
+
+  let(:component) { render_inline(described_class.new(form, object_name, :first_name, options)) }
+
+  context "with simple args" do
+    it do
+      expect(component.to_html)
+        .to have_tag("input", with: { name: "user[first_name]", id: "user_first_name", type: "text" })
+    end
+  end
+end
+```
+
+For more complex components, we recommend the [`rspec-html-matchers` gem](https://github.com/kucaahbe/rspec-html-matchers).
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/app/components/view_component/form/base_component.rb

@@ -7,15 +7,12 @@ module ViewComponent
         attr_accessor :default_options
       end
 
-      if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new("6.1")
-        require "view_component/form/class_names_helper"
-        include ClassNamesHelper
-      end
+      include ClassNamesHelper if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new("6.1")
 
       attr_reader :form, :object_name, :options
 
-      delegate :object, to: :form
-      delegate :errors, to: :object, prefix: true
+      delegate :object, to: :form, allow_nil: true
+      delegate :errors, to: :object, prefix: true, allow_nil: true
 
       def initialize(form, object_name, options = {})
         @form = form
@@ -28,6 +25,8 @@ module ViewComponent
       end
 
       def object_errors?
+        return false unless object
+
         object.errors.any?
       end
 

data/app/components/view_component/form/error_message_component.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  module Form
+    class ErrorMessageComponent < FieldComponent
+      class_attribute :tag, instance_reader: false, instance_writer: false, instance_accessor: false,
+                            instance_predicate: false
+
+      self.tag = :div
+
+      def call
+        tag.public_send(self.class.tag, messages, **options)
+      end
+
+      def render?
+        method_errors?
+      end
+
+      def messages
+        safe_join(method_errors, tag.br)
+      end
+    end
+  end
+end

data/app/components/view_component/form/field_component.rb

@@ -3,12 +3,13 @@
 module ViewComponent
   module Form
     class FieldComponent < BaseComponent
-      class << self
-        attr_accessor :tag_klass
-      end
+      class_attribute :tag_klass, instance_reader: false, instance_writer: false, instance_accessor: false,
+                                  instance_predicate: false
 
       attr_reader :method_name
 
+      delegate :validation_context, to: :form
+
       def initialize(form, object_name, method_name, options = {})
         # See: https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/actionview/lib/action_view/helpers/tags/base.rb#L13
         @method_name = method_name.to_s.dup
@@ -31,8 +32,18 @@ module ViewComponent
                                         .map(&:upcase_first)
       end
 
-      def method_errors?
-        (object_errors.keys & object_method_names).any?
+      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("6.1")
+        def method_errors?
+          return false unless object_errors
+
+          (object_errors.attribute_names & object_method_names).any?
+        end
+      else
+        def method_errors?
+          return false unless object_errors
+
+          (object_errors.keys & object_method_names).any?
+        end
       end
 
       def value
@@ -51,6 +62,36 @@ module ViewComponent
         end
       end
 
+      # From https://github.com/rails/rails/blob/497ab719d04a2d505f4d6a76c9d359b3d7f8e502/actionview/lib/action_view/helpers/tags/label.rb#L18-L27
+      def label_text
+        content ||= ActionView::Helpers::Tags::Translator.new(object, object_name, method_name,
+                                                              scope: "helpers.label").translate
+        content ||= method_name.humanize
+        content
+      end
+
+      def optional?(context: validation_context)
+        return nil if object.nil?
+
+        !required?(context: context)
+      end
+
+      def required?(context: validation_context)
+        return nil if object.nil?
+
+        validators(context: context).any?(ActiveModel::Validations::PresenceValidator)
+      end
+
+      def validators(context: validation_context)
+        method_validators.select do |validator|
+          if context.nil?
+            validator.options[:on].blank?
+          else
+            Array(validator.options[:on]).include?(context&.to_sym)
+          end
+        end
+      end
+
       private
 
       def singular_association_method_name
@@ -60,6 +101,14 @@ module ViewComponent
       def collection_association_method_name
         @collection_association_method_name ||= method_name.to_s.sub(/_ids$/, "").pluralize.to_sym
       end
+
+      def method_validators
+        @method_validators ||= if object.nil?
+                                 []
+                               else
+                                 object.class.validators_on(method_name)
+                               end
+      end
     end
   end
 end

data/app/components/view_component/form/hint_component.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  module Form
+    class HintComponent < FieldComponent
+      class_attribute :tag, instance_reader: false, instance_writer: false, instance_accessor: false,
+                            instance_predicate: false
+      attr_reader :attribute_content
+
+      self.tag = :div
+
+      def initialize(form, object_name, method_name, content_or_options = nil, options = nil)
+        options ||= {}
+
+        content_is_options = content_or_options.is_a?(Hash)
+        if content_is_options
+          options.merge! content_or_options
+          @attribute_content = nil
+        else
+          @attribute_content = content_or_options
+        end
+
+        super(form, object_name, method_name, options)
+      end
+
+      def call
+        content_or_options = content.presence || attribute_content.presence
+
+        tag.public_send(self.class.tag, content_or_options, **options)
+      end
+
+      def render?
+        content.present? || attribute_content.present?
+      end
+    end
+  end
+end

data/app/components/view_component/form/weekday_select_component.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+if Rails::VERSION::MAJOR >= 7
+  module ViewComponent
+    module Form
+      class WeekdaySelectComponent < FieldComponent
+        attr_reader :html_options
+
+        def initialize(form, object_name, method_name, options = {}, html_options = {})
+          @html_options = html_options
+
+          super(form, object_name, method_name, options)
+
+          set_html_options!
+        end
+
+        def call
+          ActionView::Helpers::Tags::WeekdaySelect.new(
+            object_name,
+            method_name,
+            @view_context,
+            options,
+            html_options
+          ).render
+        end
+
+        protected
+
+        def set_html_options!
+          @html_options[:class] = class_names(html_options[:class], html_class)
+          @html_options.delete(:class) if @html_options[:class].blank?
+        end
+      end
+    end
+  end
+end

data/lib/generators/vcf/builder/builder_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rails/generators"
-
 module Vcf
   module Generators
     class BuilderGenerator < Rails::Generators::NamedBase

data/lib/generators/vcf/builder/templates/builder.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class <%= class_name %> < ViewComponent::Form::Builder
   # Set the namespace you want to use for your own components
   namespace "<%= components_namespace %>"

data/lib/view_component/form/builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "action_view"
-
 module ViewComponent
   module Form
     class Builder < ActionView::Helpers::FormBuilder
@@ -29,13 +27,28 @@ module ViewComponent
         end
       end
 
+      attr_reader :validation_context
+
       def initialize(*)
         @__component_klass_cache = {}
 
         super
-      end
 
-      (field_helpers - %i[label check_box radio_button fields_for fields hidden_field file_field]).each do |selector|
+        @validation_context = options[:validation_context]
+      end
+
+      (field_helpers - %i[
+        check_box
+        datetime_field
+        datetime_local_field
+        fields
+        fields_for
+        file_field
+        hidden_field
+        label
+        phone_field
+        radio_button
+      ]).each do |selector|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def #{selector}(method, options = {}) # def text_field(method, options = {})
             render_component(                   #   render_component(
@@ -47,12 +60,20 @@ module ViewComponent
           end                                   # end
         RUBY_EVAL
       end
+      alias phone_field telephone_field
 
       # See: https://github.com/rails/rails/blob/33d60cb02dcac26d037332410eabaeeb0bdc384c/actionview/lib/action_view/helpers/form_helper.rb#L2280
       def label(method, text = nil, options = {}, &block)
         render_component(:label, @object_name, method, text, objectify_options(options), &block)
       end
 
+      def datetime_field(method, options = {})
+        render_component(
+          :datetime_local_field, @object_name, method, objectify_options(options)
+        )
+      end
+      alias datetime_locale_field datetime_field
+
       def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
         render_component(
           :check_box, @object_name, method, checked_value, unchecked_value, objectify_options(options)
@@ -88,18 +109,6 @@ module ViewComponent
         render_component(:button, value, options, &block)
       end
 
-      # SELECTORS.each do |selector|
-      #   class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      #     def #{selector}(*args)
-      #       render_component(
-      #         :#{selector},
-      #         *args,
-      #         super,
-      #       )
-      #     end
-      #   RUBY_EVAL
-      # end
-
       # See: https://github.com/rails/rails/blob/fe76a95b0d252a2d7c25e69498b720c96b243ea2/actionview/lib/action_view/helpers/form_options_helper.rb
       def select(method, choices = nil, options = {}, html_options = {}, &block)
         render_component(
@@ -169,9 +178,9 @@ module ViewComponent
         )
       end
 
-      def time_zone_select(method, options = {}, html_options = {})
+      def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
         render_component(
-          :time_zone_select, @object_name, method,
+          :time_zone_select, @object_name, method, priority_zones,
           objectify_options(options), @default_html_options.merge(html_options)
         )
       end
@@ -182,6 +191,33 @@ module ViewComponent
         end
       end
 
+      def error_message(method, options = {})
+        render_component(:error_message, @object_name, method, objectify_options(options))
+      end
+
+      def hint(method, text = nil, options = {}, &block)
+        render_component(:hint, @object_name, method, text, objectify_options(options), &block)
+      end
+
+      # Backport field_id from Rails 7.0
+      if Rails::VERSION::MAJOR < 7
+        def field_id(method_name, *suffixes, namespace: @options[:namespace], index: @index)
+          object_name = object_name.model_name.singular if object_name.respond_to?(:model_name)
+
+          sanitized_object_name = object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").delete_suffix("_")
+
+          sanitized_method_name = method_name.to_s.delete_suffix("?")
+
+          [
+            namespace,
+            sanitized_object_name.presence,
+            (index unless sanitized_object_name.empty?),
+            sanitized_method_name,
+            *suffixes
+          ].tap(&:compact!).join("_")
+        end
+      end
+
       private
 
       def render_component(component_name, *args, &block)

data/lib/view_component/form/class_names_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # Backport of https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-class_names
+# :nocov:
 module ViewComponent
   module Form
     module ClassNamesHelper
@@ -35,3 +36,4 @@ module ViewComponent
     end
   end
 end
+# :nocov:

data/lib/view_component/form/engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rails/engine"
-
 module ViewComponent
   module Form
     # :nodoc:

data/lib/view_component/form/test_helpers.rb

@@ -7,20 +7,24 @@ require "action_view"
 module ViewComponent
   module Form
     module TestHelpers
-      def form_with(object, options = {})
-        ViewComponent::Form::Builder.new(object_name, object, template, options)
+      def form_with(object, builder: ViewComponent::Form::Builder, **options)
+        builder.new(object_name, object, template, options)
       end
 
       def object_name
         :user
       end
 
-      def template
-        lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
+      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("6.1")
+        def template
+          lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
 
-        if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("6.1")
           ActionView::Base.new(lookup_context, {}, ApplicationController.new)
-        else
+        end
+      else
+        def template
+          lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
+
           ActionView::Base.new(lookup_context, {})
         end
       end

data/lib/view_component/form/version.rb

@@ -2,6 +2,6 @@
 
 module ViewComponent
   module Form
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/view_component/form.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "form/version"
+require "view_component"
+require "zeitwerk"
+
+loader = Zeitwerk::Loader.for_gem
+form = "#{__dir__}/form.rb"
+loader.ignore(form)
+loader.push_dir("#{__dir__}/form", namespace: ViewComponent::Form)
+loader.setup
+
 require_relative "form/engine"
-require_relative "form/builder"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component-form
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Pantographe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -19,7 +19,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: Rails FormBuilder for ViewComponent
 email:
 - oss@pantographe.studio
@@ -89,13 +103,14 @@ files:
 - app/components/view_component/form/color_field_component.rb
 - app/components/view_component/form/date_field_component.rb
 - app/components/view_component/form/date_select_component.rb
-- app/components/view_component/form/datetime_field_component.rb
 - app/components/view_component/form/datetime_local_field_component.rb
 - app/components/view_component/form/datetime_select_component.rb
 - app/components/view_component/form/email_field_component.rb
+- app/components/view_component/form/error_message_component.rb
 - app/components/view_component/form/field_component.rb
 - app/components/view_component/form/file_field_component.rb
 - app/components/view_component/form/grouped_collection_select_component.rb
+- app/components/view_component/form/hint_component.rb
 - app/components/view_component/form/label_component.rb
 - app/components/view_component/form/month_field_component.rb
 - app/components/view_component/form/number_field_component.rb
@@ -114,6 +129,7 @@ files:
 - app/components/view_component/form/time_zone_select_component.rb
 - app/components/view_component/form/url_field_component.rb
 - app/components/view_component/form/week_field_component.rb
+- app/components/view_component/form/weekday_select_component.rb
 - lib/generators/vcf/builder/builder_generator.rb
 - lib/generators/vcf/builder/templates/builder.rb.erb
 - lib/view_component/form.rb
@@ -130,6 +146,7 @@ metadata:
   changelog_uri: https://github.com/pantographe/view_component-form/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/pantographe/view_component-form
   bug_tracker_uri: https://github.com/pantographe/view_component-form/issues
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -145,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Rails FormBuilder for ViewComponent

data/app/components/view_component/form/datetime_field_component.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponent
-  module Form
-    class DatetimeFieldComponent < FieldComponent
-      self.tag_klass = ActionView::Helpers::Tags::DatetimeField
-    end
-  end
-end