simple_form 2.1.3 → 3.0.0

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/action_view_extensions/form_helper.rb

@@ -5,17 +5,10 @@ module SimpleForm
     # Example:
     #
     #   simple_form_for @user do |f|
-    #     f.input :name, :hint => 'My hint'
+    #     f.input :name, hint: 'My hint'
     #   end
     #
     module FormHelper
-      # Override the default ActiveRecordHelper behaviour of wrapping the input.
-      # This gets taken care of semantically by adding an error class to the wrapper tag
-      # containing the input.
-      #
-      FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
-        html_tag
-      end
 
       def simple_form_for(record, options={}, &block)
         options[:builder] ||= SimpleForm::FormBuilder
@@ -44,7 +37,7 @@ module SimpleForm
       def with_simple_form_field_error_proc
         default_field_error_proc = ::ActionView::Base.field_error_proc
         begin
-          ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+          ::ActionView::Base.field_error_proc = SimpleForm.field_error_proc
           yield
         ensure
           ::ActionView::Base.field_error_proc = default_field_error_proc

data/lib/simple_form/components/errors.rb

@@ -12,9 +12,7 @@ module SimpleForm
       protected
 
       def error_text
-        text = has_error_in_options? ? options[:error] : errors.send(error_method)
-
-        "#{html_escape(options[:error_prefix])} #{html_escape(text)}".lstrip.html_safe
+        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip.html_safe
       end
 
       def error_method
@@ -32,10 +30,6 @@ module SimpleForm
       def errors_on_association
         reflection ? object.errors[reflection.name] : []
       end
-
-      def has_error_in_options?
-        options[:error] && !options[:error].nil?
-      end
     end
   end
 end

data/lib/simple_form/components/hints.rb

@@ -5,13 +5,8 @@ module SimpleForm
       def hint
         @hint ||= begin
           hint = options[:hint]
-
-          if hint.is_a?(String)
-            html_escape(hint)
-          else
-            content = translate(:hints)
-            content.html_safe if content
-          end
+          hint_content = hint.is_a?(String) ? hint : translate(:hints)
+          hint_content.html_safe if hint_content
         end
       end
 

data/lib/simple_form/components/html5.rb

@@ -7,7 +7,10 @@ module SimpleForm
 
       def html5
         @html5 = true
-        input_html_options[:required] = true if has_required?
+        if has_required?
+          input_html_options[:required] = true
+          input_html_options[:'aria-required'] = true
+        end
         nil
       end
 
@@ -23,4 +26,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/components/labels.rb

@@ -6,18 +6,18 @@ module SimpleForm
       module ClassMethods #:nodoc:
         def translate_required_html
           i18n_cache :translate_required_html do
-            I18n.t(:"simple_form.required.html", :default =>
+            I18n.t(:"simple_form.required.html", default:
               %[<abbr title="#{translate_required_text}">#{translate_required_mark}</abbr>]
             )
           end
         end
 
         def translate_required_text
-          I18n.t(:"simple_form.required.text", :default => 'required')
+          I18n.t(:"simple_form.required.text", default: 'required')
         end
 
         def translate_required_mark
-          I18n.t(:"simple_form.required.mark", :default => '*')
+          I18n.t(:"simple_form.required.mark", default: '*')
         end
       end
 
@@ -30,7 +30,7 @@ module SimpleForm
       end
 
       def label_text
-        SimpleForm.label_text.call(html_escape(raw_label_text), required_label_text).strip.html_safe
+        SimpleForm.label_text.call(raw_label_text, required_label_text).strip.html_safe
       end
 
       def label_target

data/lib/simple_form/components/maxlength.rb

@@ -27,14 +27,7 @@ module SimpleForm
       end
 
       def has_tokenizer?(length_validator)
-        tokenizer = length_validator.options[:tokenizer]
-
-        # TODO: Remove this check when we drop Rails 3.0 support
-        if ActiveModel::Validations::LengthValidator.const_defined?(:DEFAULT_TOKENIZER)
-          tokenizer && tokenizer != ActiveModel::Validations::LengthValidator::DEFAULT_TOKENIZER
-        else
-          tokenizer
-        end
+        length_validator.options[:tokenizer]
       end
     end
   end

data/lib/simple_form/components/pattern.rb

@@ -13,8 +13,8 @@ module SimpleForm
         pattern = options[:pattern]
         if pattern.is_a?(String)
           pattern
-        elsif pattern_validator = find_pattern_validator
-          evaluate_format_validator_option(pattern_validator.options[:with]).source
+        elsif (pattern_validator = find_pattern_validator) && (with = pattern_validator.options[:with])
+          evaluate_format_validator_option(with).source
         end
       end
 

data/lib/simple_form/components.rb

@@ -2,7 +2,7 @@ module SimpleForm
   # Components are a special type of helpers that can work on their own.
   # For example, by using a component, it will automatically change the
   # output under given circumstances without user input. For example,
-  # the disabled helper always need a :disabled => true option given
+  # the disabled helper always need a disabled: true option given
   # 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

data/lib/simple_form/error_notification.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   class ErrorNotification
-    delegate :object, :object_name, :template, :to => :@builder
+    delegate :object, :object_name, :template, to: :@builder
 
     def initialize(builder, options)
       @builder = builder
@@ -42,7 +42,7 @@ module SimpleForm
       lookups << :"#{object_name}"
       lookups << :default_message
       lookups << "Please review the problems below:"
-      I18n.t(lookups.shift, :scope => :"simple_form.error_notification", :default => lookups)
+      I18n.t(lookups.shift, scope: :"simple_form.error_notification", default: lookups)
     end
   end
 end