simple_form 3.0.4 → 3.1.0.rc1

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.0.4".freeze
+  VERSION = "3.1.0.rc1".freeze
 end

data/lib/simple_form/wrappers.rb

@@ -4,5 +4,6 @@ module SimpleForm
     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

data/lib/simple_form/wrappers/builder.rb

@@ -45,20 +45,20 @@ module SimpleForm
         @components = []
       end
 
-      def use(name, options=nil, &block)
+      def use(name, options = {}, &block)
         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)
+      def optional(name, options = {}, &block)
         @options[name] = false
         use(name, options, &block)
       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,28 @@
+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 == 0
+          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,7 @@
 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,9 +10,8 @@ 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
@@ -25,8 +24,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
 
@@ -62,7 +61,7 @@ module SimpleForm
       end
 
       def html_options(options)
-        options[:"#{namespace}_html"] || {}
+        (@defaults[:html] || {}).merge(options[:"#{namespace}_html"] || {})
       end
 
       def html_classes(input, options)

data/lib/simple_form/wrappers/root.rb

@@ -17,7 +17,7 @@ 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

data/lib/simple_form/wrappers/single.rb

@@ -2,14 +2,16 @@ 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

data/test/action_view_extensions/builder_test.rb

@@ -8,13 +8,13 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  def with_collection_radio_buttons(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
+  def with_collection_radio_buttons(object, attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
     with_concat_form_for(object) do |f|
       f.collection_radio_buttons attribute, collection, value_method, text_method, options, html_options, &block
     end
   end
 
-  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
+  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
     with_concat_form_for(object) do |f|
       f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options, &block
     end

data/test/components/label_test.rb

@@ -7,7 +7,7 @@ class IsolatedLabelTest < ActionView::TestCase
     SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
   end
 
-  def with_label_for(object, attribute_name, type, options={})
+  def with_label_for(object, attribute_name, type, options = {})
     with_concat_form_for(object) do |f|
       options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
       SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).label

data/test/form_builder/association_test.rb

@@ -113,6 +113,14 @@ class AssociationTest < ActionView::TestCase
     assert_no_select 'form select option[value=3]'
   end
 
+  test 'builder allows collection to have a scope' do
+    with_association_for @user, :special_pictures
+    assert_select 'form select.select#user_special_picture_ids'
+    assert_select 'form select option[value=3]', '3'
+    assert_no_select 'form select option[value=1]'
+    assert_no_select 'form select option[value=2]'
+  end
+
   test 'builder marks the record which already belongs to the user' do
     @user.company_id = 2
     with_association_for @user, :company, as: :radio_buttons
@@ -146,6 +154,15 @@ class AssociationTest < ActionView::TestCase
     end
   end
 
+  test 'builder does not call order if the given association does not respond to it' do
+    with_association_for @user, :pictures
+    assert_select 'form select.select#user_picture_ids'
+    assert_select 'form select[multiple=multiple]'
+    assert_select 'form select option[value=1]', 'Picture 1'
+    assert_select 'form select option[value=2]', 'Picture 2'
+    assert_select 'form select option[value=3]', 'Picture 3'
+  end
+
   test 'builder creates a select with multiple options for collection associations' do
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'

data/test/form_builder/error_notification_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 # Tests for f.error_notification
 class ErrorNotificationTest < ActionView::TestCase
-  def with_error_notification_for(object, options={}, &block)
+  def with_error_notification_for(object, options = {}, &block)
     with_concat_form_for(object) do |f|
       f.error_notification(options)
     end

data/test/form_builder/error_test.rb

@@ -14,10 +14,6 @@ class ErrorTest < ActionView::TestCase
     end
   end
 
-  def with_custom_error_for(object, *args)
-    with_form_for(object, *args)
-  end
-
   test 'error should not generate content for attribute without errors' do
     with_error_for @user, :active
     assert_no_select 'span.error'
@@ -36,7 +32,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can&#39;t be blank"
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'error should generate messages for attribute with one error when using first' do
@@ -86,21 +82,12 @@ class ErrorTest < ActionView::TestCase
 
   test 'error should escape error prefix text' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'
-    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can&#39;t be blank"
-  end
-
-  test 'error escapes error text' do
-    @user.errors.merge!(action: ['must not contain <b>markup</b>'])
-
-    with_error_for @user, :action
-
-    assert_select 'span.error'
-    assert_no_select 'span.error b', 'markup'
+    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can't be blank"
   end
 
   test 'error should generate an error message with raw HTML tags' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'.html_safe
-    assert_select 'span.error', "Name can&#39;t be blank"
+    assert_select 'span.error', "Name can't be blank"
     assert_select 'span.error b', "Name"
   end
 
@@ -108,7 +95,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should generate an full error tag for the attribute' do
     with_full_error_for @user, :name
-    assert_select 'span.error', "Super User Name! can&#39;t be blank"
+    assert_select 'span.error', "Super User Name! can't be blank"
   end
 
   test 'full error should generate an full error tag with a clean HTML' do
@@ -118,13 +105,13 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should allow passing options to full error tag' do
     with_full_error_for @user, :name, id: 'name_error', error_prefix: "Your name"
-    assert_select 'span.error#name_error', "Your name can&#39;t be blank"
+    assert_select 'span.error#name_error', "Your name can't be blank"
   end
 
   test 'full error should not modify the options hash' do
     options = { id: 'name_error' }
     with_full_error_for @user, :name, options
-    assert_select 'span.error#name_error', "Super User Name! can&#39;t be blank"
+    assert_select 'span.error#name_error', "Super User Name! can't be blank"
     assert_equal({ id: 'name_error' }, options)
   end
 
@@ -133,36 +120,68 @@ class ErrorTest < ActionView::TestCase
   test 'error with custom wrappers works' do
     swap_wrapper do
       with_error_for @user, :name
-      assert_select 'span.omg_error', "can&#39;t be blank"
+      assert_select 'span.omg_error', "can't be blank"
+    end
+  end
+
+  # FULL_ERROR_WRAPPER
+
+  test 'full error should find errors on association' do
+    swap_wrapper :default, self.custom_wrapper_with_full_error do
+      with_form_for @user, :company_id, as: :select
+      assert_select 'span.error', 'Company must be valid'
+    end
+  end
+
+  test 'full error can be disabled' do
+    swap_wrapper :default, self.custom_wrapper_with_full_error do
+      with_form_for @user, :company_id, as: :select, full_error: false
+      assert_no_select 'span.error'
+    end
+  end
+
+  test 'full error can be disabled setting error to false' do
+    swap_wrapper :default, self.custom_wrapper_with_full_error do
+      with_form_for @user, :company_id, as: :select, error: false
+      assert_no_select 'span.error'
     end
   end
 
   # CUSTOM ERRORS
 
   test 'input with custom error works' do
-    with_custom_error_for(@user, :name, error: "Super User Name! can't be blank")
+    error_text = "Super User Name! can't be blank"
+    with_form_for @user, :name, error: error_text
 
-    assert_select 'span.error', "Super User Name! can&#39;t be blank"
+    assert_select 'span.error', error_text
+  end
+
+  test 'input with error option as true does not use custom error' do
+    with_form_for @user, :name, error: true
+
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'input with custom error does not generate the error if there is no error on the attribute' do
-    error_text = "Super User Active! can't be blank"
-    with_form_for @user, :active, error: error_text
+    with_form_for @user, :active, error: "Super User Active! can't be blank"
 
     assert_no_select 'span.error'
   end
 
-  test 'input with custom error escapes the error text' do
-    with_form_for @user, :name, error: 'error must not contain <b>markup</b>'
+  test 'input with custom error works when using full_error component' do
+    swap_wrapper :default, self.custom_wrapper_with_full_error do
+      error_text = "Super User Name! can't be blank"
+      with_form_for @user, :name, error: error_text
 
-    assert_select 'span.error'
-    assert_no_select 'span.error b', 'markup'
+      assert_select 'span.error', error_text
+    end
   end
 
-  test 'input with custom error does not escape the error text if it is safe' do
-    with_form_for @user, :name, error: 'error must contain <b>markup</b>'.html_safe
+  test 'input with custom error when using full_error component does not generate the error if there is no error on the attribute' do
+    swap_wrapper :default, self.custom_wrapper_with_full_error do
+      with_form_for @user, :active, error: "Super User Active! can't be blank"
 
-    assert_select 'span.error'
-    assert_select 'span.error b', 'markup'
+      assert_no_select 'span.error'
+    end
   end
 end

data/test/form_builder/general_test.rb

@@ -302,7 +302,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should generate errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can&#39;t be blank"
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'builder should be able to disable showing errors for a input' do
@@ -312,7 +312,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should pass options to errors' do
     with_form_for @user, :name, error_html: { id: "cool" }
-    assert_select 'span.error#cool', "can&#39;t be blank"
+    assert_select 'span.error#cool', "can't be blank"
   end
 
   test 'placeholder should not be generated when set to false' do

data/test/form_builder/input_field_test.rb

@@ -88,14 +88,30 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[min=18]'
   end
 
-  test 'builder input_field should use pattern component' do
+  test 'builder input_field should not use pattern component by default' do
     with_concat_form_for(@other_validating_user) do |f|
       f.input_field :country, as: :string
     end
 
+    assert_no_select 'input[pattern="\w+"]'
+  end
+
+  test 'builder input_field should infer pattern from attributes' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :country, as: :string, pattern: true
+    end
+
     assert_select 'input[pattern="\w+"]'
   end
 
+  test 'builder input_field should accept custom patter' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :country, as: :string, pattern: '\d+'
+    end
+
+    assert_select 'input[pattern="\d+"]'
+  end
+
   test 'builder input_field should use readonly component' do
     with_concat_form_for(@other_validating_user) do |f|
       f.input_field :age, as: :integer, readonly: true
@@ -123,43 +139,11 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'select.status[value_method]'
   end
 
-  test 'build input_field without pattern component use the pattern string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, pattern: '\w+'
-      end
-
-      assert_select 'input[pattern="\w+"]'
-    end
-  end
-
-  test 'build input_field without placeholder component use the placeholder string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, placeholder: 'Placeholder'
-      end
-
-      assert_select 'input[placeholder="Placeholder"]'
-    end
-  end
-
-  test 'build input_field without maxlength component use the maxlength string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, maxlength: 5
-      end
-
-      assert_select 'input[maxlength="5"]'
+  test 'build input_field does not treat "boolean_style" as an HTML attribute' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :active, boolean_style: :nested
     end
-  end
 
-  test 'build input_field without readonly component use the readonly string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, readonly: true
-      end
-
-      assert_select 'input[readonly="readonly"]'
-    end
+    assert_no_select 'input.boolean[boolean_style]'
   end
 end