simple_form 2.0.4 → 2.1.0

data/lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb

@@ -0,0 +1,26 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.wrappers :foundation, :class => :input, :hint_class => :field_with_hint, :error_class => :error do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label_input
+    b.use :error, :wrap_with => { :tag => :small }
+
+    # Uncomment the following line to enable hints. The line is commented out by default since Foundation
+    # does't provide styles for hints. You will need to provide your own CSS styles for hints.
+    # b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
+  end
+
+  # CSS class for buttons
+  config.button_class = 'button'
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'alert-box alert'
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :foundation
+end

data/lib/simple_form.rb

@@ -6,14 +6,17 @@ require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/reverse_merge'
 
 module SimpleForm
-  autoload :Components,        'simple_form/components'
-  autoload :ErrorNotification, 'simple_form/error_notification'
-  autoload :FormBuilder,       'simple_form/form_builder'
-  autoload :Helpers,           'simple_form/helpers'
-  autoload :I18nCache,         'simple_form/i18n_cache'
-  autoload :Inputs,            'simple_form/inputs'
-  autoload :MapType,           'simple_form/map_type'
-  autoload :Wrappers,          'simple_form/wrappers'
+  extend ActiveSupport::Autoload
+
+  autoload :Helpers
+  autoload :Wrappers
+
+  eager_autoload do
+    autoload :Components
+    autoload :ErrorNotification
+    autoload :FormBuilder
+    autoload :Inputs
+  end
 
   ## CONFIGURATION OPTIONS
 

data/lib/simple_form/action_view_extensions/builder.rb

@@ -92,7 +92,7 @@ module SimpleForm
         rendered_collection = render_collection(
           collection, value_method, text_method, options, html_options
         ) do |item, value, text, default_html_options|
-          builder = instantiate_builder(RadioButtonBuilder, attribute, item, value, text, default_html_options)
+          builder = instantiate_collection_builder(RadioButtonBuilder, attribute, item, value, text, default_html_options)
 
           if block_given?
             yield builder
@@ -167,7 +167,7 @@ module SimpleForm
           collection, value_method, text_method, options, html_options
         ) do |item, value, text, default_html_options|
           default_html_options[:multiple] = true
-          builder = instantiate_builder(CheckBoxBuilder, attribute, item, value, text, default_html_options)
+          builder = instantiate_collection_builder(CheckBoxBuilder, attribute, item, value, text, default_html_options)
 
           if block_given?
             yield builder
@@ -194,7 +194,7 @@ module SimpleForm
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
-        options[:wrapper]  ||= self.options[:wrapper]
+        options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
         options[:defaults] ||= self.options[:defaults]
 
         if self.class < ActionView::Helpers::FormBuilder
@@ -207,7 +207,7 @@ module SimpleForm
 
       private
 
-      def instantiate_builder(builder_class, attribute, item, value, text, html_options)
+      def instantiate_collection_builder(builder_class, attribute, item, value, text, html_options)
         builder_class.new(self, attribute, item,
                           sanitize_attribute_name(attribute, value), text, value, html_options)
       end
@@ -277,34 +277,48 @@ end
 module ActionView::Helpers
   class FormBuilder
     include SimpleForm::ActionViewExtensions::Builder
+  end
 
-    # Override default Rails collection_select helper to handle lambdas/procs in
+  module FormOptionsHelper
+    # Override Rails options_from_collection_for_select to handle lambdas/procs in
     # text and value methods, so it works the same way as collection_radio_buttons
     # and collection_check_boxes in SimpleForm. If none of text/value methods is a
     # callable object, then it just delegates back to original collection select.
-    #
-    alias :original_collection_select :collection_select
-    def collection_select(attribute, collection, value_method, text_method, options={}, html_options={})
+    # FIXME: remove when support only Rails 4.0 forward
+    #        https://github.com/rails/rails/commit/9035324367526af0300477a58b6d3efc15d1a5a8
+    alias :original_options_from_collection_for_select :options_from_collection_for_select
+    def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
       if value_method.respond_to?(:call) || text_method.respond_to?(:call)
         collection = 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, options, html_options)
-          disabled = value if default_html_options[:disabled]
-          selected = value if default_html_options[:selected]
-
-          [value, text, selected, disabled]
+          [value, text]
         end
 
-        [:disabled, :selected].each do |option|
-          option_value    = collection.map(&:pop).compact
-          options[option] = option_value if option_value.present?
-        end
         value_method, text_method = :first, :last
+        selected = extract_selected_and_disabled_and_call_procs selected, collection
+      end
+
+      original_options_from_collection_for_select collection, value_method, text_method, selected
+    end
+
+    private
+
+    def extract_selected_and_disabled_and_call_procs(selected, collection)
+      selected, disabled = extract_selected_and_disabled selected
+      selected_disabled = { :selected => selected, :disabled => disabled }
+
+      selected_disabled.each do |key, check|
+        if check.is_a? Proc
+          values = collection.map { |option| option.first if check.call(option.first) }
+          selected_disabled[key] = values
+        end
       end
+    end
 
-      original_collection_select(attribute, collection, value_method, text_method, options, html_options)
+    def value_for_collection(item, value) #:nodoc:
+      value.respond_to?(:call) ? value.call(item) : item.send(value)
     end
   end
 

data/lib/simple_form/action_view_extensions/builder.rb.orig

@@ -0,0 +1,247 @@
+module SimpleForm
+  module ActionViewExtensions
+    # A collection of methods required by simple_form but added to rails default form.
+    # This means that you can use such methods outside simple_form context.
+    module Builder
+
+      # Wrapper for using SimpleForm inside a default rails form.
+      # Example:
+      #
+      #   form_for @user do |f|
+      #     f.simple_fields_for :posts do |posts_form|
+      #       # Here you have all simple_form methods available
+      #       posts_form.input :title
+      #     end
+      #   end
+      def simple_fields_for(*args, &block)
+        options = args.extract_options!
+        options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
+        options[:defaults] ||= self.options[:defaults]
+
+        if self.class < ActionView::Helpers::FormBuilder
+          options[:builder] ||= self.class
+        else
+          options[:builder] ||= SimpleForm::FormBuilder
+        end
+        fields_for(*(args << options), &block)
+      end
+    end
+  end
+end
+
+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)
+
+          rendered_item = yield item, value, text, default_html_options
+
+          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
+
+module ActionView::Helpers
+  class FormBuilder
+    include SimpleForm::ActionViewExtensions::Builder
+  end
+
+<<<<<<< HEAD
+    # Create a collection of radio inputs for the attribute. Basically this
+    # helper will create a radio input associated with a label for each
+    # text/value option in the collection, using value_method and text_method
+    # to convert these text/value. You can give a symbol or a proc to both
+    # value_method and text_method, that will be evaluated for each item in
+    # the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     f.collection_radio_buttons :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #   end
+    #
+    #   <input id="user_options_true" name="user[options]" type="radio" value="true" />
+    #   <label class="collection_radio_buttons" for="user_options_true">Yes</label>
+    #   <input id="user_options_false" name="user[options]" type="radio" value="false" />
+    #   <label class="collection_radio_buttons" for="user_options_false">No</label>
+    #
+    # It is also possible to give a block that should generate the radio +
+    # label. To wrap the radio with the label, for instance:
+    #
+    #   form_for @user do |f|
+    #     f.collection_radio_buttons(
+    #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #     ) do |b|
+    #       b.label { b.radio_button + b.text }
+    #     end
+    #   end
+    #
+    # == Options
+    #
+    # Collection radio accepts some extra options:
+    #
+    #   * checked  => the value that should be checked initially.
+    #
+    #   * disabled => the value or values that should be disabled. Accepts a single
+    #                 item or an array of items.
+    #
+    #   * collection_wrapper_tag   => the tag to wrap the entire collection.
+    #
+    #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag
+    #
+    #   * item_wrapper_tag         => the tag to wrap each item in the collection.
+    #
+    #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
+    #
+    #   * a block                  => to generate the label + radio or any other component.
+    def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionRadioButtons.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+=======
+  module FormOptionsHelper
+    # Override Rails options_from_collection_for_select to handle lambdas/procs in
+    # text and value methods, so it works the same way as collection_radio_buttons
+    # and collection_check_boxes in SimpleForm. If none of text/value methods is a
+    # callable object, then it just delegates back to original collection select.
+    # FIXME: remove when support only Rails 4.0 forward
+    #        https://github.com/rails/rails/commit/9035324367526af0300477a58b6d3efc15d1a5a8
+    alias :original_options_from_collection_for_select :options_from_collection_for_select
+    def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
+      if value_method.respond_to?(:call) || text_method.respond_to?(:call)
+        collection = collection.map do |item|
+          value = value_for_collection(item, value_method)
+          text  = value_for_collection(item, text_method)
+
+          [value, text]
+        end
+
+        value_method, text_method = :first, :last
+        selected = extract_selected_and_disabled_and_call_procs selected, collection
+      end
+
+      original_options_from_collection_for_select collection, value_method, text_method, selected
+    end
+
+    private
+
+    def extract_selected_and_disabled_and_call_procs(selected, collection)
+      selected, disabled = extract_selected_and_disabled selected
+      selected_disabled = { :selected => selected, :disabled => disabled }
+
+      selected_disabled.each do |key, check|
+        if check.is_a? Proc
+          values = collection.map { |option| option.first if check.call(option.first) }
+          selected_disabled[key] = values
+        end
+      end
+    end
+
+    def value_for_collection(item, value) #:nodoc:
+      value.respond_to?(:call) ? value.call(item) : item.send(value)
+>>>>>>> master
+    end
+
+    # Creates a collection of check boxes for each item in the collection,
+    # associated with a clickable label. Use value_method and text_method to
+    # convert items in the collection for use as text/value in check boxes.
+    # You can give a symbol or a proc to both value_method and text_method,
+    # that will be evaluated for each item in the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #   end
+    #
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <input id="user_options_true" name="user[options][]" type="checkbox" value="true" />
+    #   <label class="collection_check_boxes" for="user_options_true">Yes</label>
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <input id="user_options_false" name="user[options][]" type="checkbox" value="false" />
+    #   <label class="collection_check_boxes" for="user_options_false">No</label>
+    #
+    # It is also possible to give a block that should generate the check box +
+    # label. To wrap the check box with the label, for instance:
+    #
+    #   form_for @user do |f|
+    #     f.collection_check_boxes(
+    #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #     ) do |b|
+    #       b.label { b.check_box + b.text }
+    #     end
+    #   end
+    #
+    # == Options
+    #
+    # Collection check box accepts some extra options:
+    #
+    #   * checked  => the value or values that should be checked initially. Accepts
+    #                 a single item or an array of items. It overrides existing associations.
+    #
+    #   * disabled => the value or values that should be disabled. Accepts a single
+    #                 item or an array of items.
+    #
+    #   * collection_wrapper_tag   => the tag to wrap the entire collection.
+    #
+    #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag. This option
+    #                                 is ignored if the :collection_wrapper_tag option is blank.
+    #
+    #   * item_wrapper_tag         => the tag to wrap each item in the collection.
+    #
+    #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
+    #
+    #   * a block                  => to generate the label + check box or any other component.
+    def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionCheckBoxes.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+    end
+  end
+end

data/lib/simple_form/components.rb

@@ -6,15 +6,17 @@ module SimpleForm
   # to the input in order to be enabled. On the other hand, things like
   # hints can generate output automatically by doing I18n lookups.
   module Components
-    autoload :Errors,       'simple_form/components/errors'
-    autoload :Hints,        'simple_form/components/hints'
-    autoload :HTML5,        'simple_form/components/html5'
-    autoload :LabelInput,   'simple_form/components/label_input'
-    autoload :Labels,       'simple_form/components/labels'
-    autoload :MinMax,       'simple_form/components/min_max'
-    autoload :Maxlength,    'simple_form/components/maxlength'
-    autoload :Pattern,      'simple_form/components/pattern'
-    autoload :Placeholders, 'simple_form/components/placeholders'
-    autoload :Readonly,     'simple_form/components/readonly'
+    extend ActiveSupport::Autoload
+
+    autoload :Errors
+    autoload :Hints
+    autoload :HTML5
+    autoload :LabelInput
+    autoload :Labels
+    autoload :MinMax
+    autoload :Maxlength
+    autoload :Pattern
+    autoload :Placeholders
+    autoload :Readonly
   end
 end

data/lib/simple_form/components/hints.rb

@@ -11,7 +11,7 @@ module SimpleForm
       end
 
       def has_hint?
-        hint.present?
+        options[:hint] != false && hint.present?
       end
     end
   end

data/lib/simple_form/components/label_input.rb

@@ -8,7 +8,7 @@ module SimpleForm
       end
 
       def label_input
-        (options[:label] == false ? "" : label) + input
+        options[:label] == false ? input : (label + input)
       end
     end
   end

data/lib/simple_form/components/maxlength.rb

@@ -23,7 +23,7 @@ module SimpleForm
       end
 
       def find_length_validator
-        find_validator(ActiveModel::Validations::LengthValidator)
+        find_validator(:length)
       end
 
       def has_tokenizer?(length_validator)