simple_form 1.3.1 → 1.4.0

data/lib/simple_form/action_view_extensions/builder.rb

@@ -39,8 +39,8 @@ module SimpleForm
         render_collection(
           attribute, collection, value_method, text_method, options, html_options
         ) do |value, text, default_html_options|
-          radio = radio_button(attribute, value, default_html_options)
-          collection_label(attribute, value, radio, text, :class => "collection_radio")
+          radio_button(attribute, value, default_html_options) +
+            label(sanitize_attribute_name(attribute, value), text, :class => "collection_radio")
         end
       end
 
@@ -83,8 +83,8 @@ module SimpleForm
         ) do |value, text, default_html_options|
           default_html_options[:multiple] = true
 
-          check_box = check_box(attribute, default_html_options, value, '')
-          collection_label(attribute, value, check_box, text, :class => "collection_check_boxes")
+          check_box(attribute, default_html_options, value, '') +
+            label(sanitize_attribute_name(attribute, value), text, :class => "collection_check_boxes")
         end
       end
 
@@ -99,17 +99,16 @@ module SimpleForm
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
-        options[:builder] = SimpleForm::FormBuilder
+        if self.class < ActionView::Helpers::FormBuilder
+          options[:builder] ||= self.class
+        else
+          options[:builder] ||= SimpleForm::FormBuilder
+        end
         fields_for(*(args << options), &block)
       end
 
     private
 
-      # Wraps the given component in a label, for better accessibility with collections.
-      def collection_label(attribute, value, component_tag, label_text, html_options) #:nodoc:
-        label(sanitize_attribute_name(attribute, value), component_tag << label_text.to_s, html_options)
-      end
-
       # Generate default options for collection helpers, such as :checked and
       # :disabled.
       def default_html_options_for_collection(item, value, options, html_options) #:nodoc:

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -40,7 +40,8 @@ module SimpleForm
               else dom_class(record_or_name_or_array)
             end
             options[:html] ||= {}
-            options[:html][:class] = "simple_form \#{css_class} \#{options[:html][:class]}".strip
+            options[:html][:novalidate] = !SimpleForm.browser_validations
+            options[:html][:class] = "\#{SimpleForm.form_class} \#{css_class} \#{options[:html][:class]}".strip
 
             with_custom_field_error_proc do
               #{helper}(record_or_name_or_array, *(args << options), &block)

data/lib/simple_form/components/errors.rb

@@ -12,7 +12,11 @@ module SimpleForm
       end
 
       def error_text
-        errors.send(error_method)
+        if options[:error_prefix]
+          options[:error_prefix] + " " + errors.send(error_method)
+        else
+          errors.send(error_method)
+        end
       end
 
       def error_method

data/lib/simple_form/components/labels.rb

@@ -36,7 +36,7 @@ module SimpleForm
       end
 
       def label_html_options
-        label_options = html_options_for(:label, [input_type, required_class])
+        label_options = html_options_for(:label, [input_type, required_class, SimpleForm.label_class])
         label_options[:for] = options[:input_html][:id] if options.key?(:input_html) && options[:input_html].key?(:id)
         label_options
       end

data/lib/simple_form/form_builder.rb

@@ -5,13 +5,17 @@ module SimpleForm
     extend MapType
     include SimpleForm::Inputs
 
-    map_type :password, :text, :file,              :to => SimpleForm::Inputs::MappingInput
-    map_type :string, :email, :search, :tel, :url, :to => SimpleForm::Inputs::StringInput
-    map_type :integer, :decimal, :float,           :to => SimpleForm::Inputs::NumericInput
-    map_type :select, :radio, :check_boxes,        :to => SimpleForm::Inputs::CollectionInput
-    map_type :date, :time, :datetime,              :to => SimpleForm::Inputs::DateTimeInput
-    map_type :country, :time_zone,                 :to => SimpleForm::Inputs::PriorityInput
-    map_type :boolean,                             :to => SimpleForm::Inputs::BooleanInput
+    map_type :text, :file,                                    :to => SimpleForm::Inputs::MappingInput
+    map_type :string, :password, :email, :search, :tel, :url, :to => SimpleForm::Inputs::StringInput
+    map_type :integer, :decimal, :float,                      :to => SimpleForm::Inputs::NumericInput
+    map_type :select, :radio, :check_boxes,                   :to => SimpleForm::Inputs::CollectionInput
+    map_type :date, :time, :datetime,                         :to => SimpleForm::Inputs::DateTimeInput
+    map_type :country, :time_zone,                            :to => SimpleForm::Inputs::PriorityInput
+    map_type :boolean,                                        :to => SimpleForm::Inputs::BooleanInput
+
+    def self.discovery_cache
+      @discovery_cache ||= {}
+    end
 
     # Basic input helper, combines all components in the stack to generate
     # input html based on options the user define and some guesses through
@@ -85,12 +89,31 @@ module SimpleForm
       if block_given?
         SimpleForm::Inputs::BlockInput.new(self, attribute_name, column, input_type, options, &block).render
       else
-        klass = self.class.mappings[input_type] || self.class.const_get("#{input_type.to_s.camelize}Input")
-        klass.new(self, attribute_name, column, input_type, options).render
+        find_mapping(input_type).new(self, attribute_name, column, input_type, options).render
       end
     end
     alias :attribute :input
 
+    # Creates a input tag for the given attribute. All the given options
+    # are sent as :input_html.
+    #
+    # == Examples
+    #
+    #   simple_form_for @user do |f|
+    #     f.input_field :name
+    #   end
+    #
+    # This is the output html (only the input portion, not the form):
+    #
+    #     <input class="string required" id="user_name" maxlength="100"
+    #        name="user[name]" size="100" type="text" value="Carlos" />
+    #
+    def input_field(attribute_name, options={})
+      options[:input_html] = options.except(:as)
+      options.merge!(:components => [:input], :wrapper => false)
+      input(attribute_name, options)
+    end
+
     # Helper for dealing with association selects/radios, generating the
     # collection automatically. It's just a wrapper to input, so all options
     # supported in input are also supported by association. Some extra options
@@ -133,7 +156,7 @@ module SimpleForm
         when :belongs_to
           reflection.options[:foreign_key] || :"#{reflection.name}_id"
         when :has_one
-          raise ":has_one association are not supported by f.association"
+          raise ":has_one associations are not supported by f.association"
         else
           if options[:as] == :select
             html_options = options[:input_html] ||= {}
@@ -141,6 +164,12 @@ module SimpleForm
             html_options[:multiple] = true unless html_options.key?(:multiple)
           end
 
+          # Force the association to be preloaded for performance.
+          if options[:preload] != false && object.respond_to?(association)
+            target = object.send(association)
+            target.to_a if target.respond_to?(:to_a)
+          end
+
           :"#{reflection.name.to_s.singularize}_ids"
       end
 
@@ -181,6 +210,23 @@ module SimpleForm
       SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options).error
     end
 
+    # Return the error but also considering its name. This is used
+    # when errors for a hidden field need to be shown.
+    #
+    # == Examples
+    #
+    #    f.full_error :token #=> <span class="error">Token is invalid</span>
+    #
+    def full_error(attribute_name, options={})
+      options[:error_prefix] ||= if object.class.respond_to?(:human_attribute_name)
+        object.class.human_attribute_name(attribute_name.to_s)
+      else
+        attribute_name.to_s.humanize
+      end
+
+      error(attribute_name, options)
+    end
+
     # Creates a hint tag for the given attribute. Accepts a symbol indicating
     # an attribute for I18n lookup or a string. All the given options are sent
     # as :hint_html.
@@ -254,48 +300,90 @@ module SimpleForm
 
       input_type = column.try(:type)
       case input_type
-        when :timestamp
-          :datetime
-        when :string, nil
-          match = case attribute_name.to_s
-            when /password/  then :password
-            when /time_zone/ then :time_zone
-            when /country/   then :country
-            when /email/     then :email
-            when /phone/     then :tel
-            when /url/       then :url
-          end
-
-          match || input_type || file_method?(attribute_name) || :string
+      when :timestamp
+        :datetime
+      when :string, nil
+        case attribute_name.to_s
+        when /password/  then :password
+        when /time_zone/ then :time_zone
+        when /country/   then :country
+        when /email/     then :email
+        when /phone/     then :tel
+        when /url/       then :url
         else
-          input_type
+          file_method?(attribute_name) ? :file : (input_type || :string)
+        end
+      else
+        input_type
       end
     end
 
-    def find_custom_type(attribute_name)
+    def find_custom_type(attribute_name) #:nodoc:
       SimpleForm.input_mappings.find { |match, type|
         attribute_name =~ match
       }.try(:last) if SimpleForm.input_mappings
     end
 
-    # Checks if attribute is a file_method.
     def file_method?(attribute_name) #:nodoc:
       file = @object.send(attribute_name) if @object.respond_to?(attribute_name)
-      :file if file && SimpleForm.file_methods.any? { |m| file.respond_to?(m) }
+      file && SimpleForm.file_methods.any? { |m| file.respond_to?(m) }
     end
 
-    # Finds the database column for the given attribute.
     def find_attribute_column(attribute_name) #:nodoc:
       if @object.respond_to?(:column_for_attribute)
         @object.column_for_attribute(attribute_name)
       end
     end
 
-    # Find reflection related to association.
     def find_association_reflection(association) #:nodoc:
       if @object.class.respond_to?(:reflect_on_association)
         @object.class.reflect_on_association(association)
       end
     end
+
+    # Attempts to find a mapping. It follows the following rules:
+    #
+    # 1) It tries to find a registered mapping, if succeeds:
+    #    a) Try to find an alternative with the same name in the Object scope
+    #    b) Or use the found mapping
+    # 2) If not, fallbacks to #{input_type}Input
+    # 3) If not, fallbacks to SimpleForm::Inputs::#{input_type}Input
+    def find_mapping(input_type) #:nodoc:
+      discovery_cache[input_type] ||=
+        if mapping = self.class.mappings[input_type]
+          mapping_override(mapping) || mapping
+        else
+          camelized = "#{input_type.to_s.camelize}Input"
+          attempt_mapping(camelized, Object) || attempt_mapping(camelized, self.class) ||
+            raise("No input found for #{input_type}")
+        end
+    end
+
+    # If cache_discovery is enabled, use the class level cache that persists
+    # between requests, otherwise use the instance one.
+    def discovery_cache #:nodoc:
+      if SimpleForm.cache_discovery
+        self.class.discovery_cache
+      else
+        @discovery_cache ||= {}
+      end
+    end
+
+    def mapping_override(klass) #:nodoc:
+      name = klass.name
+      if name =~ /^SimpleForm::Inputs/
+        attempt_mapping name.split("::").last, Object
+      end
+    end
+
+    def attempt_mapping(mapping, at) #:nodoc:
+      return if SimpleForm.inputs_discovery == false && at == Object
+
+      begin
+        at.const_get(mapping)
+      rescue NameError => e
+        e.message =~ /#{mapping}$/ ? nil : raise
+      end
+    end
   end
 end

data/lib/simple_form/inputs/base.rb

@@ -28,9 +28,9 @@ module SimpleForm
         @reflection         = options.delete(:reflection)
         @options            = options
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
-          o[:required]  = true if has_required?
+          o[:required]  = true if has_required? # Don't make this conditional on HTML5 here, because we want the CSS class to be set
           o[:disabled]  = true if disabled?
-          o[:autofocus] = true if has_autofocus?
+          o[:autofocus] = true if has_autofocus? && SimpleForm.html5
         end
       end
 
@@ -74,7 +74,7 @@ module SimpleForm
 
       # Whether this input is valid for HTML 5 required attribute.
       def has_required?
-        attribute_required?
+        attribute_required? && SimpleForm.html5
       end
 
       def has_autofocus?
@@ -130,6 +130,15 @@ module SimpleForm
       #  Action is the action being rendered, usually :new or :edit.
       #  And attribute is the attribute itself, :name for example.
       #
+      #  The lookup for nested attributes is also done in a nested format using
+      #  both model and nested object names, such as follow:
+      #
+      #   simple_form.{namespace}.{model}.{nested}.{action}.{attribute}
+      #   simple_form.{namespace}.{model}.{nested}.{attribute}
+      #   simple_form.{namespace}.{nested}.{action}.{attribute}
+      #   simple_form.{namespace}.{nested}.{attribute}
+      #   simple_form.{namespace}.{attribute}
+      #
       #  Example:
       #
       #    simple_form:
@@ -143,14 +152,36 @@ module SimpleForm
       #  Take a look at our locale example file.
       def translate(namespace, default='')
         return nil unless SimpleForm.translate
-        lookups = []
-        lookups << :"#{object_name}.#{lookup_action}.#{reflection_or_attribute_name}"
-        lookups << :"#{object_name}.#{reflection_or_attribute_name}"
+
+        model_names = lookup_model_names
+        lookups     = []
+
+        while !model_names.empty?
+          joined_model_names = model_names.join(".")
+          model_names.shift
+
+          lookups << :"#{joined_model_names}.#{lookup_action}.#{reflection_or_attribute_name}"
+          lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}"
+        end
         lookups << :"#{reflection_or_attribute_name}"
         lookups << default
+
         I18n.t(lookups.shift, :scope => :"simple_form.#{namespace}", :default => lookups).presence
       end
 
+      # Extract the model names from the object_name mess.
+      #
+      # Example:
+      #
+      # route[blocks_attributes][0][blocks_learning_object_attributes][1][foo_attributes]
+      # ["route", "blocks", "blocks_learning_object", "foo"]
+      #
+      def lookup_model_names
+        object_name.to_s.scan(/([a-zA-Z_]+)/).flatten.map do |x|
+          x.gsub('_attributes', '')
+        end
+      end
+
       # The action to be used in lookup.
       def lookup_action
         action = template.controller.action_name
@@ -158,6 +189,11 @@ 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/collection_input.rb

@@ -14,7 +14,6 @@ module SimpleForm
 
       def input
         label_method, value_method = detect_collection_methods
-
         @builder.send(:"collection_#{input_type}", attribute_name, collection,
                       value_method, label_method, input_options, input_html_options)
       end

data/lib/simple_form/inputs/mapping_input.rb

@@ -4,7 +4,6 @@ module SimpleForm
     class MappingInput < Base
       extend MapType
 
-      map_type :password, :to => :password_field
       map_type :text,     :to => :text_area
       map_type :file,     :to => :file_field
 
@@ -14,11 +13,6 @@ module SimpleForm
 
     private
 
-      def input_method
-        self.class.mappings[input_type] or
-          raise("Could not find method for #{input_type.inspect}")
-      end
-
       def has_placeholder?
         (text? || password?) && placeholder_present?
       end

data/lib/simple_form/inputs/numeric_input.rb

@@ -2,10 +2,10 @@ module SimpleForm
   module Inputs
     class NumericInput < Base
       def input
-        input_html_options[:type] ||= "number"
+        input_html_options[:type] ||= "number" if SimpleForm.html5
         input_html_options[:size] ||= SimpleForm.default_input_size
-        input_html_options[:step] ||= 1 if integer?
-        infer_attributes_from_validations!
+        input_html_options[:step] ||= integer? ? 1 : "any" if SimpleForm.html5
+        infer_attributes_from_validations! if SimpleForm.html5
         @builder.text_field(attribute_name, input_html_options)
       end
 
@@ -35,23 +35,31 @@ module SimpleForm
 
       def minimum_value(validator_options)
         if integer? && validator_options.key?(:greater_than)
-          validator_options[:greater_than] + 1
+          evaluate_validator_option(validator_options[:greater_than]) + 1
         else
-          validator_options[:greater_than_or_equal_to]
+          evaluate_validator_option(validator_options[:greater_than_or_equal_to])
         end
       end
 
       def maximum_value(validator_options)
         if integer? && validator_options.key?(:less_than)
-          validator_options[:less_than] - 1
+          evaluate_validator_option(validator_options[:less_than]) - 1
         else
-          validator_options[:less_than_or_equal_to]
+          evaluate_validator_option(validator_options[:less_than_or_equal_to])
         end
       end
 
       def find_numericality_validator
         attribute_validators.find { |v| ActiveModel::Validations::NumericalityValidator === v }
       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)
+      end
     end
   end
 end