form_props 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4781f03e94d7cdc4b2c3868e6283c8e3c6241e97eb869d957121b665b2deeb
-  data.tar.gz: c5696aaf2cd138ca74869c228dee0d1f368ed3822c72df389dbfa5d3aaa36103
+  metadata.gz: 90a1bcba67478294801b8ede3004d15a41d78eafa3cd7b55a2d533749979c887
+  data.tar.gz: 1cceaf16df12dad4a4570809a745fca0046c2d616e44a2fb1bce374a83e71c03
 SHA512:
-  metadata.gz: e51e3147f39f549f35d940d5b1f900213e363c6108e06b190d7d1d6dfa318795092986e87edf3cf26bbffcfa4f89b2be4fe623213acc913530902928614b7691
-  data.tar.gz: 63047633479d69d86f7bbd219e760e4d28825a2d2a68863266331365ccab6140cf480221ad2192ff96996a7684d5456e62423b60ae88a20f3bc30965e6368783
+  metadata.gz: b92a397b40ac479f7c54a8488b0134b7cdba4ce82cf0c581362134b06aea46ed24e8bfefda33f38b188e79c17c9214e39f6fd5c525c7892e11588e6cd149f9d3
+  data.tar.gz: ac20f5814f8c0298758164dc6f26fa7b4a0ab793a4210d5f8bfda27ba10cf6f0c8aefe438b65539863342f1adc35fb67fc3159171141fcb26dfc4f0a55066020

data/README.md

@@ -1,11 +1,11 @@
-# Form Props
+# form_props
 
 ![Build Status](https://github.com/thoughtbot/form_props/actions/workflows/build.yml/badge.svg?branch=main)
 
-FormProps is a Rails form builder that outputs HTML props instead of tags. Now
+form_props is a Rails form builder that outputs HTML props instead of tags. Now
 you can enjoy the power and convenience of Rails helpers in React!
 
-By separting attributes from tags, FormProps can offer greater flexbility than normal
+By separting attributes from tags, form_props can offer greater flexbility than normal
 Rails form builders; allowing designers to stay longer in HTML land and more easily
 customize their form structure without needing to know Rails.
 
@@ -98,7 +98,7 @@ documentation here reflects that default. You can change that [behavior](https:/
 if you wish.
 
 ## Flexibility
-FormProps is only concerned about attributes, the designer can focus on tag
+form_props is only concerned about attributes, the designer can focus on tag
 structure and stay longer in HTML land. For example, you can decide to nest an
 input inside a label.
 
@@ -153,7 +153,7 @@ export default (({props, inputs, extras})) => {
 
 ## Error handling
 
-FormProps doesn't handle form errors, but you can easily add this functionality:
+form_props doesn't handle form errors, but you can easily add this functionality:
 
 ```ruby
 json.someForm do

data/lib/form_props/form_builder.rb

@@ -139,6 +139,7 @@ module FormProps
 
     def fields_for_with_nested_attributes(association_name, association, options, block)
       name = "#{object_name}[#{association_name}_attributes]"
+      association_key = "#{association_name.to_s.camelize(:lower)}Attributes"
       association = convert_to_model(association)
       json = @template.instance_variable_get(:@__json)
 
@@ -151,7 +152,7 @@ module FormProps
       if association.respond_to?(:to_ary)
         explicit_child_index = options[:child_index]
 
-        json.set!("#{association_name}Attributes") do
+        json.set!(association_key) do
           json.array! association do |child|
             if explicit_child_index
               options[:child_index] = explicit_child_index.call if explicit_child_index.respond_to?(:call)
@@ -163,7 +164,7 @@ module FormProps
           end
         end
       elsif association
-        json.set!("#{association_name}Attributes") do
+        json.set!(association_key) do
           fields_for_nested_model(name, association, options, block)
         end
       end

data/lib/form_props/inputs/base.rb

@@ -11,34 +11,15 @@ module FormProps
         options = options.with_indifferent_access
 
         @controlled = options.delete(:controlled)
+        @key = options.delete(:key)
+
         super(object_name, method_name, template_object, options)
       end
 
       private
 
       def sanitized_key
-        sanitized_method_name.camelize(:lower)
-      end
-
-      def add_options(option_tags, options, value = nil)
-        if options[:include_blank]
-          content = (options[:include_blank] if options[:include_blank].is_a?(String))
-          label = (" " unless content)
-          option_tags = [{label: content || label, value: ""}] + option_tags
-        end
-
-        if value.blank? && options[:prompt]
-          tag_options = {value: ""}.tap do |prompt_opts|
-            prompt_opts[:disabled] = true if options[:disabled] == ""
-            if options[:selected] == ""
-              selected_values.push("")
-            end
-            prompt_opts[:label] = prompt_text(options[:prompt])
-          end
-          option_tags = [tag_options] + option_tags
-        end
-
-        option_tags
+        @key || sanitized_method_name.camelize(:lower)
       end
 
       def input_props(options)
@@ -129,41 +110,6 @@ module FormProps
 
         tag_values
       end
-
-      def select_content_props(option_tags, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-
-        if placeholder_required?(html_options)
-          raise ArgumentError, "include_blank cannot be false for a required field." if options[:include_blank] == false
-          options[:include_blank] ||= true unless options[:prompt]
-        end
-
-        html_options["type"] = "select"
-        value_for_blank = options.fetch(:selected) { value }
-        option_tags = add_options(option_tags, options, value_for_blank)
-
-        if options[:multiple]
-          html_options["multiple"] = options[:multiple]
-        end
-
-        if selected_values.any?
-          html_options["value"] ||= if html_options["multiple"]
-            Array(selected_values)
-          else
-            selected_values.first
-          end
-        end
-
-        json.set!(sanitized_key) do
-          input_props(html_options)
-
-          if options.key?(:include_hidden)
-            json.includeHidden options[:include_hidden]
-          end
-          json.options(option_tags)
-        end
-      end
     end
   end
 end

data/lib/form_props/inputs/collection_check_boxes.rb

@@ -6,6 +6,8 @@ module FormProps
   module Inputs
     class CollectionCheckBoxes < Base
       include ActionView::Helpers::Tags::CollectionHelpers
+      include ActionView::Helpers::FormOptionsHelper
+
       include CollectionHelpers
 
       class CheckBoxBuilder < Builder

data/lib/form_props/inputs/collection_radio_buttons.rb

@@ -6,6 +6,7 @@ module FormProps
   module Inputs
     class CollectionRadioButtons < Base
       include ActionView::Helpers::Tags::CollectionHelpers
+      include ActionView::Helpers::FormOptionsHelper
       include CollectionHelpers
 
       class RadioButtonBuilder < Builder

data/lib/form_props/inputs/collection_select.rb

@@ -2,8 +2,13 @@
 
 module FormProps
   module Inputs
-    class CollectionSelect < Base # :nodoc:
+    class CollectionSelect < Base
+      if ActionView::VERSION::STRING >= "7.1"
+        include ActionView::Helpers::Tags::SelectRenderer
+      end
+      include ActionView::Helpers::FormOptionsHelper
       include FormOptionsHelper
+      include SelectRenderer
 
       def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
         @collection = collection

data/lib/form_props/inputs/date_field.rb

@@ -6,7 +6,7 @@ module FormProps
       private
 
       def format_date(value)
-        value&.strftime("%Y-%m-%d")
+        value.presence&.strftime("%Y-%m-%d")
       end
 
       def field_type

data/lib/form_props/inputs/grouped_collection_select.rb

@@ -3,7 +3,12 @@
 module FormProps
   module Inputs
     class GroupedCollectionSelect < Base
+      if ActionView::VERSION::STRING >= "7.1"
+        include ActionView::Helpers::Tags::SelectRenderer
+      end
+      include ActionView::Helpers::FormOptionsHelper
       include FormOptionsHelper
+      include SelectRenderer
 
       def initialize(object_name, method_name, template_object, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
         @collection = collection

data/lib/form_props/inputs/radio_button.rb

@@ -22,8 +22,6 @@ module FormProps
         @options[:value] = @tag_value
         @options[:checked] = true if input_checked?(@options)
 
-        name_for_key = (sanitized_method_name + "_#{sanitized_value(@tag_value)}").camelize(:lower)
-
         body_block = -> {
           add_default_name_and_id_for_value(@tag_value, @options)
           input_props(@options)
@@ -32,7 +30,7 @@ module FormProps
         if flatten
           body_block.call
         else
-          json.set!(name_for_key) do
+          json.set!(sanitized_key) do
             body_block.call
           end
         end
@@ -40,6 +38,10 @@ module FormProps
 
       private
 
+      def sanitized_key
+        @key || (sanitized_method_name + "_#{sanitized_value(@tag_value)}").camelize(:lower)
+      end
+
       def checked?(value)
         value.to_s == @tag_value.to_s
       end

data/lib/form_props/inputs/select.rb

@@ -3,7 +3,12 @@
 module FormProps
   module Inputs
     class Select < Base
+      if ActionView::VERSION::STRING >= "7.1"
+        include ActionView::Helpers::Tags::SelectRenderer
+      end
+      include ActionView::Helpers::FormOptionsHelper
       include FormOptionsHelper
+      include SelectRenderer
 
       def initialize(object_name, method_name, template_object, choices, options, html_options)
         @choices = choices

data/lib/form_props/inputs/time_zone_select.rb

@@ -3,7 +3,12 @@
 module FormProps
   module Inputs
     class TimeZoneSelect < Base
+      if ActionView::VERSION::STRING >= "7.1"
+        include ActionView::Helpers::Tags::SelectRenderer
+      end
+      include ActionView::Helpers::FormOptionsHelper
       include FormOptionsHelper
+      include SelectRenderer
 
       def initialize(object_name, method_name, template_object, priority_zones, options, html_options)
         @priority_zones = priority_zones

data/lib/form_props/inputs/weekday_select.rb

@@ -3,7 +3,12 @@
 module FormProps
   module Inputs
     class WeekdaySelect < Base
+      if ActionView::VERSION::STRING >= "7.1"
+        include ActionView::Helpers::Tags::SelectRenderer
+      end
+      include ActionView::Helpers::FormOptionsHelper
       include FormOptionsHelper
+      include SelectRenderer
 
       def initialize(object_name, method_name, template_object, options, html_options)
         @html_options = html_options

data/lib/form_props/select_renderer.rb

@@ -0,0 +1,59 @@
+module FormProps
+  module SelectRenderer
+    def add_options(option_tags, options, value = nil)
+      if options[:include_blank]
+        content = (options[:include_blank] if options[:include_blank].is_a?(String))
+        label = (" " unless content)
+        option_tags = [{label: content || label, value: ""}] + option_tags
+      end
+
+      if value.blank? && options[:prompt]
+        tag_options = {value: ""}.tap do |prompt_opts|
+          prompt_opts[:disabled] = true if options[:disabled] == ""
+          if options[:selected] == ""
+            selected_values.push("")
+          end
+          prompt_opts[:label] = prompt_text(options[:prompt])
+        end
+        option_tags = [tag_options] + option_tags
+      end
+
+      option_tags
+    end
+
+    def select_content_props(option_tags, options, html_options)
+      html_options = html_options.stringify_keys
+      add_default_name_and_id(html_options)
+
+      if placeholder_required?(html_options)
+        raise ArgumentError, "include_blank cannot be false for a required field." if options[:include_blank] == false
+        options[:include_blank] ||= true unless options[:prompt]
+      end
+
+      html_options["type"] = "select"
+      value_for_blank = options.fetch(:selected) { value }
+      option_tags = add_options(option_tags, options, value_for_blank)
+
+      if options[:multiple]
+        html_options["multiple"] = options[:multiple]
+      end
+
+      if selected_values.any?
+        html_options["value"] ||= if html_options["multiple"]
+          Array(selected_values)
+        else
+          selected_values.first
+        end
+      end
+
+      json.set!(sanitized_key) do
+        input_props(html_options)
+
+        if options.key?(:include_hidden)
+          json.includeHidden options[:include_hidden]
+        end
+        json.options(option_tags)
+      end
+    end
+  end
+end

data/lib/form_props/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FormProps
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/form_props.rb

@@ -5,6 +5,7 @@ require "action_pack"
 require "form_props/helper"
 require "form_props/action_view_extensions/form_helper"
 require "form_props/form_options_helper"
+require "form_props/select_renderer"
 require "form_props/inputs/base"
 require "form_props/inputs/text_field"
 require "form_props/inputs/text_area"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form_props
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Johny Ho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,7 @@ files:
 - lib/form_props/inputs/url_field.rb
 - lib/form_props/inputs/week_field.rb
 - lib/form_props/inputs/weekday_select.rb
+- lib/form_props/select_renderer.rb
 - lib/form_props/version.rb
 homepage: https://github.com/thoughtbot/form_props/
 licenses: