simple_form 2.0.0.rc → 2.0.0

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module ActionViewExtensions
-    # This module creates simple form wrappers around default form_for and fields_for.
+    # This module creates SimpleForm wrappers around default form_for and fields_for.
     #
     # Example:
     #

data/lib/simple_form/components/errors.rb

@@ -12,7 +12,7 @@ module SimpleForm
       protected
 
       def error_text
-        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip
+        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip.html_safe
       end
 
       def error_method

data/lib/simple_form/components/labels.rb

@@ -38,8 +38,14 @@ module SimpleForm
       end
 
       def label_html_options
-        label_options = html_options_for(:label, [input_type, required_class, SimpleForm.label_class].compact)
-        label_options[:for] = options[:input_html][:id] if options.key?(:input_html) && options[:input_html].key?(:id)
+        label_html_classes = SimpleForm.additional_classes_for(:label) {
+          [input_type, required_class, SimpleForm.label_class].compact
+        }
+
+        label_options = html_options_for(:label, label_html_classes)
+        if options.key?(:input_html) && options[:input_html].key?(:id)
+          label_options[:for] = options[:input_html][:id]
+        end
         label_options
       end
 

data/lib/simple_form/error_notification.rb

@@ -25,7 +25,7 @@ module SimpleForm
     end
 
     def error_message
-      @message || translate_error_notification
+      (@message || translate_error_notification).html_safe
     end
 
     def error_notification_tag
@@ -34,7 +34,6 @@ module SimpleForm
 
     def html_options
       @options[:class] = "#{SimpleForm.error_notification_class} #{@options[:class]}".strip
-      @options[:id] = SimpleForm.error_notification_id if SimpleForm.error_notification_id
       @options
     end
 

data/lib/simple_form/form_builder.rb

@@ -131,6 +131,7 @@ module SimpleForm
     #        name="user[name]" size="100" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options={})
+      options = options.dup
       options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
       SimpleForm::Wrappers::Root.new([:input], :wrapper => false).render find_input(attribute_name, options)
     end
@@ -162,6 +163,8 @@ module SimpleForm
     # From the options above, only :collection can also be supplied.
     #
     def association(association, options={}, &block)
+      options = options.dup
+
       return simple_fields_for(*[association,
         options.delete(:collection), options].compact, &block) if block_given?
 
@@ -203,10 +206,14 @@ module SimpleForm
     #     f.button :submit
     #   end
     #
-    # It just acts as a proxy to method name given.
+    # It just acts as a proxy to method name given. We also alias original Rails
+    # button implementation (3.2 forward (to delegate to the original when
+    # calling `f.button :button`.
     #
+    # TODO: remove if condition when supporting only Rails 3.2 forward.
+    alias_method :button_button, :button if method_defined?(:button)
     def button(type, *args, &block)
-      options = args.extract_options!
+      options = args.extract_options!.dup
       options[:class] = [SimpleForm.button_class, options[:class]].compact
       args << options
       if respond_to?("#{type}_button")
@@ -225,6 +232,8 @@ module SimpleForm
     #    f.error :name, :id => "cool_error"
     #
     def error(attribute_name, options={})
+      options = options.dup
+
       options[:error_html] = options.except(:error_tag, :error_prefix, :error_method)
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)
@@ -240,6 +249,8 @@ module SimpleForm
     #    f.full_error :token #=> <span class="error">Token is invalid</span>
     #
     def full_error(attribute_name, options={})
+      options = options.dup
+
       options[:error_prefix] ||= if object.class.respond_to?(:human_attribute_name)
         object.class.human_attribute_name(attribute_name.to_s)
       else
@@ -260,6 +271,8 @@ module SimpleForm
     #    f.hint "Don't forget to accept this"
     #
     def hint(attribute_name, options={})
+      options = options.dup
+
       options[:hint_html] = options.except(:hint_tag, :hint)
       if attribute_name.is_a?(String)
         options[:hint] = attribute_name
@@ -288,10 +301,10 @@ module SimpleForm
     #
     def label(attribute_name, *args)
       return super if args.first.is_a?(String) || block_given?
-      options = args.extract_options!
-      options[:label_html] = options.dup
-      options[:label]      = options.delete(:label)
-      options[:required]   = options.delete(:required)
+
+      options = args.extract_options!.dup
+      options[:label_html] = options.except(:label, :required)
+
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)
       SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options).label

data/lib/simple_form/helpers/required.rb

@@ -11,14 +11,16 @@ module SimpleForm
         if !options[:required].nil?
           options[:required]
         elsif has_validators?
-          (attribute_validators + reflection_validators).any? do |v|
-            v.kind == :presence && valid_validator?(v)
-          end
+          required_by_validators?
         else
           required_by_default?
         end
       end
 
+      def required_by_validators?
+        (attribute_validators + reflection_validators).any? { |v| v.kind == :presence && valid_validator?(v) }
+      end
+
       def required_by_default?
         SimpleForm.required_by_default
       end

data/lib/simple_form/inputs/base.rb

@@ -59,7 +59,10 @@ module SimpleForm
         # Notice that html_options_for receives a reference to input_html_classes.
         # This means that classes added dynamically to input_html_classes will
         # still propagate to input_html_options.
-        @html_classes       = [input_type, required_class, readonly_class, disabled_class].compact
+        @html_classes = SimpleForm.additional_classes_for(:input) {
+          [input_type, required_class, readonly_class, disabled_class].compact
+        }
+
         @input_html_classes = @html_classes.dup
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
           o[:readonly]  = true if has_readonly?

data/lib/simple_form/inputs/boolean_input.rb

@@ -16,8 +16,11 @@ module SimpleForm
         if options[:label] == false
           input
         elsif nested_boolean_style?
+          html_options = label_html_options.dup
+          html_options[:class].push(:checkbox)
+
           build_hidden_field_for_checkbox +
-            @builder.label(label_target, label_html_options) {
+            @builder.label(label_target, html_options) {
               build_check_box_without_hidden_field + label_text
             }
         else

data/lib/simple_form/inputs/collection_check_boxes_input.rb

@@ -9,8 +9,8 @@ module SimpleForm
         false
       end
 
-      def build_nested_boolean_style_item_tag(text, value, html_options)
-        @builder.check_box(attribute_name, html_options, value, nil) + text
+      def build_nested_boolean_style_item_tag(collection_builder)
+        collection_builder.check_box + collection_builder.text
       end
 
       def item_wrapper_class

data/lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -45,13 +45,11 @@ module SimpleForm
       def collection_block_for_nested_boolean_style
         return unless nested_boolean_style?
 
-        proc do |label_for, text, value, html_options|
-          build_nested_boolean_style_item_tag(text, value, html_options)
-        end
+        proc { |builder| build_nested_boolean_style_item_tag(builder) }
       end
 
-      def build_nested_boolean_style_item_tag(text, value, html_options)
-        @builder.radio_button(attribute_name, value, html_options) + text
+      def build_nested_boolean_style_item_tag(collection_builder)
+        collection_builder.radio_button + collection_builder.text
       end
 
       def item_wrapper_class

data/lib/simple_form/inputs/date_time_input.rb

@@ -12,12 +12,16 @@ module SimpleForm
       private
 
       def label_target
-        case input_type
+        position = case input_type
         when :date, :datetime
-          "#{attribute_name}_1i"
-        when :time
-          "#{attribute_name}_4i"
+          date_order = input_options[:order] || I18n.t('date.order')
+          date_order.first
+        else
+          :hour
         end
+
+        position = ActionView::Helpers::DateTimeSelector::POSITION[position]
+        "#{attribute_name}_#{position}i"
       end
     end
   end

data/lib/simple_form/inputs/grouped_collection_select_input.rb

@@ -19,7 +19,7 @@ module SimpleForm
 
       # Sample collection
       def collection
-        @collection ||= grouped_collection.first.try(:send, group_method)
+        @collection ||= grouped_collection.first.try(:send, group_method) || []
       end
 
       def group_method

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.0.0.rc".freeze
+  VERSION = "2.0.0".freeze
 end

data/lib/simple_form/wrappers/builder.rb

@@ -1,17 +1,21 @@
 module SimpleForm
   module Wrappers
     # Provides the builder syntax for components. The builder provides
-    # only one method (called `use`) and it allows the following invocations:
+    # three methods `use`, `optional` and `wrapper` and they allow the following invocations:
     #
     #     config.wrappers do |b|
     #       # Use a single component
-    #       b.use :placeholder
+    #       b.use :html5
+    #
+    #       # Use the component, but do not automatically lookup. It will only be triggered when
+    #       # :placeholder is explicitly set.
+    #       b.optional :placeholder
     #
     #       # Use a component with specific wrapper options
-    #       b.use :error, :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.use :tag => "div", :class => "another" do |ba|
+    #       b.wrapper :tag => "div", :class => "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
@@ -19,7 +23,7 @@ module SimpleForm
     #       # 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.use :label_input, :tag => "div", :class => "another" do |ba|
+    #       b.wrapper :label_input, :tag => "div", :class => "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
@@ -42,21 +46,43 @@ module SimpleForm
       end
 
       def use(name, options=nil, &block)
-        add(name, options, &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
+
+        if options && wrapper = options[:wrap_with]
+          @components << Single.new(name, wrapper)
+        else
+          @components << name
+        end
       end
 
       def optional(name, options=nil, &block)
-        @options[name] = false
-        add(name, options, &block)
-      end
+        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
 
-      def to_a
-        @components
-      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
 
-      private
+        @options[name] = false
+        use(name, options, &block)
+      end
 
-      def add(name, options)
+      def wrapper(name, options=nil)
         if block_given?
           name, options = nil, name if name.is_a?(Hash)
           builder = self.class.new(@options)
@@ -64,12 +90,14 @@ module SimpleForm
           options[:tag] = :div if options[:tag].nil?
           yield builder
           @components << Many.new(name, builder.to_a, options)
-        elsif options
-          @components << Single.new(name, options)
         else
-          @components << name
+          raise ArgumentError, "A block is required as argument to wrapper"
         end
       end
+
+      def to_a
+        @components
+      end
     end
   end
-end
+end

data/lib/simple_form/wrappers/many.rb

@@ -16,6 +16,7 @@ module SimpleForm
         @namespace  = namespace
         @components = components
         @defaults   = defaults
+        @defaults[:tag]   = :div unless @defaults.key?(:tag)
         @defaults[:class] = Array.wrap(@defaults[:class])
       end
 

data/lib/simple_form/wrappers/root.rb

@@ -24,7 +24,7 @@ module SimpleForm
 
       def html_classes(input, options)
         css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
-        css += input.html_classes
+        css += SimpleForm.additional_classes_for(:wrapper) { input.html_classes }
         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

data/test/action_view_extensions/builder_test.rb

@@ -42,7 +42,7 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_radio_buttons[for=user_active_no]', 'No'
   end
 
-  test 'colection radio should sanitize collection values for labels correctly' do
+  test 'collection radio should sanitize collection values for labels correctly' do
     with_collection_radio_buttons @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
     assert_select 'label.collection_radio_buttons[for=user_name_099]', '$0.99'
     assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
@@ -174,13 +174,57 @@ class BuilderTest < ActionView::TestCase
     assert_no_select 'form label input'
   end
 
-  test 'collection radio accepts a block to render the radio and label as required' do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s do |label_for, text, value, html_options|
-      label(:user, label_for, text) { radio_button(:user, :active, value, html_options) }
+  test 'collection radio accepts a block to render the label as radio button wrapper' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.radio_button }
     end
 
-    assert_select 'form label[for=user_active_true] > input#user_active_true[type=radio]'
-    assert_select 'form label[for=user_active_false] > input#user_active_false[type=radio]'
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio accepts a block to change the order of label and radio button' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.radio_button
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio with block helpers accept extra html options' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "radio_button") + b.radio_button(:class => "radio_button")
+    end
+
+    assert_select 'label.radio_button[for=user_active_true] + input#user_active_true.radio_button[type=radio]'
+    assert_select 'label.radio_button[for=user_active_false] + input#user_active_false.radio_button[type=radio]'
+  end
+
+  test 'collection radio with block helpers allows access to current text and value' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.radio_button + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
+  end
+
+  test 'collection radio with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.radio_button + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
   end
 
   test 'collection_radio helper is deprecated in favor of collection_radio_buttons' do
@@ -226,7 +270,7 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_check_boxes[for=user_active_no]', 'No'
   end
 
-  test 'colection check box should sanitize collection values for labels correctly' do
+  test 'collection check box should sanitize collection values for labels correctly' do
     with_collection_check_boxes @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
     assert_select 'label.collection_check_boxes[for=user_name_099]', '$0.99'
     assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
@@ -403,13 +447,57 @@ class BuilderTest < ActionView::TestCase
     assert_no_select 'form label input'
   end
 
-  test 'collection check box accepts a block to render the radio and label as required' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s do |label_for, text, value, html_options|
-      label(:user, label_for, text) { check_box(:user, :active, html_options, value) }
+  test 'collection check boxes accepts a block to render the label as check box wrapper' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.check_box }
     end
 
-    assert_select 'form label[for=user_active_true] > input#user_active_true[type=checkbox]'
-    assert_select 'form label[for=user_active_false] > input#user_active_false[type=checkbox]'
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes accepts a block to change the order of label and check box' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.check_box
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers accept extra html options' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "check_box") + b.check_box(:class => "check_box")
+    end
+
+    assert_select 'label.check_box[for=user_active_true] + input#user_active_true.check_box[type=checkbox]'
+    assert_select 'label.check_box[for=user_active_false] + input#user_active_false.check_box[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers allows access to current text and value' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.check_box + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
+  end
+
+  test 'collection check boxes with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.check_box + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
   end
 
   # SIMPLE FIELDS