simple_form 2.0.0 → 3.5.1

data/lib/simple_form/inputs/grouped_collection_select_input.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class GroupedCollectionSelectInput < CollectionInput
-      def input
+      def input(wrapper_options = nil)
         label_method, value_method = detect_collection_methods
+
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
         @builder.grouped_collection_select(attribute_name, grouped_collection,
                       group_method, group_label_method, value_method, label_method,
-                      input_options, input_html_options)
+                      input_options, merged_input_options)
       end
 
       private
@@ -19,7 +23,7 @@ module SimpleForm
 
       # Sample collection
       def collection
-        @collection ||= grouped_collection.first.try(:send, group_method) || []
+        @collection ||= grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
       end
 
       def group_method
@@ -36,6 +40,15 @@ module SimpleForm
 
         label
       end
+
+      def detect_method_from_class(collection_classes)
+        return {} if collection_classes.empty?
+
+        sample = collection_classes.first
+
+        { label: SimpleForm.collection_label_methods.find { |m| sample.instance_methods.include?(m) },
+          value: SimpleForm.collection_value_methods.find { |m| sample.instance_methods.include?(m) } }
+      end
     end
   end
 end

data/lib/simple_form/inputs/hidden_input.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class HiddenInput < Base
       disable :label, :errors, :hint, :required
 
-      def input
-        @builder.hidden_field(attribute_name, input_html_options)
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.hidden_field(attribute_name, merged_input_options)
       end
 
       private

data/lib/simple_form/inputs/numeric_input.rb

@@ -1,23 +1,19 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class NumericInput < Base
       enable :placeholder, :min_max
 
-      def input
-        add_size!
+      def input(wrapper_options = nil)
         input_html_classes.unshift("numeric")
         if html5?
           input_html_options[:type] ||= "number"
           input_html_options[:step] ||= integer? ? 1 : "any"
         end
-        @builder.text_field(attribute_name, input_html_options)
-      end
 
-      private
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
-      # Rails adds the size attr by default, if the :size key does not exist.
-      def add_size!
-        input_html_options[:size] ||= nil
+        @builder.text_field(attribute_name, merged_input_options)
       end
     end
   end

data/lib/simple_form/inputs/password_input.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class PasswordInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
-      def input
-        add_size!
-        @builder.password_field(attribute_name, input_html_options)
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.password_field(attribute_name, merged_input_options)
       end
     end
   end

data/lib/simple_form/inputs/priority_input.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class PriorityInput < CollectionSelectInput
-      def input
+      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, input_html_options)
+                      input_options, merged_input_options)
       end
 
       def input_priority

data/lib/simple_form/inputs/range_input.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class RangeInput < NumericInput
-      def input
+      def input(wrapper_options = nil)
         if html5?
           input_html_options[:type] ||= "range"
           input_html_options[:step] ||= 1

data/lib/simple_form/inputs/string_input.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class StringInput < Base
-      enable :placeholder, :maxlength, :pattern
+      enable :placeholder, :maxlength, :minlength, :pattern
 
-      def input
+      def input(wrapper_options = nil)
         unless string?
           input_html_classes.unshift("string")
           input_html_options[:type] ||= input_type if html5?
         end
 
-        add_size!
-        @builder.text_field(attribute_name, input_html_options)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.text_field(attribute_name, merged_input_options)
       end
 
       private

data/lib/simple_form/inputs/text_input.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class TextInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
-      def input
-        @builder.text_area(attribute_name, input_html_options)
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.text_area(attribute_name, merged_input_options)
       end
     end
   end

data/lib/simple_form/inputs.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
-    autoload :Base,                         'simple_form/inputs/base'
-    autoload :BlockInput,                   'simple_form/inputs/block_input'
-    autoload :BooleanInput,                 'simple_form/inputs/boolean_input'
-    autoload :CollectionCheckBoxesInput,    'simple_form/inputs/collection_check_boxes_input'
-    autoload :CollectionInput,              'simple_form/inputs/collection_input'
-    autoload :CollectionRadioButtonsInput,  'simple_form/inputs/collection_radio_buttons_input'
-    autoload :CollectionSelectInput,        'simple_form/inputs/collection_select_input'
-    autoload :DateTimeInput,                'simple_form/inputs/date_time_input'
-    autoload :FileInput,                    'simple_form/inputs/file_input'
-    autoload :GroupedCollectionSelectInput, 'simple_form/inputs/grouped_collection_select_input'
-    autoload :HiddenInput,                  'simple_form/inputs/hidden_input'
-    autoload :NumericInput,                 'simple_form/inputs/numeric_input'
-    autoload :PasswordInput,                'simple_form/inputs/password_input'
-    autoload :PriorityInput,                'simple_form/inputs/priority_input'
-    autoload :RangeInput,                   'simple_form/inputs/range_input'
-    autoload :StringInput,                  'simple_form/inputs/string_input'
-    autoload :TextInput,                    'simple_form/inputs/text_input'
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :BlockInput
+    autoload :BooleanInput
+    autoload :CollectionCheckBoxesInput
+    autoload :CollectionInput
+    autoload :CollectionRadioButtonsInput
+    autoload :CollectionSelectInput
+    autoload :DateTimeInput
+    autoload :FileInput
+    autoload :GroupedCollectionSelectInput
+    autoload :HiddenInput
+    autoload :NumericInput
+    autoload :PasswordInput
+    autoload :PriorityInput
+    autoload :RangeInput
+    autoload :StringInput
+    autoload :TextInput
   end
 end

data/lib/simple_form/map_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/class/attribute'
 
 module SimpleForm

data/lib/simple_form/railtie.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require 'rails/railtie'
+
+module SimpleForm
+  class Railtie < Rails::Railtie
+    config.eager_load_namespaces << SimpleForm
+
+    config.after_initialize do
+      unless SimpleForm.configured?
+        warn '[Simple Form] Simple Form is not configured in the application and will use the default values.' +
+          ' Use `rails generate simple_form:install` to generate the Simple Form configuration.'
+      end
+    end
+  end
+end

data/lib/simple_form/tags.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Tags
+    module CollectionExtensions
+      private
+
+      def render_collection
+        item_wrapper_tag   = @options.fetch(:item_wrapper_tag, :span)
+        item_wrapper_class = @options[:item_wrapper_class]
+
+        @collection.map do |item|
+          value = value_for_collection(item, @value_method)
+          text  = value_for_collection(item, @text_method)
+          default_html_options = default_html_options_for_collection(item, value)
+          additional_html_options = option_html_attributes(item)
+
+          rendered_item = yield item, value, text, default_html_options.merge(additional_html_options)
+
+          if @options.fetch(:boolean_style, SimpleForm.boolean_style) == :nested
+            label_options = default_html_options.slice(:index, :namespace)
+            label_options['class'] = @options[:item_label_class]
+            rendered_item = @template_object.label(@object_name, sanitize_attribute_name(value), rendered_item, label_options)
+          end
+
+          item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, class: item_wrapper_class) : rendered_item
+        end.join.html_safe
+      end
+
+      def wrap_rendered_collection(collection)
+        wrapper_tag = @options[:collection_wrapper_tag]
+
+        if wrapper_tag
+          wrapper_class = @options[:collection_wrapper_class]
+          @template_object.content_tag(wrapper_tag, collection, class: wrapper_class)
+        else
+          collection
+        end
+      end
+    end
+
+    class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons
+      include CollectionExtensions
+
+      def render
+        wrap_rendered_collection(super)
+      end
+
+      private
+
+      def render_component(builder)
+        builder.radio_button + builder.label(class: "collection_radio_buttons")
+      end
+    end
+
+    class CollectionCheckBoxes < ActionView::Helpers::Tags::CollectionCheckBoxes
+      include CollectionExtensions
+
+      def render
+        wrap_rendered_collection(super)
+      end
+
+      private
+
+      def render_component(builder)
+        builder.check_box + builder.label(class: "collection_check_boxes")
+      end
+    end
+  end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
-  VERSION = "2.0.0".freeze
+  VERSION = "3.5.1".freeze
 end

data/lib/simple_form/wrappers/builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Wrappers
     # Provides the builder syntax for components. The builder provides
@@ -12,18 +13,18 @@ module SimpleForm
     #       b.optional :placeholder
     #
     #       # Use a component with specific wrapper options
-    #       b.use :error, :wrap_with => { :tag => "span", :class => "error" }
+    #       b.use :error, wrap_with: { tag: "span", class: "error" }
     #
     #       # Use a set of components by wrapping them in a tag+class.
-    #       b.wrapper :tag => "div", :class => "another" do |ba|
+    #       b.wrapper tag: "div", class: "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
     #
     #       # Use a set of components by wrapping them in a tag+class.
     #       # This wrapper is identified by :label_input, which means it can
-    #       # be turned off on demand with `f.input :name, :label_input => false`
-    #       b.wrapper :label_input, :tag => "div", :class => "another" do |ba|
+    #       # be turned off on demand with `f.input :name, label_input: false`
+    #       b.wrapper :label_input, tag: "div", class: "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
@@ -32,7 +33,7 @@ module SimpleForm
     # The builder also accepts default options at the root level. This is usually
     # used if you want a component to be disabled by default:
     #
-    #     config.wrappers :hint => false do |b|
+    #     config.wrappers hint: false do |b|
     #       b.use :hint
     #       b.use :label_input
     #     end
@@ -45,44 +46,20 @@ module SimpleForm
         @components = []
       end
 
-      def use(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to use is deprecated. " \
-            "Please use wrapper instead of use."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to use is deprecated. " \
-            "Please invoke b.use #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
+      def use(name, options = {})
         if options && wrapper = options[:wrap_with]
-          @components << Single.new(name, wrapper)
+          @components << Single.new(name, wrapper, options.except(:wrap_with))
         else
-          @components << name
+          @components << Leaf.new(name, options)
         end
       end
 
-      def optional(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to optional is deprecated. " \
-            "Please use wrapper instead of optional."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to optional is deprecated. " \
-            "Please invoke b.optional #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
+      def optional(name, options = {}, &block)
         @options[name] = false
-        use(name, options, &block)
+        use(name, options)
       end
 
-      def wrapper(name, options=nil)
+      def wrapper(name, options = nil)
         if block_given?
           name, options = nil, name if name.is_a?(Hash)
           builder = self.class.new(@options)

data/lib/simple_form/wrappers/leaf.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Wrappers
+    class Leaf
+      attr_reader :namespace
+
+      def initialize(namespace, options = {})
+        @namespace = namespace
+        @options = options
+      end
+
+      def render(input)
+        method = input.method(@namespace)
+
+        if method.arity.zero?
+          ActiveSupport::Deprecation.warn(SimpleForm::CUSTOM_INPUT_DEPRECATION_WARN % { name: @namespace })
+
+          method.call
+        else
+          method.call(@options)
+        end
+      end
+
+      def find(name)
+        self if @namespace == name
+      end
+    end
+  end
+end

data/lib/simple_form/wrappers/many.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 module SimpleForm
   module Wrappers
     # A wrapper is an object that holds several components and render them.
-    # A component may either be a symbol or any object that responds to `render`.
+    # A component may be any object that responds to `render`.
     # This API allows inputs/components to be easily wrapped, removing the
     # need to modify the code only to wrap input in an extra tag.
     #
@@ -10,14 +11,13 @@ module SimpleForm
     # on demand on input generation.
     class Many
       attr_reader :namespace, :defaults, :components
-      alias :to_sym :namespace
 
-      def initialize(namespace, components, defaults={})
+      def initialize(namespace, components, defaults = {})
         @namespace  = namespace
         @components = components
         @defaults   = defaults
         @defaults[:tag]   = :div unless @defaults.key?(:tag)
-        @defaults[:class] = Array.wrap(@defaults[:class])
+        @defaults[:class] = Array(@defaults[:class])
       end
 
       def render(input)
@@ -25,8 +25,8 @@ module SimpleForm
         options = input.options
 
         components.each do |component|
-          next if options[component] == false
-          rendered = component.respond_to?(:render) ? component.render(input) : input.send(component)
+          next if options[component.namespace] == false
+          rendered = component.render(input)
           content.safe_concat rendered.to_s if rendered
         end
 
@@ -51,16 +51,21 @@ module SimpleForm
 
       def wrap(input, options, content)
         return content if options[namespace] == false
+        return if defaults[:unless_blank] && content.empty?
 
         tag = (namespace && options[:"#{namespace}_tag"]) || @defaults[:tag]
         return content unless tag
 
         klass = html_classes(input, options)
-        opts  = options[:"#{namespace}_html"] || {}
+        opts  = html_options(options)
         opts[:class] = (klass << opts[:class]).join(' ').strip unless klass.empty?
         input.template.content_tag(tag, content, opts)
       end
 
+      def html_options(options)
+        (@defaults[:html] || {}).merge(options[:"#{namespace}_html"] || {})
+      end
+
       def html_classes(input, options)
         @defaults[:class].dup
       end

data/lib/simple_form/wrappers/root.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Wrappers
     # `Root` is the root wrapper for all components. It is special cased to
@@ -17,17 +18,19 @@ module SimpleForm
 
       # Provide a fallback if name cannot be found.
       def find(name)
-        super || SimpleForm::Wrappers::Many.new(name, [name])
+        super || SimpleForm::Wrappers::Many.new(name, [Leaf.new(name)])
       end
 
       private
 
       def html_classes(input, options)
-        css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
-        css += SimpleForm.additional_classes_for(:wrapper) { input.html_classes }
+        css = options[:wrapper_class] ? Array(options[:wrapper_class]) : @defaults[:class]
+        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
+        css.compact
       end
     end
   end

data/lib/simple_form/wrappers/single.rb

@@ -1,18 +1,27 @@
+# frozen_string_literal: true
 module SimpleForm
   module Wrappers
     # `Single` is an optimization for a wrapper that has only one component.
     class Single < Many
-      def initialize(name, options={})
-        super(name, [name], options)
+      def initialize(name, wrapper_options = {}, options = {})
+        @component = Leaf.new(name, options)
+
+        super(name, [@component], wrapper_options)
       end
 
       def render(input)
         options = input.options
         if options[namespace] != false
-          content = input.send(namespace)
+          content = @component.render(input)
           wrap(input, options, content) if content
         end
       end
+
+      private
+
+      def html_options(options)
+        %i[label input].include?(namespace) ? {} : super
+      end
     end
   end
 end

data/lib/simple_form/wrappers.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 module SimpleForm
   module Wrappers
     autoload :Builder, 'simple_form/wrappers/builder'
     autoload :Many,    'simple_form/wrappers/many'
     autoload :Root,    'simple_form/wrappers/root'
     autoload :Single,  'simple_form/wrappers/single'
+    autoload :Leaf,    'simple_form/wrappers/leaf'
   end
-end
+end