simple_form 1.2.0 → 1.2.1

data/lib/simple_form/components/hints.rb

@@ -14,7 +14,7 @@ module SimpleForm
       end
 
       def hint_html_options
-        html_options_for(:hint, :hint)
+        html_options_for(:hint, [:hint])
       end
     end
   end

data/lib/simple_form/components/label_input.rb

@@ -0,0 +1,13 @@
+module SimpleForm
+  module Components
+    module LabelInput
+      def self.included(base)
+        base.send :include, SimpleForm::Components::Labels
+      end
+
+      def label_input
+        (options[:label] == false ? "" : label) + input
+      end
+    end
+  end
+end

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])
         label_options[:for] = options[:input_html][:id] if options.key?(:input_html)
         label_options
       end

data/lib/simple_form/components/wrapper.rb

@@ -13,9 +13,19 @@ module SimpleForm
         options[:wrapper_tag] || SimpleForm.wrapper_tag
       end
 
+      def wrapper_class
+        options[:wrapper_class] || SimpleForm.wrapper_class
+      end
+
+      def wrapper_error_class
+        options[:wrapper_error_class] || SimpleForm.wrapper_error_class
+      end
+
       def wrapper_html_options
-        html_options_for(:wrapper, "input", input_type, required_class)
+        css_classes = input_html_classes.unshift(wrapper_class)
+        css_classes << wrapper_error_class if has_errors?
+        html_options_for(:wrapper, css_classes)
       end
     end
   end
-end
+end

data/lib/simple_form/error_notification.rb

@@ -0,0 +1,44 @@
+module SimpleForm
+  class ErrorNotification
+    delegate :object, :object_name, :template, :to => :@builder
+
+    def initialize(builder, options)
+      @builder = builder
+      @message = options.delete(:message)
+      @options = options
+    end
+
+    def render
+      if has_errors?
+        template.content_tag(error_notification_tag, error_message, html_options)
+      end
+    end
+
+    protected
+
+    def error_message
+      @message || translate_error_notification
+    end
+
+    def error_notification_tag
+      SimpleForm.error_notification_tag
+    end
+
+    def has_errors?
+      object && object.respond_to?(:errors) && object.errors.present?
+    end
+
+    def html_options
+      @options[:class] = "error_notification #{@options[:class]}".strip
+      @options
+    end
+
+    def translate_error_notification
+      lookups = []
+      lookups << :"#{object_name}"
+      lookups << :default_message
+      lookups << "Some errors were found, please take a look:"
+      I18n.t(lookups.shift, :scope => :"simple_form.error_notification", :default => lookups)
+    end
+  end
+end

data/lib/simple_form/form_builder.rb

@@ -6,12 +6,13 @@ module SimpleForm
     extend MapType
     include SimpleForm::Inputs
 
-    map_type :boolean, :password, :text, :file,   :to => SimpleForm::Inputs::MappingInput
+    map_type :password, :text, :file,             :to => SimpleForm::Inputs::MappingInput
     map_type :string, :email, :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
 
     # Basic input helper, combines all components in the stack to generate
     # input html based on options the user define and some guesses through
@@ -215,6 +216,21 @@ module SimpleForm
       SimpleForm::Inputs::Base.new(self).label
     end
 
+    # Creates an error notification message that only appears when the form object
+    # has some error. You can give a specific message with the :message option,
+    # otherwise it will look for a message using I18n. All other options given are
+    # passed straight as html options to the html tag.
+    #
+    # == Examples
+    #
+    #    f.error_notification
+    #    f.error_notification :message => 'Something went wrong'
+    #    f.error_notification :id => 'user_error_message', :class => 'form_error'
+    #
+    def error_notification(options={})
+      SimpleForm::ErrorNotification.new(self, options).render
+    end
+
   private
 
     # Setup default simple form attributes.

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/inputs/base.rb

@@ -11,7 +11,7 @@ module SimpleForm
 
       include SimpleForm::Components::Errors
       include SimpleForm::Components::Hints
-      include SimpleForm::Components::Labels
+      include SimpleForm::Components::LabelInput
       include SimpleForm::Components::Wrapper
 
       delegate :template, :object, :object_name, :attribute_name, :column,
@@ -30,16 +30,20 @@ module SimpleForm
       end
 
       def input_html_options
-        html_options_for(:input, input_type, required_class)
+        html_options_for(:input, input_html_classes)
+      end
+
+      def input_html_classes
+        [input_type, required_class]
       end
 
       def render
-        content = components_list.map do |component|
+        content = "".html_safe
+        components_list.each do |component|
           next if options[component] == false
-          send(component)
+          content.safe_concat send(component).to_s
         end
-        content.compact!
-        wrap(content.join.html_safe)
+        wrap(content)
       end
 
     protected
@@ -51,13 +55,17 @@ module SimpleForm
       def attribute_required?
         if options.key?(:required)
           options[:required]
-        elsif defined?(object.class.validators_on)
+        elsif object.class.respond_to?(:validators_on)
           object.class.validators_on(attribute_name).any? { |v| v.kind == :presence }
         else
-          true
+          attribute_required_by_default?
         end
       end
 
+      def attribute_required_by_default?
+        SimpleForm.required_by_default
+      end
+
       def required_class
         attribute_required? ? :required : :optional
       end
@@ -68,7 +76,7 @@ module SimpleForm
       end
 
       # Retrieve options for the given namespace from the options hash
-      def html_options_for(namespace, *extra)
+      def html_options_for(namespace, extra)
         html_options = options[:"#{namespace}_html"] || {}
         html_options[:class] = (extra << html_options[:class]).join(' ').strip if extra.present?
         html_options

data/lib/simple_form/inputs/boolean_input.rb

@@ -0,0 +1,22 @@
+module SimpleForm
+  module Inputs
+    class BooleanInput < Base
+      def input
+        @builder.check_box(attribute_name, input_html_options)
+      end
+
+      def label_input
+        input + (options[:label] == false ? "" : label)
+      end
+
+    protected
+
+      # Booleans are not required by default because in most of the cases
+      # it makes no sense marking them as required. The only exception is
+      # Terms of Use usually presented at most sites sign up screen.
+      def attribute_required_by_default?
+        false
+      end
+    end
+  end
+end

data/lib/simple_form/inputs/collection_input.rb

@@ -42,12 +42,12 @@ module SimpleForm
         sample = collection.first || collection.last
 
         case sample
-          when Array
-            label, value = :first, :last
-          when Integer
-            label, value = :to_s, :to_i
-          when String, NilClass
-            label, value = :to_s, :to_s
+        when Array
+          label, value = :first, :last
+        when Integer
+          label, value = :to_s, :to_i
+        when String, NilClass
+          label, value = :to_s, :to_s
         end
 
         options[:label_method] ||= label || SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) }

data/lib/simple_form/inputs/date_time_input.rb

@@ -7,10 +7,10 @@ module SimpleForm
 
       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

data/lib/simple_form/inputs/mapping_input.rb

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

data/lib/simple_form/inputs/numeric_input.rb

@@ -7,10 +7,14 @@ module SimpleForm
 
       def input_html_options
         input_options = super
-        input_options[:class]  = "numeric #{input_options[:class]}"
+        input_options[:type] ||= "number"
         input_options[:size] ||= SimpleForm.default_input_size
         input_options
       end
+
+      def input_html_classes
+        super.unshift("numeric")
+      end
     end
   end
 end

data/lib/simple_form/inputs/string_input.rb

@@ -9,15 +9,14 @@ module SimpleForm
         input_options = super
         input_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
         input_options[:maxlength] ||= limit if limit
-
-        unless input_type == :string
-          input_options[:type] ||= input_type
-          input_options[:class]  = "string #{input_options[:class]}"
-        end
-
+        input_options[:type]      ||= input_type unless input_type == :string
         input_options
       end
 
+      def input_html_classes
+        input_type == :string ? super : super.unshift("string")
+      end
+
     protected
 
       def limit

data/lib/simple_form/version.rb

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

data/test/action_view_extensions/builder_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class BuilderTest < ActionView::TestCase
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, [true, false], :to_s, :to_s
     end)
 
@@ -12,7 +12,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test 'collection radio accepts a collection and generate inputs from label method' do
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, [true, false], :to_s, :to_s
     end)
 
@@ -21,7 +21,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test 'collection radio accepts checked item' do
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, :checked => true
     end)
 
@@ -31,7 +31,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, collection, :last, :first, :disabled => [true, false]
     end)
 
@@ -42,7 +42,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, collection, :last, :first, :disabled => true
     end)
 
@@ -51,7 +51,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test 'collection radio accepts html options as input' do
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, {}, :class => 'radio'
     end)
 
@@ -62,7 +62,7 @@ class BuilderTest < ActionView::TestCase
   # COLLECTION CHECK BOX
   test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :id, :name
     end)
 
@@ -73,7 +73,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :id, :name
     end)
 
@@ -83,7 +83,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => [1, 3]
     end)
 
@@ -94,7 +94,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a single checked value' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => 3
     end)
 
@@ -105,7 +105,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => [1, 3]
     end)
 
@@ -116,7 +116,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts single disable item' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => 1
     end)
 
@@ -127,7 +127,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a proc to disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
     end)
 
@@ -138,7 +138,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts html options' do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    concat(form_for @user do |f|
+    concat(form_for(@user) do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, {}, :class => 'check'
     end)
 
@@ -148,8 +148,8 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box with fields for' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for @user do |f|
-      concat(f.fields_for :post do |p|
+    concat(form_for(@user) do |f|
+      concat(f.fields_for(:post) do |p|
         concat p.collection_check_boxes :tag_ids, collection, :id, :name
       end)
     end)
@@ -163,8 +163,8 @@ class BuilderTest < ActionView::TestCase
 
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
-    concat(form_for @user do |f|
-      concat(f.simple_fields_for :posts do |posts_form|
+    concat(form_for(@user) do |f|
+      concat(f.simple_fields_for(:posts) do |posts_form|
         assert posts_form.instance_of?(SimpleForm::FormBuilder)
       end)
     end)