Make possible to use the Wrappers API to define attributes for the components

lib/simple_form.rb

@@ -24,6 +24,16 @@ def self.eager_load!
     SimpleForm::Components.eager_load!
   end
 
+  CUSTOM_INPUT_DEPRECATION_WARN = <<-WARN
+%{name} method now accepts a `context` argument. The method definition without the argument is deprecated and will be removed in the next Simple Form version. Change your code from:
+
+    def %{name}
+
+to
+
+    def %{name}(context)
+  WARN
+
   ## CONFIGURATION OPTIONS
 
   # Method used to tidy up errors.

lib/simple_form/components/errors.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Components
     module Errors
-      def error
+      def error(context=nil)
         error_text if has_errors?
       end
 

lib/simple_form/components/hints.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Hints
-      def hint
+      def hint(context=nil)
         @hint ||= begin
           hint = options[:hint]
 

lib/simple_form/components/html5.rb

@@ -5,7 +5,7 @@ def initialize(*)
         @html5 = false
       end
 
-      def html5
+      def html5(context=nil)
         @html5 = true
         if has_required?
           input_html_options[:required] = true

lib/simple_form/components/label_input.rb

@@ -7,8 +7,26 @@ module LabelInput
         include SimpleForm::Components::Labels
       end
 
-      def label_input
-        options[:label] == false ? input : (label + input)
+      def label_input(context=nil)
+        if options[:label] == false
+          deprecated_component(:input ,context)
+        else
+          deprecated_component(:label, context) + deprecated_component(:input, context)
+        end
+      end
+
+      private
+
+      def deprecated_component(namespace ,context)
+        method = method(namespace)
+
+        if method.arity == 0
+          ActiveSupport::Deprecation.warn(SimpleForm::CUSTOM_INPUT_DEPRECATION_WARN % { name: namespace })
+
+          method.call
+        else
+          method.call(context)
+        end
       end
     end
   end

lib/simple_form/components/labels.rb

@@ -21,11 +21,13 @@ def translate_required_mark
         end
       end
 
-      def label
+      def label(context=nil)
+        label_options = merge_wrapper_options(label_html_options, context)
+
         if generate_label_for_attribute?
-          @builder.label(label_target, label_text, label_html_options)
+          @builder.label(label_target, label_text, label_options)
         else
-          template.label_tag(nil, label_text, label_html_options)
+          template.label_tag(nil, label_text, label_options)
         end
       end
 
@@ -46,6 +48,7 @@ def label_html_options
         if options.key?(:input_html) && options[:input_html].key?(:id)
           label_options[:for] = options[:input_html][:id]
         end
+
         label_options
       end
 

lib/simple_form/components/maxlength.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Maxlength
-      def maxlength
+      def maxlength(context=nil)
         input_html_options[:maxlength] ||= maximum_length_from_validation || limit
         nil
       end

lib/simple_form/components/min_max.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Components
     module MinMax
-      def min_max
+      def min_max(context=nil)
         if numeric_validator = find_numericality_validator
           validator_options = numeric_validator.options
           input_html_options[:min] ||= minimum_value(validator_options)

lib/simple_form/components/pattern.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Pattern
-      def pattern
+      def pattern(context=nil)
         input_html_options[:pattern] ||= pattern_source
         nil
       end

lib/simple_form/components/placeholders.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Placeholders
-      def placeholder
+      def placeholder(context=nil)
         input_html_options[:placeholder] ||= placeholder_text
         nil
       end

lib/simple_form/components/readonly.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Readonly
-      def readonly
+      def readonly(context=nil)
         if readonly_attribute? && !has_readonly?
           input_html_options[:readonly] ||= true
           input_html_classes << :readonly

lib/simple_form/form_builder.rb

@@ -137,7 +137,8 @@ def input_field(attribute_name, options={})
 
       input      = find_input(attribute_name, options)
       wrapper    = find_wrapper(input.input_type, options)
-      components = (wrapper.components & ATTRIBUTE_COMPONENTS) + [:input]
+      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS) + [:input]
+      components = components.map { |component| SimpleForm::Wrappers::Leaf.new(component) }
 
       SimpleForm::Wrappers::Root.new(components, wrapper.options.merge(wrapper: false)).render input
     end

lib/simple_form/helpers.rb

@@ -3,10 +3,11 @@ module SimpleForm
   # For instance, disabled cannot be turned on automatically, it requires the
   # user to explicitly pass the option disabled: true so it may work.
   module Helpers
-    autoload :Autofocus,    'simple_form/helpers/autofocus'
-    autoload :Disabled,     'simple_form/helpers/disabled'
-    autoload :Readonly,     'simple_form/helpers/readonly'
-    autoload :Required,     'simple_form/helpers/required'
-    autoload :Validators,   'simple_form/helpers/validators'
+    autoload :Autofocus,      'simple_form/helpers/autofocus'
+    autoload :Disabled,       'simple_form/helpers/disabled'
+    autoload :Readonly,       'simple_form/helpers/readonly'
+    autoload :Required,       'simple_form/helpers/required'
+    autoload :Validators,     'simple_form/helpers/validators'
+    autoload :WrapperOptions, 'simple_form/helpers/wrapper_options'
   end
 end

lib/simple_form/helpers/wrapper_options.rb

@@ -0,0 +1,19 @@
+module SimpleForm
+  module Helpers
+    module WrapperOptions
+      private
+
+      def merge_wrapper_options(options, context)
+        if context
+          options.merge(context.options) do |_, oldval, newval|
+            if Array === oldval
+              oldval + Array(newval)
+            end
+          end
+        else
+          options
+        end
+      end
+    end
+  end
+end

lib/simple_form/inputs/base.rb

@@ -13,6 +13,7 @@ class Base
       include SimpleForm::Helpers::Readonly
       include SimpleForm::Helpers::Required
       include SimpleForm::Helpers::Validators
+      include SimpleForm::Helpers::WrapperOptions
 
       include SimpleForm::Components::Errors
       include SimpleForm::Components::Hints
@@ -79,7 +80,7 @@ def initialize(builder, attribute_name, column, input_type, options = {})
         end
       end
 
-      def input
+      def input(context=nil)
         raise NotImplementedError
       end
 

lib/simple_form/inputs/block_input.rb

@@ -6,7 +6,7 @@ def initialize(*args, &block)
         @block = block
       end
 
-      def input
+      def input(context=nil)
         template.capture(&@block)
       end
     end

lib/simple_form/inputs/boolean_input.rb

@@ -1,31 +1,36 @@
 module SimpleForm
   module Inputs
     class BooleanInput < Base
-      def input
+      def input(context=nil)
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
             template.label_tag(nil, class: "checkbox") {
-              build_check_box_without_hidden_field + inline_label
+              build_check_box_without_hidden_field(merged_input_options) +
+                inline_label
             }
         else
-          build_check_box
+          build_check_box(unchecked_value, merged_input_options)
         end
       end
 
-      def label_input
+      def label_input(context=nil)
         if options[:label] == false
-          input
+          input(context)
         elsif nested_boolean_style?
           html_options = label_html_options.dup
           html_options[:class] ||= []
           html_options[:class].push(:checkbox)
 
+          merged_input_options = merge_wrapper_options(input_html_options, context)
+
           build_hidden_field_for_checkbox +
             @builder.label(label_target, html_options) {
-              build_check_box_without_hidden_field + label_text
+              build_check_box_without_hidden_field(merged_input_options) + label_text
             }
         else
-          input + label
+          input(context) + label(context)
         end
       end
 
@@ -35,14 +40,14 @@ def label_input
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value = unchecked_value)
+      def build_check_box(unchecked_value, options)
         @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 
       # Build a checkbox without generating the hidden field. See
       # #build_hidden_field_for_checkbox for more info.
-      def build_check_box_without_hidden_field
-        build_check_box(nil)
+      def build_check_box_without_hidden_field(options)
+        build_check_box(nil, options)
       end
 
       # Create a hidden field for the current checkbox, so we can simulate Rails

lib/simple_form/inputs/collection_input.rb

@@ -12,7 +12,7 @@ def self.boolean_collection
         end
       end
 
-      def input
+      def input(context=nil)
         raise NotImplementedError,
           "input should be implemented by classes inheriting from CollectionInput"
       end

lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -1,12 +1,15 @@
 module SimpleForm
   module Inputs
     class CollectionRadioButtonsInput < CollectionInput
-      def input
+      def input(context=nil)
         label_method, value_method = detect_collection_methods
 
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
         @builder.send("collection_#{input_type}",
           attribute_name, collection, value_method, label_method,
-          input_options, input_html_options, &collection_block_for_nested_boolean_style
+          input_options, merged_input_options,
+          &collection_block_for_nested_boolean_style
         )
       end
 

lib/simple_form/inputs/collection_select_input.rb

@@ -1,12 +1,14 @@
 module SimpleForm
   module Inputs
     class CollectionSelectInput < CollectionInput
-      def input
+      def input(context=nil)
         label_method, value_method = detect_collection_methods
 
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
         @builder.collection_select(
           attribute_name, collection, value_method, label_method,
-          input_options, input_html_options
+          input_options, merged_input_options
         )
       end
     end

lib/simple_form/inputs/date_time_input.rb

@@ -1,11 +1,13 @@
 module SimpleForm
   module Inputs
     class DateTimeInput < Base
-      def input
+      def input(context=nil)
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
         if use_html5_inputs?
-          @builder.send(:"#{input_type}_field", attribute_name, input_html_options)
+          @builder.send(:"#{input_type}_field", attribute_name, merged_input_options)
         else
-          @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
+          @builder.send(:"#{input_type}_select", attribute_name, input_options, merged_input_options)
         end
       end
 

lib/simple_form/inputs/file_input.rb

@@ -1,8 +1,10 @@
 module SimpleForm
   module Inputs
     class FileInput < Base
-      def input
-        @builder.file_field(attribute_name, input_html_options)
+      def input(context=nil)
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
+        @builder.file_field(attribute_name, merged_input_options)
       end
     end
   end

lib/simple_form/inputs/grouped_collection_select_input.rb

@@ -1,11 +1,14 @@
 module SimpleForm
   module Inputs
     class GroupedCollectionSelectInput < CollectionInput
-      def input
+      def input(context=nil)
         label_method, value_method = detect_collection_methods
+
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
         @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

lib/simple_form/inputs/hidden_input.rb

@@ -3,8 +3,10 @@ module Inputs
     class HiddenInput < Base
       disable :label, :errors, :hint, :required
 
-      def input
-        @builder.hidden_field(attribute_name, input_html_options)
+      def input(context=nil)
+        merged_input_options = merge_wrapper_options(input_html_options, context)
+
+        @builder.hidden_field(attribute_name, merged_input_options)
       end
 
       private