simple_form 5.0.0 → 5.3.0

data/lib/simple_form/inputs/base.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'simple_form/i18n_cache'
 require 'active_support/core_ext/string/output_safety'
 require 'action_view/helpers'
 
@@ -9,8 +8,6 @@ module SimpleForm
       include ERB::Util
       include ActionView::Helpers::TranslationHelper
 
-      extend I18nCache
-
       include SimpleForm::Helpers::Autofocus
       include SimpleForm::Helpers::Disabled
       include SimpleForm::Helpers::Readonly

data/lib/simple_form/inputs/boolean_input.rb

@@ -12,7 +12,11 @@ module SimpleForm
                 inline_label
             }
         else
-          build_check_box(unchecked_value, merged_input_options)
+          if include_hidden?
+            build_check_box(unchecked_value, merged_input_options)
+          else
+            build_check_box_without_hidden_field(merged_input_options)
+          end
         end
       end
 
@@ -60,7 +64,7 @@ module SimpleForm
       # we need the hidden field to be *outside* the label (otherwise it
       # generates invalid html - html5 only).
       def build_hidden_field_for_checkbox
-        return "" if !include_hidden? || !unchecked_value
+        return "".html_safe if !include_hidden? || !unchecked_value
         options = { value: unchecked_value, id: nil, disabled: input_html_options[:disabled] }
         options[:name] = input_html_options[:name] if input_html_options.key?(:name)
         options[:form] = input_html_options[:form] if input_html_options.key?(:form)

data/lib/simple_form/inputs/collection_check_boxes_input.rb

@@ -5,7 +5,7 @@ module SimpleForm
       protected
 
       # Checkbox components do not use the required html tag.
-      # More info: https://github.com/plataformatec/simple_form/issues/340#issuecomment-2871956
+      # More info: https://github.com/heartcombo/simple_form/issues/340#issuecomment-2871956
       def has_required?
         false
       end

data/lib/simple_form/inputs/collection_input.rb

@@ -10,10 +10,8 @@ module SimpleForm
       # Texts can be translated using i18n in "simple_form.yes" and
       # "simple_form.no" keys. See the example locale file.
       def self.boolean_collection
-        i18n_cache :boolean_collection do
-          [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
-            [I18n.t(:"simple_form.no", default: 'No'), false] ]
-        end
+        [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
+          [I18n.t(:"simple_form.no", default: 'No'), false] ]
       end
 
       def input(wrapper_options = nil)
@@ -41,7 +39,7 @@ module SimpleForm
       end
 
       def has_required?
-        super && (input_options[:include_blank] || input_options[:prompt] || multiple?)
+        super && (input_options[:include_blank] || input_options[:prompt].present? || multiple?)
       end
 
       # Check if :include_blank must be included by default.

data/lib/simple_form/inputs/grouped_collection_select_input.rb

@@ -23,7 +23,7 @@ module SimpleForm
 
       # Sample collection
       def collection
-        @collection ||= grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
+        @collection ||= grouped_collection.map { |collection| group_method.respond_to?(:call) ? group_method.call(collection) : collection.try(:send, group_method) }.detect(&:present?) || []
       end
 
       def group_method

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/inputs/rich_text_area_input.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Inputs
+    class RichTextAreaInput < Base
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.rich_text_area(attribute_name, merged_input_options)
+      end
+    end
+  end
+end

data/lib/simple_form/inputs.rb

@@ -19,6 +19,7 @@ module SimpleForm
     autoload :PasswordInput
     autoload :PriorityInput
     autoload :RangeInput
+    autoload :RichTextAreaInput
     autoload :StringInput
     autoload :TextInput
   end

data/lib/simple_form/railtie.rb

@@ -11,5 +11,9 @@ module SimpleForm
           ' Use `rails generate simple_form:install` to generate the Simple Form configuration.'
       end
     end
+
+    initializer "simple_form.deprecator" do |app|
+      app.deprecators[:simple_form] = SimpleForm.deprecator if app.respond_to?(:deprecators)
+    end
   end
 end

data/lib/simple_form/version.rb

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

data/lib/simple_form/wrappers/leaf.rb

@@ -13,7 +13,7 @@ module SimpleForm
         method = input.method(@namespace)
 
         if method.arity.zero?
-          ActiveSupport::Deprecation.warn(SimpleForm::CUSTOM_INPUT_DEPRECATION_WARN % { name: @namespace })
+          SimpleForm.deprecator.warn(SimpleForm::CUSTOM_INPUT_DEPRECATION_WARN % { name: @namespace })
 
           method.call
         else

data/lib/simple_form/wrappers/root.rb

@@ -28,11 +28,16 @@ module SimpleForm
         css += SimpleForm.additional_classes_for(:wrapper) do
           input.additional_classes + [input.input_class]
         end
-        css << (options[:wrapper_error_class] || @defaults[:error_class]) if input.has_errors?
-        css << (options[:wrapper_hint_class] || @defaults[:hint_class]) if input.has_hint?
-        css << (options[:wrapper_valid_class] || @defaults[:valid_class]) if input.valid?
+        css << html_class(:error_class, options) { input.has_errors? }
+        css << html_class(:hint_class, options) { input.has_hint? }
+        css << html_class(:valid_class, options) { input.valid? }
         css.compact
       end
+
+      def html_class(key, options)
+        css = (options[:"wrapper_#{key}"] || @defaults[key])
+        css if css && yield
+      end
     end
   end
 end

data/lib/simple_form.rb

@@ -35,7 +35,7 @@ to
 
     def %{name}(wrapper_options)
 
-See https://github.com/plataformatec/simple_form/pull/997 for more information.
+See https://github.com/heartcombo/simple_form/pull/997 for more information.
   WARN
 
   FILE_METHODS_DEPRECATION_WARN = <<-WARN
@@ -55,6 +55,10 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
     @@configured
   end
 
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("5.3", "SimpleForm")
+  end
+
   ## CONFIGURATION OPTIONS
 
   # Method used to tidy up errors.
@@ -114,7 +118,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
@@ -264,21 +268,21 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   ## SETUP
 
   def self.default_input_size=(*)
-    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] SimpleForm.default_input_size= is deprecated and has no effect", caller
+    SimpleForm.deprecator.warn "[SIMPLE_FORM] SimpleForm.default_input_size= is deprecated and has no effect", caller
   end
 
   def self.form_class=(value)
-    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] SimpleForm.form_class= is deprecated and will be removed in 4.x. Use SimpleForm.default_form_class= instead", caller
+    SimpleForm.deprecator.warn "[SIMPLE_FORM] SimpleForm.form_class= is deprecated and will be removed in 4.x. Use SimpleForm.default_form_class= instead", caller
     @@form_class = value
   end
 
   def self.file_methods=(file_methods)
-    ActiveSupport::Deprecation.warn(FILE_METHODS_DEPRECATION_WARN, caller)
+    SimpleForm.deprecator.warn(FILE_METHODS_DEPRECATION_WARN, caller)
     @@file_methods = file_methods
   end
 
   def self.file_methods
-    ActiveSupport::Deprecation.warn(FILE_METHODS_DEPRECATION_WARN, caller)
+    SimpleForm.deprecator.warn(FILE_METHODS_DEPRECATION_WARN, caller)
     @@file_methods
   end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.3.0
 platform: ruby
 authors:
 - José Valim
 - Carlos Antônio
 - Rafael França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,30 +18,30 @@ 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: opensource@plataformatec.com.br
+email: heartcombo@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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
@@ -100,6 +99,7 @@ files:
 - lib/simple_form/inputs/password_input.rb
 - lib/simple_form/inputs/priority_input.rb
 - lib/simple_form/inputs/range_input.rb
+- lib/simple_form/inputs/rich_text_area_input.rb
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/inputs/text_input.rb
 - lib/simple_form/map_type.rb
@@ -112,49 +112,17 @@ files:
 - lib/simple_form/wrappers/many.rb
 - lib/simple_form/wrappers/root.rb
 - lib/simple_form/wrappers/single.rb
-- test/action_view_extensions/builder_test.rb
-- test/action_view_extensions/form_helper_test.rb
-- test/components/custom_components_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/hint_test.rb
-- test/form_builder/input_field_test.rb
-- test/form_builder/label_test.rb
-- test/form_builder/wrapper_test.rb
-- test/generators/simple_form_generator_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/datetime_input_test.rb
-- test/inputs/disabled_test.rb
-- test/inputs/discovery_test.rb
-- test/inputs/file_input_test.rb
-- test/inputs/general_test.rb
-- 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/string_input_test.rb
-- test/inputs/text_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
-homepage: https://github.com/plataformatec/simple_form
+homepage: https://github.com/heartcombo/simple_form
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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/main/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:
 - lib
@@ -162,54 +130,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Forms made easy!
-test_files:
-- test/components/label_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/form_builder/error_notification_test.rb
-- test/form_builder/general_test.rb
-- test/form_builder/button_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/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/disabled_test.rb
-- test/inputs/discovery_test.rb
-- test/inputs/collection_select_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/hidden_input_test.rb
-- test/inputs/file_input_test.rb
-- test/inputs/datetime_input_test.rb
+test_files: []

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