simple_form 1.2.0 → 1.4.0

data/lib/simple_form/inputs/date_time_input.rb

@@ -5,14 +5,20 @@ module SimpleForm
         @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
       end
 
+    private
+
+      def has_required?
+        false
+      end
+
       def label_target
         case input_type
-          when :date, :datetime
-            "#{attribute_name}_1i"
-          when :time
-            "#{attribute_name}_4i"
+        when :date, :datetime
+          "#{attribute_name}_1i"
+        when :time
+          "#{attribute_name}_4i"
         end
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/hidden_input.rb

@@ -1,11 +1,20 @@
 module SimpleForm
   module Inputs
-    # Handles hidden input.
     class HiddenInput < Base
       def render
         @builder.hidden_field(attribute_name, input_html_options)
       end
       alias :input :render
+
+    protected
+
+      def attribute_required?
+        false
+      end
+
+      def required_class
+        nil
+      end
     end
   end
-end
+end

data/lib/simple_form/inputs/mapping_input.rb

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

data/lib/simple_form/inputs/numeric_input.rb

@@ -2,15 +2,64 @@ module SimpleForm
   module Inputs
     class NumericInput < Base
       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
         @builder.text_field(attribute_name, input_html_options)
       end
 
-      def input_html_options
-        input_options = super
-        input_options[:class]  = "numeric #{input_options[:class]}"
-        input_options[:size] ||= SimpleForm.default_input_size
-        input_options
+      def input_html_classes
+        super.unshift("numeric")
+      end
+
+    protected
+
+      def has_placeholder?
+        placeholder_present?
+      end
+
+      def infer_attributes_from_validations!
+        return unless has_validators?
+
+        numeric_validator = find_numericality_validator or return
+        validator_options = numeric_validator.options
+
+        input_html_options[:min] ||= minimum_value(validator_options)
+        input_html_options[:max] ||= maximum_value(validator_options)
+      end
+
+      def integer?
+        input_type == :integer
+      end
+
+      def minimum_value(validator_options)
+        if integer? && validator_options.key?(:greater_than)
+          evaluate_validator_option(validator_options[:greater_than]) + 1
+        else
+          evaluate_validator_option(validator_options[:greater_than_or_equal_to])
+        end
+      end
+
+      def maximum_value(validator_options)
+        if integer? && validator_options.key?(:less_than)
+          evaluate_validator_option(validator_options[:less_than]) - 1
+        else
+          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
+end

data/lib/simple_form/inputs/priority_input.rb

@@ -12,9 +12,13 @@ module SimpleForm
 
     protected
 
+      def has_required?
+        false
+      end
+
       def skip_include_blank?
         super || input_priority.present?
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/string_input.rb

@@ -1,21 +1,23 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
-      def input
-        @builder.text_field(attribute_name, input_html_options)
-      end
+      extend MapType
 
-      def input_html_options
-        input_options = super
-        input_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
-        input_options[:maxlength] ||= limit if limit
+      map_type :string, :email, :search, :tel, :url,  :to => :text_field
+      map_type :password,                             :to => :password_field
 
-        unless input_type == :string
-          input_options[:type] ||= input_type
-          input_options[:class]  = "string #{input_options[:class]}"
+      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
 
-        input_options
+        @builder.send(input_method, attribute_name, input_html_options)
+      end
+
+      def input_html_classes
+        string? ? super : super.unshift("string")
       end
 
     protected
@@ -23,6 +25,18 @@ module SimpleForm
       def limit
         column && column.limit
       end
+
+      def has_placeholder?
+        placeholder_present?
+      end
+
+      def string?
+        input_type == :string
+      end
+
+      def password?
+        input_type == :password
+      end
     end
   end
 end

data/lib/simple_form/inputs.rb

@@ -2,6 +2,7 @@ module SimpleForm
   module Inputs
     autoload :Base,            'simple_form/inputs/base'
     autoload :BlockInput,      'simple_form/inputs/block_input'
+    autoload :BooleanInput,    'simple_form/inputs/boolean_input'
     autoload :CollectionInput, 'simple_form/inputs/collection_input'
     autoload :DateTimeInput,   'simple_form/inputs/date_time_input'
     autoload :HiddenInput,     'simple_form/inputs/hidden_input'

data/lib/simple_form/map_type.rb

@@ -1,13 +1,16 @@
+require 'active_support/core_ext/class/attribute'
+
 module SimpleForm
   module MapType
-    def mappings
-      @mappings ||= {}
+    def self.extended(base)
+      base.class_attribute :mappings
+      base.mappings = {}
     end
 
     def map_type(*types)
-      options = types.extract_options!
-      raise ArgumentError, "You need to give :to as option to map_type" unless options[:to]
-      types.each { |t| mappings[t] = options[:to] }
+      map_to = types.extract_options![:to]
+      raise ArgumentError, "You need to give :to as option to map_type" unless map_to
+      self.mappings = mappings.merge types.each_with_object({}) { |t, m| m[t] = map_to }
     end
   end
-end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.2.0".freeze
+  VERSION = "1.4.0".freeze
 end

data/lib/simple_form.rb

@@ -3,23 +3,49 @@ require 'simple_form/action_view_extensions/form_helper'
 require 'simple_form/action_view_extensions/builder'
 
 module SimpleForm
-  autoload :Components,  'simple_form/components'
-  autoload :FormBuilder, 'simple_form/form_builder'
-  autoload :I18nCache,   'simple_form/i18n_cache'
-  autoload :Inputs,      'simple_form/inputs'
-  autoload :MapType,     'simple_form/map_type'
+  autoload :Components,        'simple_form/components'
+  autoload :ErrorNotification, 'simple_form/error_notification'
+  autoload :FormBuilder,       'simple_form/form_builder'
+  autoload :HasErrors,         'simple_form/has_errors'
+  autoload :I18nCache,         'simple_form/i18n_cache'
+  autoload :Inputs,            'simple_form/inputs'
+  autoload :MapType,           'simple_form/map_type'
 
   # Default tag used on hints.
   mattr_accessor :hint_tag
   @@hint_tag = :span
 
+  # CSS class to add to all hint tags.
+  mattr_accessor :hint_class
+  @@hint_class = :hint
+
   # Default tag used on errors.
   mattr_accessor :error_tag
   @@error_tag = :span
 
+  # CSS class to add to all error tags.
+  mattr_accessor :error_class
+  @@error_class = :error
+
+  # Method used to tidy up errors.
+  mattr_accessor :error_method
+  @@error_method = :first
+
+  # Default tag used for error notification helper.
+  mattr_accessor :error_notification_tag
+  @@error_notification_tag = :p
+
+  # CSS class to add for error notification helper.
+  mattr_accessor :error_notification_class
+  @@error_notification_class = :error_notification
+
+  # ID to add for error notification helper.
+  mattr_accessor :error_notification_id
+  @@error_notification_id = nil
+
   # Components used by the form builder.
   mattr_accessor :components
-  @@components = [ :label, :input, :hint, :error ]
+  @@components = [ :placeholder, :label_input, :hint, :error ]
 
   # Series of attemps to detect a default label method for collection.
   mattr_accessor :collection_label_methods
@@ -29,18 +55,63 @@ module SimpleForm
   mattr_accessor :collection_value_methods
   @@collection_value_methods = [ :id, :to_s ]
 
-  # You can wrap all inputs in a pre-defined tag. By default is nil.
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  mattr_accessor :collection_wrapper_tag
+  @@collection_wrapper_tag = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to none.
+  mattr_accessor :item_wrapper_tag
+  @@item_wrapper_tag = :span
+
+  # You can wrap all inputs in a pre-defined tag. Default is a div.
   mattr_accessor :wrapper_tag
   @@wrapper_tag = :div
 
+  # You can define the class to use on all wrappers. Default is input.
+  mattr_accessor :wrapper_class
+  @@wrapper_class = :input
+
+  # You can define the class to add to the wrapper when the field has errors. Default is field_with_errors.
+  mattr_accessor :wrapper_error_class
+  @@wrapper_error_class = :field_with_errors
+
   # How the label text should be generated altogether with the required text.
   mattr_accessor :label_text
   @@label_text = lambda { |label, required| "#{required} #{label}" }
 
+  # You can define the class to use on all labels. Default is nil.
+  mattr_accessor :label_class
+  @@label_class = nil
+
+  # You can define the class to use on all forms. Default is simple_form.
+  mattr_accessor :form_class
+  @@form_class = :simple_form
+
+  # Whether attributes are required by default (or not).
+  mattr_accessor :required_by_default
+  @@required_by_default = true
+
+  # Tell browsers whether to use default HTML5 validations (novalidate option).
+  mattr_accessor :browser_validations
+  @@browser_validations = true
+
+  # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
+  # (e.g. required) are used or not. True by default.
+  # Having this on in non-HTML5 compliant sites can cause odd behavior in
+  # HTML5-aware browsers such as Chrome.
+  mattr_accessor :html5
+  @@html5 = true
+
   # Collection of methods to detect if a file type was given.
   mattr_accessor :file_methods
   @@file_methods = [ :mounted_as, :file?, :public_filename ]
 
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value, such as { /count/ => :integer }.
+  mattr_accessor :input_mappings
+  @@input_mappings = nil
+
   # Default priority for time_zone inputs.
   mattr_accessor :time_zone_priority
   @@time_zone_priority = nil
@@ -53,7 +124,20 @@ module SimpleForm
   mattr_accessor :default_input_size
   @@default_input_size = 50
 
-  # Default way to setup SimpleForm. Run script/generate simple_form_install
+  # When off, do not use translations in hint, labels and placeholders.
+  # It is a small performance improvement if you are not using such features.
+  mattr_accessor :translate
+  @@translate = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  mattr_accessor :inputs_discovery
+  @@inputs_discovery = true
+
+  # Cache simple form inputs discovery
+  mattr_accessor :cache_discovery
+  @@cache_discovery = !Rails.env.development?
+
+  # Default way to setup SimpleForm. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup
     yield self

data/simple_form.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "simple_form/version"
+
+Gem::Specification.new do |s|
+  s.name        = "simple_form"
+  s.version     = SimpleForm::VERSION.dup
+  s.platform    = Gem::Platform::RUBY
+  s.summary     = "Forms made easy!"
+  s.email       = "contact@plataformatec.com.br"
+  s.homepage    = "http://github.com/plataformatec/simple_form"
+  s.description = "Forms made easy!"
+  s.authors     = ['José Valim', 'Carlos Antônio']
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files   -= Dir["test/support/country_select/**/*"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.rubyforge_project = "simple_form"
+end