view_component-form 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124aec584d29d1b7d181aa25ee3293d0719d9cf4c531f7a0d5cb5859b6be734b
-  data.tar.gz: b78538a52578b141f4c6d8eb45a92d80d8f7bf4f693a63acd9ce36fce80d8921
+  metadata.gz: bbaba838148ba0ba79c3cebbcd9b7ed05cbce8cd560387c9c2ffbf4560105bd6
+  data.tar.gz: 06b8522d30a3d9395c6041f92377b53bef7d1d0a45a695fc9de056bbb5a87168
 SHA512:
-  metadata.gz: d18ac72e6c391c0466be730ab40c6d61ebbf807bc7d2f6a6fb53e35d6f9a23f223a0250e7cf87c6ad5bef507c84e63b141f21af1f2bbcd5baaca050b3b4ab904
-  data.tar.gz: 31353a6e4c1ff4547981b311229cfdfd01d590601a95b38688d357f4db02c5b2ccaed71cffdf1db1290d3a5bb515132eeecd2c1c0881cb00d5eae0da349b966d
+  metadata.gz: 4690faaca7948671849a45d396f9d1c18959c21168cee26bf010ee875086a6bbc2bb775e77e18115eb8a8defa3bdd8e9d39f1a00c988066b6f9750a440a27a8d
+  data.tar.gz: 873c9bd135115de3b95d19f32923dc0e24b6646e1a30b1d3512584c51016406dbb3661da3409a4b9233be13b67bd81a0138368190ae7a00eab40108e1af3e419

data/CHANGELOG.md

@@ -5,7 +5,20 @@ 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.
+Nothing yet
+
+## [0.2.11] - 2025-04-05
+### Fixed
+- Fix Rails 8 integration (#189)
+
+## [0.2.10] - 2025-03-17 (yanked)
+### Added
+- Support for Ruby 3.4 (#186)
+### Removed
+- Drop Ruby 3.0 support (#186)
+- Drop Rails 6.1 support (#186)
+### Fixed
+- Add `text_area` alias to `textarea` helper to follow Rails 8.0 change (#181)
 
 ## [0.2.9] - 2024-11-09
 ### Added
@@ -124,7 +137,9 @@ Nothing yet.
 - Add CHANGELOG (#50)
 - Add CI (#2)
 
-[Unreleased]: https://github.com/pantographe/view_component-form/compare/v0.2.9...HEAD
+[Unreleased]: https://github.com/pantographe/view_component-form/compare/v0.2.11...HEAD
+[0.2.11]: https://github.com/pantographe/view_component-form/compare/v0.2.10...v0.2.11
+[0.2.10]: https://github.com/pantographe/view_component-form/compare/v0.2.9...v0.2.10
 [0.2.9]: https://github.com/pantographe/view_component-form/compare/v0.2.8...v0.2.9
 [0.2.8]: https://github.com/pantographe/view_component-form/compare/v0.2.7...v0.2.8
 [0.2.7]: https://github.com/pantographe/view_component-form/compare/v0.2.6...v0.2.7

data/README.md

@@ -13,8 +13,8 @@ Development of this gem is sponsored by:
 
 This gem is tested on:
 
-- Rails 6.1+ (with or without ActionText)
-- Ruby 3.0+
+- Rails 7.0+ (with or without ActionText)
+- Ruby 3.1+
 
 ## Installation
 
@@ -100,7 +100,7 @@ Then use ActionView form builder helpers as you would normally:
   <%= f.label :password %>          <%# renders a ViewComponent::Form::LabelComponent %>
   <%= f.password_field :password, aria: { describedby: f.field_id(:password, :description) } %>
                                     <%# renders a ViewComponent::Form::PasswordFieldComponent %>
-  <div id="<%= f.field_id(:title, :description) %>">
+  <div id="<%= f.field_id(:password, :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 %>
@@ -358,9 +358,9 @@ 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`
+**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` `textarea` (formerly `text_area` before Rails 8) `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)
+**Partially supported:** `label` (blocks not supported) `rich_textarea` (formerly`rich_text_area` before Rails 8) (untested)
 
 **Unsupported for now:** `field_name`
 

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

@@ -7,8 +7,6 @@ module ViewComponent
         attr_accessor :default_options
       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, allow_nil: true

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

@@ -41,6 +41,16 @@ module ViewComponent
         ).render(&element_proc)
       end
 
+      # See: https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/actionview/lib/action_view/helpers/tags/label.rb#L64
+      def builder
+        @builder ||= begin
+          tag_value = options.delete("value")
+
+          ActionView::Helpers::Tags::Label::LabelBuilder.new(@view_context, object_name, method_name, object, tag_value)
+        end
+      end
+      delegate :translation, to: :builder
+
       protected
 
       def set_html_options!

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

@@ -32,18 +32,10 @@ module ViewComponent
                                         .map(&:upcase_first)
       end
 
-      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("6.1")
-        def method_errors?
-          return false unless object_errors
+      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
+        (object_errors.attribute_names & object_method_names).any?
       end
 
       def value

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

@@ -6,9 +6,7 @@ module ViewComponent
       self.tag_klass = ActionView::Helpers::Tags::FileField
 
       def before_render
-        if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("7.0")
-          @options = { include_hidden: multiple_file_field_include_hidden }.merge!(options)
-        end
+        @options = { include_hidden: multiple_file_field_include_hidden }.merge!(options)
         @options = convert_direct_upload_option_to_url(@options.dup)
 
         super

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

@@ -28,7 +28,7 @@ module ViewComponent
                                              options).render
       end
 
-      # See: https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/actionview/lib/action_view/helpers/tags/label.rb#L48
+      # See: https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/actionview/lib/action_view/helpers/tags/label.rb#L64
       def builder
         @builder ||= begin
           tag_value = options.delete("value")

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

@@ -13,18 +13,14 @@ module ViewComponent
         set_html_options!
       end
 
-      def call # rubocop:disable Metrics/MethodLength
-        if Rails::VERSION::MAJOR >= 7 # rubocop:disable Style/GuardClause
-          ActionView::Helpers::Tags::WeekdaySelect.new(
-            object_name,
-            method_name,
-            @view_context,
-            options,
-            html_options
-          ).render
-        else
-          raise NotImplementedError, "#{self.class} is only available in Rails >= 7"
-        end
+      def call
+        ActionView::Helpers::Tags::WeekdaySelect.new(
+          object_name,
+          method_name,
+          @view_context,
+          options,
+          html_options
+        ).render
       end
 
       protected

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

@@ -14,8 +14,8 @@ class <%= class_name %> < ViewComponent::Form::Builder
   # All standard Rails form helpers
   # include ViewComponent::Form::Helpers::Rails
 
-  # Backports of Rails 7 form helpers (can be removed if you're running Rails >= 7)
-  # include ViewComponent::Form::Helpers::Rails7Backports
+  # Adds support for Rails 8
+  # include ViewComponent::Form::Helpers::Rails8
 
   # Additional form helpers provided by ViewComponent::Form
   # include ViewComponent::Form::Helpers::Custom

data/lib/view_component/form/builder.rb

@@ -6,7 +6,9 @@ module ViewComponent
       include ViewComponent::Form::Renderer
       include ViewComponent::Form::ValidationContext
       include ViewComponent::Form::Helpers::Rails
-      include ViewComponent::Form::Helpers::Rails7Backports if ::Rails::VERSION::MAJOR < 7
+      if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new("8.0")
+        include ViewComponent::Form::Helpers::Rails8
+      end
       include ViewComponent::Form::Helpers::Custom
     end
   end

data/lib/view_component/form/helpers/rails.rb

@@ -7,9 +7,12 @@ module ViewComponent
       module Rails
         # rubocop:disable Metrics/MethodLength
         def self.included(base)
-          base.class_eval do
+          base.class_eval do # rubocop:disable Metrics/BlockLength
             (field_helpers - %i[
+              text_area
+              textarea
               check_box
+              checkbox
               datetime_field
               datetime_local_field
               fields
@@ -31,11 +34,16 @@ module ViewComponent
                 end                                   # end
               RUBY_EVAL
             end
+
             alias_method :phone_field, :telephone_field
           end
         end
         # rubocop:enable Metrics/MethodLength
 
+        def text_area(method, options = {})
+          render_component(:text_area, @object_name, method, objectify_options(options))
+        end
+
         # 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)
@@ -49,9 +57,7 @@ module ViewComponent
         alias datetime_local_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)
-          )
+          render_component(:check_box, @object_name, method, checked_value, unchecked_value, objectify_options(options))
         end
 
         def radio_button(method, tag_value, options = {})

data/lib/view_component/form/helpers/rails8.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  module Form
+    module Helpers
+      # Rails 8.0 changed the spelling of a couple form builder methods while adding aliases
+      # for backward compatibility. This module adds those new methods.
+      #
+      # https://github.com/rails/rails/blob/8-0-stable/actionview/CHANGELOG.md#rails-800beta1-september-26-2024
+      module Rails8
+        def textarea(method, options = {})
+          render_component(:text_area, @object_name, method, objectify_options(options))
+        end
+
+        def checkbox(method, options = {}, checked_value = "1", unchecked_value = "0")
+          render_component(:check_box, @object_name, method, checked_value, unchecked_value, objectify_options(options))
+        end
+
+        def collection_checkboxes(method, collection, value_method, text_method, options = {}, html_options = {}, # rubocop:disable Metrics/ParameterLists
+                                  &block)
+          render_component(
+            :collection_check_boxes, @object_name, method, collection, value_method, text_method,
+            objectify_options(options), @default_html_options.merge(html_options), &block
+          )
+        end
+
+        if defined?(ActionView::Helpers::Tags::ActionText)
+          def rich_textarea(method, options = {})
+            render_component(:rich_text_area, @object_name, method, objectify_options(options))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/view_component/form/test_helpers.rb

@@ -4,6 +4,10 @@ require "action_controller"
 require "action_controller/test_case"
 require "action_view"
 
+class TestView < ActionView::Base
+  include ActionText::TagHelper if defined?(ActionText)
+end
+
 module ViewComponent
   module Form
     module TestHelpers
@@ -15,18 +19,10 @@ module ViewComponent
         :user
       end
 
-      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("6.1")
-        def template
-          lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
-
-          ActionView::Base.new(lookup_context, {}, ApplicationController.new)
-        end
-      else
-        def template
-          lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
+      def template
+        lookup_context = ActionView::LookupContext.new(ActionController::Base.view_paths)
 
-          ActionView::Base.new(lookup_context, {})
-        end
+        TestView.new(lookup_context, {}, ApplicationController.new)
       end
     end
   end

data/lib/view_component/form/version.rb

@@ -2,6 +2,6 @@
 
 module ViewComponent
   module Form
-    VERSION = "0.2.9"
+    VERSION = "0.2.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component-form
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Pantographe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 2025-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.1'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.1'
@@ -135,12 +135,11 @@ files:
 - lib/generators/vcf/builder/templates/builder.rb.erb
 - lib/view_component/form.rb
 - lib/view_component/form/builder.rb
-- lib/view_component/form/class_names_helper.rb
 - lib/view_component/form/configuration.rb
 - lib/view_component/form/engine.rb
 - lib/view_component/form/helpers/custom.rb
 - lib/view_component/form/helpers/rails.rb
-- lib/view_component/form/helpers/rails_7_backports.rb
+- lib/view_component/form/helpers/rails8.rb
 - lib/view_component/form/renderer.rb
 - lib/view_component/form/test_helpers.rb
 - lib/view_component/form/validation_context.rb
@@ -154,7 +153,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Rails FormBuilder for ViewComponent
 test_files: []

data/lib/view_component/form/class_names_helper.rb

@@ -1,39 +0,0 @@
-# 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
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/MethodLength
-      def build_tag_values(*args)
-        tag_values = []
-
-        args.each do |tag_value|
-          case tag_value
-          when Hash
-            tag_value.each do |key, val|
-              tag_values << key.to_s if val && key.present?
-            end
-          when Array
-            tag_values.concat build_tag_values(*tag_value)
-          else
-            tag_values << tag_value.to_s if tag_value.present?
-          end
-        end
-
-        tag_values
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/MethodLength
-
-      def class_names(*args)
-        tokens = build_tag_values(*args).flat_map { |value| value.to_s.split(/\s+/) }.uniq
-
-        safe_join(tokens, " ")
-      end
-    end
-  end
-end
-# :nocov:

data/lib/view_component/form/helpers/rails_7_backports.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponent
-  module Form
-    module Helpers
-      module Rails7Backports
-        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
-    end
-  end
-end