simple_form 1.4.2 → 1.5.0

data/lib/simple_form/helpers/required.rb

@@ -0,0 +1,36 @@
+module SimpleForm
+  module Helpers
+    module Required
+      private
+
+      def attribute_required?
+        @required
+      end
+
+      def calculate_required
+        if !options[:required].nil?
+          options[:required]
+        elsif has_validators?
+          (attribute_validators + reflection_validators).any? do |v|
+            v.kind == :presence && valid_validator?(v)
+          end
+        else
+          attribute_required_by_default?
+        end
+      end
+
+      # Whether this input is valid for HTML 5 required attribute.
+      def has_required?
+        attribute_required? && SimpleForm.html5 && SimpleForm.browser_validations
+      end
+
+      def attribute_required_by_default?
+        SimpleForm.required_by_default
+      end
+
+      def required_class
+        attribute_required? ? :required : :optional
+      end
+    end
+  end
+end

data/lib/simple_form/helpers/validators.rb

@@ -0,0 +1,44 @@
+module SimpleForm
+  module Helpers
+    module Validators
+      private
+
+      def has_validators?
+        attribute_name && object.class.respond_to?(:validators_on)
+      end
+
+      def attribute_validators
+        object.class.validators_on(attribute_name)
+      end
+
+      def reflection_validators
+        reflection ? object.class.validators_on(reflection.name) : []
+      end
+
+      def valid_validator?(validator)
+        !conditional_validators?(validator) && action_validator_match?(validator)
+      end
+
+      def conditional_validators?(validator)
+        validator.options.include?(:if) || validator.options.include?(:unless)
+      end
+
+      def action_validator_match?(validator)
+        return true if !validator.options.include?(:on)
+
+        case validator.options[:on]
+        when :save
+          true
+        when :create
+          !object.persisted?
+        when :update
+          object.persisted?
+        end
+      end
+
+      def find_validator(validator)
+        attribute_validators.find { |v| validator === v }
+      end
+    end
+  end
+end

data/lib/simple_form/inputs.rb

@@ -5,10 +5,13 @@ module SimpleForm
     autoload :BooleanInput,    'simple_form/inputs/boolean_input'
     autoload :CollectionInput, 'simple_form/inputs/collection_input'
     autoload :DateTimeInput,   'simple_form/inputs/date_time_input'
+    autoload :FileInput,       'simple_form/inputs/file_input'
     autoload :HiddenInput,     'simple_form/inputs/hidden_input'
-    autoload :MappingInput,    'simple_form/inputs/mapping_input'
     autoload :NumericInput,    'simple_form/inputs/numeric_input'
+    autoload :PasswordInput,   'simple_form/inputs/password_input'
     autoload :PriorityInput,   'simple_form/inputs/priority_input'
+    autoload :RangeInput,      'simple_form/inputs/range_input'
     autoload :StringInput,     'simple_form/inputs/string_input'
+    autoload :TextInput,       'simple_form/inputs/text_input'
   end
-end
+end

data/lib/simple_form/inputs/base.rb

@@ -9,12 +9,26 @@ module SimpleForm
         :update => :edit
       }
 
+      include SimpleForm::Helpers::Required
+      include SimpleForm::Helpers::Validators
+      include SimpleForm::Helpers::Maxlength
+      include SimpleForm::Helpers::Pattern
+
       include SimpleForm::Components::Errors
       include SimpleForm::Components::Hints
       include SimpleForm::Components::LabelInput
       include SimpleForm::Components::Placeholders
       include SimpleForm::Components::Wrapper
 
+      # Enables certain components support to the given input.
+      def self.enable(*args)
+        args.each { |m| alias_method m, :"enabled_#{m}" }
+      end
+
+      def self.disable(*args)
+        args.each { |m| alias_method m, :"disabled_#{m}" }
+      end
+
       attr_reader :attribute_name, :column, :input_type, :reflection,
                   :options, :input_html_options
 
@@ -27,8 +41,9 @@ module SimpleForm
         @input_type         = input_type
         @reflection         = options.delete(:reflection)
         @options            = options
+        @required           = calculate_required
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
-          o[:required]  = true if has_required? # Don't make this conditional on HTML5 here, because we want the CSS class to be set
+          o[:required]  = true if has_required?
           o[:disabled]  = true if disabled?
           o[:autofocus] = true if has_autofocus? && SimpleForm.html5
         end
@@ -56,57 +71,24 @@ module SimpleForm
         wrap(content)
       end
 
-    protected
+      private
 
-      def components_list
-        options[:components] || SimpleForm.components
+      def add_size!
+        input_html_options[:size] ||= [limit, SimpleForm.default_input_size].compact.min
       end
 
-      def attribute_required?
-        if !options[:required].nil?
-          options[:required]
-        elsif has_validators?
-          (attribute_validators + reflection_validators).any? do |v|
-            v.kind == :presence && !conditional_validators?(v)
-          end
-        else
-          attribute_required_by_default?
-        end
+      def limit
+        column && column.limit
       end
 
-      # Whether this input is valid for HTML 5 required attribute.
-      def has_required?
-        attribute_required? && SimpleForm.html5 && SimpleForm.browser_validations
+      def components_list
+        options[:components] || SimpleForm.components
       end
 
       def has_autofocus?
         options[:autofocus]
       end
 
-      def has_validators?
-        attribute_name && object.class.respond_to?(:validators_on)
-      end
-
-      def attribute_validators
-        object.class.validators_on(attribute_name)
-      end
-
-      def reflection_validators
-        reflection ? object.class.validators_on(reflection.name) : []
-      end
-
-      def conditional_validators?(validator)
-        validator.options.include?(:if) || validator.options.include?(:unless)
-      end
-
-      def attribute_required_by_default?
-        SimpleForm.required_by_default
-      end
-
-      def required_class
-        attribute_required? ? :required : :optional
-      end
-
       # Find reflection name when available, otherwise use attribute
       def reflection_or_attribute_name
         reflection ? reflection.name : attribute_name
@@ -120,7 +102,7 @@ module SimpleForm
       end
 
       def disabled?
-        options[:disabled]
+        options[:disabled] == true
       end
 
       # Lookup translations for the given namespace using I18n, based on object name,
@@ -197,11 +179,6 @@ module SimpleForm
         action = action.to_sym
         ACTIONS[action] || action
       end
-
-      def input_method
-        self.class.mappings[input_type] or
-          raise("Could not find method for #{input_type.inspect}")
-      end
     end
   end
 end

data/lib/simple_form/inputs/boolean_input.rb

@@ -9,7 +9,7 @@ module SimpleForm
         input + (options[:label] == false ? "" : label)
       end
 
-    protected
+      private
 
       # Booleans are not required by default because in most of the cases
       # it makes no sense marking them as required. The only exception is

data/lib/simple_form/inputs/collection_input.rb

@@ -24,7 +24,7 @@ module SimpleForm
         options
       end
 
-    protected
+      private
 
       def collection
         @collection ||= (options.delete(:collection) || self.class.boolean_collection).to_a

data/lib/simple_form/inputs/date_time_input.rb

@@ -5,7 +5,7 @@ module SimpleForm
         @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
       end
 
-    private
+      private
 
       def has_required?
         false

data/lib/simple_form/inputs/file_input.rb

@@ -0,0 +1,9 @@
+module SimpleForm
+  module Inputs
+    class FileInput < Base
+      def input
+        @builder.file_field(attribute_name, input_html_options)
+      end
+    end
+  end
+end

data/lib/simple_form/inputs/hidden_input.rb

@@ -6,7 +6,7 @@ module SimpleForm
       end
       alias :input :render
 
-    protected
+      private
 
       def attribute_required?
         false

data/lib/simple_form/inputs/numeric_input.rb

@@ -1,11 +1,15 @@
 module SimpleForm
   module Inputs
     class NumericInput < Base
+      enable :placeholder
+
       def input
-        input_html_options[:type] ||= "number" if SimpleForm.html5
-        input_html_options[:size] ||= SimpleForm.default_input_size
-        input_html_options[:step] ||= integer? ? 1 : "any" if SimpleForm.html5
-        infer_attributes_from_validations! if SimpleForm.html5
+        add_size!
+        if SimpleForm.html5
+          input_html_options[:type] ||= "number"
+          input_html_options[:step] ||= integer? ? 1 : "any"
+          infer_attributes_from_validations!
+        end
         @builder.text_field(attribute_name, input_html_options)
       end
 
@@ -13,10 +17,11 @@ module SimpleForm
         super.unshift("numeric")
       end
 
-    protected
+      private
 
-      def has_placeholder?
-        placeholder_present?
+      # Rails adds the size attr by default, if the :size key does not exist.
+      def add_size!
+        input_html_options[:size] ||= nil
       end
 
       def infer_attributes_from_validations!
@@ -50,15 +55,17 @@ module SimpleForm
       end
 
       def find_numericality_validator
-        attribute_validators.find { |v| ActiveModel::Validations::NumericalityValidator === v }
+        find_validator(ActiveModel::Validations::NumericalityValidator)
       end
 
-      private
-
       def evaluate_validator_option(option)
-        return option if option.is_a?(Numeric)
-        return object.send(option) if option.is_a?(Symbol)
-        return option.call(object) if option.respond_to?(:call)
+        if option.is_a?(Numeric)
+          option
+        elsif option.is_a?(Symbol)
+          object.send(option)
+        elsif option.respond_to?(:call)
+          option.call(object)
+        end
       end
     end
   end

data/lib/simple_form/inputs/password_input.rb

@@ -0,0 +1,13 @@
+module SimpleForm
+  module Inputs
+    class PasswordInput < Base
+      enable :placeholder
+
+      def input
+        add_size!
+        add_maxlength!
+        @builder.password_field(attribute_name, input_html_options)
+      end
+    end
+  end
+end

data/lib/simple_form/inputs/range_input.rb

@@ -0,0 +1,16 @@
+module SimpleForm
+  module Inputs
+    class RangeInput < NumericInput
+      disable :placeholder
+
+      def input
+        if SimpleForm.html5
+          input_html_options[:type] ||= "range"
+          input_html_options[:step] ||= 1
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/simple_form/inputs/string_input.rb

@@ -1,42 +1,25 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
-      extend MapType
-
-      map_type :string, :email, :search, :tel, :url,  :to => :text_field
-      map_type :password,                             :to => :password_field
+      enable :placeholder
 
       def input
-        input_html_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
-        input_html_options[:maxlength] ||= limit if limit && SimpleForm.html5
-        if password? || SimpleForm.html5
-          input_html_options[:type]    ||= input_type unless string?
-        end
-
-        @builder.send(input_method, attribute_name, input_html_options)
+        input_html_options[:type] ||= input_type if SimpleForm.html5 && !string?
+        add_maxlength!
+        add_pattern!
+        add_size!
+        @builder.text_field(attribute_name, input_html_options)
       end
 
       def input_html_classes
         string? ? super : super.unshift("string")
       end
 
-    protected
-
-      def limit
-        column && column.limit
-      end
-
-      def has_placeholder?
-        placeholder_present?
-      end
+      private
 
       def string?
         input_type == :string
       end
-
-      def password?
-        input_type == :password
-      end
     end
   end
 end

data/lib/simple_form/inputs/text_input.rb

@@ -0,0 +1,12 @@
+module SimpleForm
+  module Inputs
+    class TextInput < Base
+      enable :placeholder
+
+      def input
+        add_maxlength!
+        @builder.text_area(attribute_name, input_html_options)
+      end
+    end
+  end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.4.2".freeze
+  VERSION = "1.5.0".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -96,6 +96,24 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form ul input[type=radio][value=false]#user_active_false'
   end
 
+  test 'collection radio does not wrap the collection in the explicitly false collection wrapper tag' do
+    swap SimpleForm, :collection_wrapper_tag => :ul do
+      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
+
+      assert_no_select 'form ul'
+      assert_no_select 'form ul'
+    end
+  end
+
+  test 'collection radio does not wrap the collection in the explicitly nil collection wrapper tag' do
+    swap SimpleForm, :collection_wrapper_tag => :ul do
+      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => nil
+
+      assert_no_select 'form ul'
+      assert_no_select 'form ul'
+    end
+  end
+
   test 'collection radio does not wrap the collection by default' do
     with_collection_radio @user, :active, [true, false], :to_s, :to_s
 
@@ -118,6 +136,20 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form li input[type=radio][value=false]#user_active_false'
   end
 
+  test 'collection radio does not wrap each label/radio in the explicitly false item wrapper tag' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+
+    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
+    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+  end
+
+  test 'collection radio does not wrap each label/radio in the explicitly nil item wrapper tag' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => nil
+
+    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
+    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+  end
+
   test 'collection radio wrap items in a span tag by default' do
     with_collection_radio @user, :active, [true, false], :to_s, :to_s
 
@@ -246,6 +278,13 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
   end
 
+  test 'collection check box does not wrap the collection in the explicitly false collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false, :item_wrapper_tag => false
+
+    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
+    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+  end
+
   test 'collection check box does not wrap the collection by default' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
@@ -268,6 +307,13 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form li input[type=checkbox][value=false]#user_active_false'
   end
 
+  test 'collection check box does not wrapp each label/radio in the explicitly false item wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+
+    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
+    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+  end
+
   test 'collection check box wrap items in a span tag by default' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
@@ -290,6 +336,19 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
+  test 'fields for with a hash like model yeilds an instance of FormBuilder' do
+    @hash_backed_author = HashBackedAuthor.new
+
+    with_concat_form_for(:user) do |f|
+      f.simple_fields_for(:author, @hash_backed_author) do |author|
+        assert author.instance_of?(SimpleForm::FormBuilder)
+        author.input :name
+      end
+    end
+
+    assert_select "input[name='user[author][name]'][value='hash backed author']"
+  end
+
   test 'fields for yields an instance of CustomBuilder if main builder is a CustomBuilder' do
     with_custom_form_for(:user) do |f|
       f.simple_fields_for(:company) do |company|