simple_form 5.0.3 → 5.2.0

data/lib/simple_form/inputs/priority_input.rb

@@ -5,8 +5,7 @@ module SimpleForm
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
-        @builder.send(:"#{input_type}_select", attribute_name, input_priority,
-                      input_options, merged_input_options)
+        send(:"#{input_type}_input", merged_input_options)
       end
 
       def input_priority
@@ -15,6 +14,21 @@ module SimpleForm
 
       protected
 
+      def country_input(merged_input_options)
+        @builder.send(:country_select,
+                      attribute_name,
+                      input_options.merge(priority_countries: input_priority),
+                      merged_input_options)
+      end
+
+      def time_zone_input(merged_input_options)
+        @builder.send(:time_zone_select,
+                      attribute_name,
+                      input_priority,
+                      input_options,
+                      merged_input_options)
+      end
+
       def skip_include_blank?
         super || input_priority.present?
       end

data/lib/simple_form/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SimpleForm
-  VERSION = "5.0.3".freeze
+  VERSION = "5.2.0".freeze
 end

data/lib/simple_form.rb

@@ -114,7 +114,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   mattr_reader :form_class
   @@form_class = :simple_form
 
-  # You can define the default class to be used on all forms. Can be overriden
+  # You can define the default class to be used on all forms. Can be overridden
   # with `html: { :class }`. Defaults to none.
   mattr_accessor :default_form_class
   @@default_form_class = nil

data/test/components/label_test.rb

@@ -4,10 +4,6 @@ require 'test_helper'
 
 # Isolated tests for label without triggering f.label.
 class IsolatedLabelTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
-  end
-
   def with_label_for(object, attribute_name, type, options = {})
     with_concat_form_for(object) do |f|
       options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)

data/test/form_builder/wrapper_test.rb

@@ -195,12 +195,12 @@ class WrapperTest < ActionView::TestCase
       with_form_for @user, :name
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
-      output_buffer.replace ""
+      output_buffer.to_s.replace ""
 
       with_form_for @user, :name, wrapper: :another
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
-      output_buffer.replace ""
+      output_buffer.to_s.replace ""
     end
 
     with_form_for @user, :name, wrapper: custom_wrapper

data/test/inputs/boolean_input_test.rb

@@ -33,6 +33,11 @@ class BooleanInputTest < ActionView::TestCase
     assert_select 'input[type=hidden][value=off]'
   end
 
+  test 'input allows skipping hidden input when setting :include_hidden to false' do
+    with_input_for @user, :active, :boolean, include_hidden: false
+    assert_no_select "input[type=hidden][name='user[active]']"
+  end
+
   test 'input uses inline boolean style by default' do
     with_input_for @user, :active, :boolean
     assert_select 'input.boolean + label.boolean.optional'
@@ -154,6 +159,14 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input with nested style and with single wrapper allows disabling hidden field' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, include_hidden: false, wrapper: custom_wrapper_with_wrapped_label_input
+      assert_select "label.boolean > input.boolean"
+      assert_no_select "input[type=hidden] + label.boolean"
+    end
+  end
+
   test 'input with nested style does not include hidden field when unchecked_value is false' do
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean, unchecked_value: false

data/test/inputs/collection_check_boxes_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionCheckBoxesInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionCheckBoxesInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input check boxes does not include for attribute by default' do
     with_input_for @user, :gender, :check_boxes, collection: %i[male female]
     assert_select 'label'

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionRadioButtonsInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionRadioButtonsInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates boolean radio buttons by default for radio types' do
     with_input_for @user, :active, :radio_buttons
     assert_select 'input[type=radio][value=true].radio_buttons#user_active_true'

data/test/inputs/collection_select_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionSelectInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'

data/test/inputs/country_input_test.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+require 'test_helper'
+
+class CountryInputTest < ActionView::TestCase
+  test 'input generates a country select field' do
+    with_input_for @user, :country, :country
+    assert_select 'select#user_country'
+    assert_select 'select option[value=BR]', 'Brazil'
+    assert_no_select 'select option[value=""][disabled=disabled]'
+  end
+
+  test 'input generates a country select with SimpleForm default' do
+    swap SimpleForm, country_priority: [ 'Brazil' ] do
+      with_input_for @user, :country, :country
+      assert_select 'select option[value="BR"] + option[value="---------------"][disabled=disabled]'
+    end
+  end
+
+  test 'input generates a country select using options priority' do
+    with_input_for @user, :country, :country, priority: [ 'Ukraine' ]
+    assert_select 'select option[value="UA"] + option[value="---------------"][disabled=disabled]'
+  end
+
+  test 'input does generate select element with required html attribute' do
+    with_input_for @user, :country, :country
+    assert_select 'select.required'
+    assert_select 'select[required]'
+  end
+
+  test 'input does generate select element with aria-required html attribute' do
+    with_input_for @user, :country, :country
+    assert_select 'select.required'
+    assert_select 'select[aria-required]'
+  end
+end

data/test/inputs/grouped_collection_select_input_test.rb

@@ -66,6 +66,19 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
     end
   end
 
+  test 'grouped collection allows overriding group_method using a lambda' do
+    with_input_for @user, :tag_ids, :grouped_select,
+      collection: { Authors: %w[Jose Carlos] },
+      group_method: ->(i) { i.last }
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Authors]' do
+        assert_select 'option[value=Jose]', 'Jose'
+        assert_select 'option[value=Carlos]', 'Carlos'
+      end
+    end
+  end
+
   test 'grouped collection accepts group_label_method option' do
     with_input_for @user, :tag_ids, :grouped_select,
       collection: { %w[Jose Carlos] => 'Authors' },

data/test/inputs/{priority_input_test.rb → time_zone_input_test.rb}

@@ -2,21 +2,7 @@
 # encoding: UTF-8
 require 'test_helper'
 
-class PriorityInputTest < ActionView::TestCase
-  test 'input generates a country select field' do
-    with_input_for @user, :country, :country
-    assert_select 'select#user_country'
-    assert_select 'select option[value=BR]', 'Brazil'
-    assert_no_select 'select option[value=""][disabled=disabled]'
-  end
-
-  test 'input generates a country select with SimpleForm default' do
-    swap SimpleForm, country_priority: [ 'Brazil' ] do
-      with_input_for @user, :country, :country
-      assert_select 'select option[value="---------------"][disabled=disabled]'
-    end
-  end
-
+class TimeZoneInputTest < ActionView::TestCase
   test 'input generates a time zone select field' do
     with_input_for @user, :time_zone, :time_zone
     assert_select 'select#user_time_zone'
@@ -36,14 +22,14 @@ class PriorityInputTest < ActionView::TestCase
     assert_no_select 'select option[value=""]', /^$/
   end
 
-  test 'priority input does generate select element with required html attribute' do
-    with_input_for @user, :country, :country
+  test 'input does generate select element with required html attribute' do
+    with_input_for @user, :time_zone, :time_zone
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
-  test 'priority input does generate select element with aria-required html attribute' do
-    with_input_for @user, :country, :country
+  test 'input does generate select element with aria-required html attribute' do
+    with_input_for @user, :time_zone, :time_zone
     assert_select 'select.required'
     assert_select 'select[aria-required]'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.2.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 description: Forms made easy!
 email: heartcombo@googlegroups.com
 executables: []
@@ -82,7 +82,6 @@ files:
 - lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
-- lib/simple_form/i18n_cache.rb
 - lib/simple_form/inputs.rb
 - lib/simple_form/inputs/base.rb
 - lib/simple_form/inputs/block_input.rb
@@ -132,6 +131,7 @@ files:
 - test/inputs/collection_radio_buttons_input_test.rb
 - test/inputs/collection_select_input_test.rb
 - test/inputs/color_input_test.rb
+- test/inputs/country_input_test.rb
 - test/inputs/datetime_input_test.rb
 - test/inputs/disabled_test.rb
 - test/inputs/discovery_test.rb
@@ -140,12 +140,12 @@ files:
 - test/inputs/grouped_collection_select_input_test.rb
 - test/inputs/hidden_input_test.rb
 - test/inputs/numeric_input_test.rb
-- test/inputs/priority_input_test.rb
 - test/inputs/readonly_test.rb
 - test/inputs/required_test.rb
 - test/inputs/rich_text_area_input_test.rb
 - test/inputs/string_input_test.rb
 - test/inputs/text_input_test.rb
+- test/inputs/time_zone_input_test.rb
 - test/simple_form_test.rb
 - test/support/discovery_inputs.rb
 - test/support/misc_helpers.rb
@@ -155,7 +155,13 @@ files:
 homepage: https://github.com/heartcombo/simple_form
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/heartcombo/simple_form
+  documentation_uri: https://rubydoc.info/github/heartcombo/simple_form
+  changelog_uri: https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/heartcombo/simple_form
+  bug_tracker_uri: https://github.com/heartcombo/simple_form/issues
+  wiki_uri: https://github.com/heartcombo/simple_form/wiki
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -164,54 +170,55 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Forms made easy!
 test_files:
-- test/components/label_test.rb
+- test/action_view_extensions/builder_test.rb
+- test/action_view_extensions/form_helper_test.rb
 - test/components/custom_components_test.rb
-- test/support/discovery_inputs.rb
-- test/support/misc_helpers.rb
-- test/support/mock_controller.rb
-- test/support/models.rb
-- test/test_helper.rb
-- test/form_builder/error_test.rb
-- test/form_builder/hint_test.rb
+- test/components/label_test.rb
+- test/form_builder/association_test.rb
+- test/form_builder/button_test.rb
 - test/form_builder/error_notification_test.rb
+- test/form_builder/error_test.rb
 - test/form_builder/general_test.rb
-- test/form_builder/button_test.rb
+- test/form_builder/hint_test.rb
 - test/form_builder/input_field_test.rb
 - test/form_builder/label_test.rb
 - test/form_builder/wrapper_test.rb
-- test/form_builder/association_test.rb
 - test/generators/simple_form_generator_test.rb
-- test/action_view_extensions/builder_test.rb
-- test/action_view_extensions/form_helper_test.rb
-- test/simple_form_test.rb
-- test/inputs/string_input_test.rb
-- test/inputs/numeric_input_test.rb
-- test/inputs/rich_text_area_input_test.rb
-- test/inputs/readonly_test.rb
-- test/inputs/grouped_collection_select_input_test.rb
-- test/inputs/text_input_test.rb
-- test/inputs/collection_check_boxes_input_test.rb
 - test/inputs/boolean_input_test.rb
+- test/inputs/collection_check_boxes_input_test.rb
+- test/inputs/collection_radio_buttons_input_test.rb
+- test/inputs/collection_select_input_test.rb
+- test/inputs/color_input_test.rb
+- test/inputs/country_input_test.rb
+- test/inputs/datetime_input_test.rb
 - test/inputs/disabled_test.rb
 - test/inputs/discovery_test.rb
-- test/inputs/collection_select_input_test.rb
+- test/inputs/file_input_test.rb
 - test/inputs/general_test.rb
-- test/inputs/color_input_test.rb
-- test/inputs/required_test.rb
-- test/inputs/collection_radio_buttons_input_test.rb
-- test/inputs/priority_input_test.rb
+- test/inputs/grouped_collection_select_input_test.rb
 - test/inputs/hidden_input_test.rb
-- test/inputs/file_input_test.rb
-- test/inputs/datetime_input_test.rb
+- test/inputs/numeric_input_test.rb
+- test/inputs/readonly_test.rb
+- test/inputs/required_test.rb
+- test/inputs/rich_text_area_input_test.rb
+- test/inputs/string_input_test.rb
+- test/inputs/text_input_test.rb
+- test/inputs/time_zone_input_test.rb
+- test/simple_form_test.rb
+- test/support/discovery_inputs.rb
+- test/support/misc_helpers.rb
+- test/support/mock_controller.rb
+- test/support/models.rb
+- test/test_helper.rb

data/lib/simple_form/i18n_cache.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-module SimpleForm
-  # A lot of configuration values are retrived from I18n,
-  # like boolean collection, required string. This module provides
-  # caching facility to speed up form construction.
-  module I18nCache
-    def i18n_cache(key)
-      get_i18n_cache(key)[I18n.locale] ||= yield.freeze
-    end
-
-    def get_i18n_cache(key)
-      if class_variable_defined?(:"@@#{key}")
-        class_variable_get(:"@@#{key}")
-      else
-        reset_i18n_cache(key)
-      end
-    end
-
-    def reset_i18n_cache(key)
-      class_variable_set(:"@@#{key}", {})
-    end
-  end
-end