formtastic 2.0.2 → 2.1.0.beta1

data/lib/formtastic/inputs/base/timeish.rb

@@ -78,9 +78,9 @@ module Formtastic
       # @example Include seconds with times (excluded by default)
       #   <%= f.input :publish_at, :as => :time, :include_seconds => true %>
       #
-      # @example Specify if there should be a blank option at the start of each select or not
-      #   <%= f.input :publish_at, :as => :time, :include_blank=> true %>
-      #   <%= f.input :publish_at, :as => :time, :include_blank=> false %>
+      # @example Specify if there should be a blank option at the start of each select or not. Note that, unlike select inputs, :include_blank does not accept a string value.
+      #   <%= f.input :publish_at, :as => :time, :include_blank => true %>
+      #   <%= f.input :publish_at, :as => :time, :include_blank => false %>
       #
       # @todo Document i18n
       # @todo Check what other Rails options are supported (`start_year`, `end_year`, `use_month_numbers`, `use_short_month`, `add_month_numbers`, `prompt`), write tests for them, and otherwise support them
@@ -156,10 +156,18 @@ module Formtastic
         end
         
         def fragment_input_html(fragment)
-          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
           template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
         end
         
+        def fragment_prefix
+          if builder.options.key?(:index)
+            object_name + "[#{builder.options[:index]}]"
+          else
+            object_name
+          end
+        end
+        
         # TODO extract to BlankOptions or similar -- Select uses similar code
         def include_blank?
           options.key?(:include_blank) ? options[:include_blank] : builder.include_blank_for_select_by_default
@@ -193,7 +201,7 @@ module Formtastic
         def fragments_label
           if render_label?
             template.content_tag(:legend, 
-              builder.label(method, label_text, :for => "#{input_html_options[:id]}_1i"), 
+              builder.label(method, label_text, :for => fragment_id(fragments.first)), 
               :class => "label"
             )
           else
@@ -211,6 +219,14 @@ module Formtastic
           "".html_safe
         end
         
+        def hidden_field_name(fragment)
+          if builder.options.key?(:index)
+            "#{object_name}[#{builder.options[:index]}][#{fragment_name(fragment)}]"
+          else
+            "#{object_name}[#{fragment_name(fragment)}]"
+          end
+        end
+        
       end
     end
   end

data/lib/formtastic/inputs/base/validations.rb

@@ -108,7 +108,7 @@ module Formtastic
             validation.kind == :numericality
           end
           if validation
-            validation.options[:step]
+            validation.options[:step] || (1 if validation_integer_only?)
           else
             nil
           end

data/lib/formtastic/inputs/base/wrapping.rb

@@ -14,9 +14,16 @@ module Formtastic
         end
         
         def wrapper_html_options
-          opts = options[:wrapper_html] || {}
-          opts[:class] ||= []
-          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
+          opts = (options[:wrapper_html] || {}).dup
+          opts[:class] =
+            case opts[:class]
+            when Array
+              opts[:class].dup
+            when nil
+              []
+            else
+              [opts[:class].to_s]
+            end
           opts[:class] << as
           opts[:class] << "input"
           opts[:class] << "error" if errors?

data/lib/formtastic/inputs/boolean_input.rb

@@ -28,7 +28,7 @@ module Formtastic
     # @example Set the values for the checked and unchecked states
     #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class BooleanInput
       include Base
 
@@ -84,7 +84,15 @@ module Formtastic
       end
 
       def input_html_options
-        {:name => "#{object_name}[#{method}]"}.merge(super)
+        {:name => input_html_options_name}.merge(super)
+      end
+      
+      def input_html_options_name
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{method}]"
+        else
+          "#{object_name}[#{method}]"
+        end
       end
 
       def checked?

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -73,7 +73,7 @@ module Formtastic
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
     #
     # @todo Do/can we support the per-item HTML options like RadioInput?
@@ -152,13 +152,7 @@ module Formtastic
       end
 
       def selected_values
-        if object.respond_to?(method)
-          selected_items = [object.send(method)].compact.flatten
-
-          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
-        else
-          []
-        end
+        @selected_values ||= make_selected_values
       end
 
       def disabled_values
@@ -172,9 +166,24 @@ module Formtastic
       end
 
       def input_name
-        "#{object_name}[#{association_primary_key || method}][]"
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{association_primary_key || method}][]"
+        else
+          "#{object_name}[#{association_primary_key || method}][]"
+        end
       end
 
+      protected
+
+      def make_selected_values
+        if object.respond_to?(method)
+          selected_items = [object.send(method)].compact.flatten
+
+          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/formtastic/inputs/country_input.rb

@@ -8,7 +8,7 @@ module Formtastic
     # * install any other country_select plugin that behaves in a similar way
     # * roll your own `country_select` helper with the same args and options as the Rails one
     #
-    # By default, Formtastic includes a handfull of English-speaking countries as "priority
+    # By default, Formtastic includes a handful of English-speaking countries as "priority
     # counties", which can be set in the `priority_countries` configuration array in the
     # formtastic.rb initializer to suit your market and user base (see README for more info on
     # configuration). Additionally, it is possible to set the :priority_countries on a per-input
@@ -45,7 +45,7 @@ module Formtastic
     #       # ...
     #   </li>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class CountryInput 
       include Base
 

data/lib/formtastic/inputs/date_input.rb

@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     # Outputs a series of select boxes for the fragments that make up a date (year, month, day).
     #
-    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
+    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
     class DateInput 
       include Base
       include Base::Timeish
@@ -11,6 +11,24 @@ module Formtastic
       def time_fragments
         []
       end
+      
+      def hidden_date_fragments
+        default_date_fragments - date_fragments
+      end
+
+      def hidden_fragments
+        hidden_date_fragments.map do |fragment|
+          template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
+        end.join.html_safe
+      end
+
+      def fragment_value(fragment)
+        if fragment == :year
+          Time.now.year
+        else
+          '1'
+        end
+      end      
     end
   end
 end

data/lib/formtastic/inputs/datetime_input.rb

@@ -3,7 +3,7 @@ module Formtastic
 
     # Outputs a series of select boxes for the fragments that make up a date and time (year, month, day, hour, minute, second).
     #
-    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
+    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
     class DatetimeInput 
       include Base
       include Base::Timeish

data/lib/formtastic/inputs/email_input.rb

@@ -24,10 +24,11 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class EmailInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
       
       def to_html
         input_wrapping do

data/lib/formtastic/inputs/file_input.rb

@@ -28,7 +28,7 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class FileInput 
       include Base
       def to_html

data/lib/formtastic/inputs/hidden_input.rb

@@ -27,7 +27,7 @@ module Formtastic
     #
     #   form.formtastic li.hidden { display:none; }
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class HiddenInput 
       include Base
       

data/lib/formtastic/inputs/number_input.rb

@@ -65,11 +65,12 @@ module Formtastic
     #  <%= f.input :shoe_size, :as => :number, :in => 3..15, :step => 1 %>
     #  <%= f.input :shoe_size, :as => :number, :input_html => { :in => 3..15, :step => 1 } %>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
     class NumberInput 
       include Base
-      include Base::Stringish
+      include Base::Numeric
+      include Base::Placeholder
       
       def to_html
         input_wrapping do
@@ -77,42 +78,11 @@ module Formtastic
           builder.number_field(method, input_html_options)
         end
       end
-      
-      def input_html_options
-        defaults = super
-        
-        if in_option
-          defaults[:min] = in_option.to_a.min
-          defaults[:max] = in_option.to_a.max
-        else
-          defaults[:min]  ||= min_option
-          defaults[:max]  ||= max_option
-        end
-        defaults[:step] ||= step_option
-        defaults
-      end
-      
+
       def step_option
-        return options[:step] if options.key?(:step)
-        return validation_step if validation_step
-        return 1 if validation_integer_only?
-        "any"
-      end
-      
-      def min_option
-        return options[:min] if options.key?(:min)
-        validation_min
+        super || "any"
       end
-      
-      def max_option
-        return options[:max] if options.key?(:max)
-        validation_max
-      end
-      
-      def in_option
-        options[:in]
-      end
-      
+
     end
   end
 end

data/lib/formtastic/inputs/password_input.rb

@@ -24,10 +24,11 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class PasswordInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
       
       def to_html
         input_wrapping do

data/lib/formtastic/inputs/phone_input.rb

@@ -18,16 +18,17 @@ module Formtastic
     #       <ol>
     #         <li class="phone">
     #           <label for="user_mobile">Mobile</label>
-    #           <input type="phone" id="user_mobile" name="user[mobile]">
+    #           <input type="tel" id="user_mobile" name="user[mobile]">
     #         </li>
     #       </ol>
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class PhoneInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
       
       def to_html
         input_wrapping do

data/lib/formtastic/inputs/radio_input.rb

@@ -114,7 +114,7 @@ module Formtastic
     # @example Set HTML options on a specific radio input option with a 3rd element in the array for a collection member
     #   <%= f.input :author, :as => :radio, :collection => [["Test", 'test'], ["Try", "try", {:disabled => true}]]
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see Formtastic::Inputs::RadioInput as an alternative for `belongs_to` associations
     #
     # @todo :disabled like CheckBoxes?

data/lib/formtastic/inputs/range_input.rb

@@ -64,13 +64,12 @@ module Formtastic
     #  <%= f.input :shoe_size, :as => :range, :in => 3..15, :step => 1 %>
     #  <%= f.input :shoe_size, :as => :range, :input_html => { :in => 3..15, :step => 1 } %>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
     #
-    # @todo Is it still correct for this to be Stringish?
     class RangeInput
       include Base
-      include Base::Stringish
+      include Base::Numeric
 
       def to_html
         input_wrapping do
@@ -78,40 +77,17 @@ module Formtastic
           builder.range_field(method, input_html_options)
         end
       end
-      
-      def input_html_options
-        defaults = super
-        
-        if in_option
-          defaults[:min] = in_option.to_a.min
-          defaults[:max] = in_option.to_a.max
-        else
-          defaults[:min]  ||= min_option
-          defaults[:max]  ||= max_option
-        end
-        defaults[:step] ||= step_option
-        defaults
-      end
-      
-      def step_option
-        return options[:step] if options.key?(:step)
-        return validation_step if validation_step
-        return 1 if validation_integer_only?
-        1
-      end
-      
+
       def min_option
-        return options[:min] if options.key?(:min)
-        validation_min || 1
+        super || 1
       end
       
       def max_option
-        return options[:max] if options.key?(:max)
-        validation_max || 100
+        super || 100
       end
-      
-      def in_option
-        options[:in]
+
+      def step_option
+        super || 1
       end
       
     end

data/lib/formtastic/inputs/search_input.rb

@@ -23,10 +23,11 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class SearchInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
       
       def to_html
         input_wrapping do

data/lib/formtastic/inputs/select_input.rb

@@ -108,12 +108,12 @@ module Formtastic
     #
     # @example The `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :author, :as => :select, :member_label => :name %>
-    #   <%= f.input :author, :as => :select, :member_label => :name_with_post_count
-    #   <%= f.input :author, :as => :select, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    #   <%= f.input :author, :as => :select, :member_label => :name_with_post_count %>
+    #   <%= f.input :author, :as => :select, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" } %>
     #
     # @example The `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :author, :as => :select, :member_value => :login %>
-    #   <%= f.input :author, :as => :select, :member_value => Proc.new { |c| c.full_name.downcase.underscore }
+    #   <%= f.input :author, :as => :select, :member_value => Proc.new { |c| c.full_name.downcase.underscore } %>
     #
     # @example Set HTML attributes on the `<select>` tag with `:input_html`
     #   <%= f.input :authors, :as => :select, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
@@ -121,15 +121,21 @@ module Formtastic
     # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
     #   <%= f.input :authors, :as => :select, :wrapper_html => { :class => "special" } %>
     #
-    # @example Exclude or include the blank option at the top of the select, or change the prompt
-    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => false } %>
-    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => true } %>
-    #   <%= f.input :author, :as => :select, :input_html => { :prompt => "Please select an Author..." } %>
+    # @example Exclude, include, or customize the blank option at the top of the select. Always shown, even if the field already has a value. Suitable for optional inputs.
+    #   <%= f.input :author, :as => :select, :include_blank => false %>
+    #   <%= f.input :author, :as => :select, :include_blank => true %>   =>   <option value=""></option>
+    #   <%= f.input :author, :as => :select, :include_blank => "No author" %>
+    #
+    # @example Exclude, include, or customize the prompt at the top of the select. Only shown if the field does not have a value. Suitable for required inputs.
+    #   <%= f.input :author, :as => :select, :prompt => false %>
+    #   <%= f.input :author, :as => :select, :prompt => true %>   =>   <option value="">Please select</option>
+    #   <%= f.input :author, :as => :select, :prompt => "Please select an author" %>
+    #
     #
     # @example Group options an `<optgroup>` with the `:group_by` and `:group_label` options (`belongs_to` associations only)
     #   <%= f.input :author, :as => :select, :group_by => :continent %>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
     #
@@ -138,46 +144,56 @@ module Formtastic
       include Base
       include Base::Collections
       include Base::GroupedCollections
-      
+
       def to_html
         input_wrapping do
+          hidden_input <<
           label_html <<
           (options[:group_by] ? grouped_select_html : select_html)
         end
       end
-      
+
       def select_html
         builder.select(input_name, collection, input_options, input_html_options)
       end
-      
+
       def grouped_select_html
         builder.grouped_collection_select(
-          input_name, 
+          input_name,
           grouped_collection,
-          group_association, 
+          group_association,
           group_label_method,
-          value_method, 
+          value_method,
           label_method,
-          input_options, 
+          input_options,
           input_html_options
         )
       end
+
+      def include_blank
+        options.key?(:include_blank) ? options[:include_blank] : (single? && builder.include_blank_for_select_by_default)
+      end
       
-      def include_blank?
-        return options[:prompt] if options.key?(:prompt)
-        return options[:include_blank] if options.key?(:include_blank)
-        return true if (single? && builder.include_blank_for_select_by_default)
-        false
+      def hidden_input
+        if multiple?
+          template.hidden_field_tag(input_html_options_name_multiple, '', :id => nil)
+        else
+          "".html_safe
+        end
+      end
+
+      def prompt?
+        !!options[:prompt]
       end
 
       def label_html_options
         super.merge(:for => input_html_options[:id])
       end
-      
+
       def input_options
-        super.merge({:include_blank => include_blank?, :prompt => nil})
+        super.merge :include_blank => (include_blank unless prompt?)
       end
-      
+
       def input_html_options
         extra_input_html_options.merge(super)
       end
@@ -185,22 +201,34 @@ module Formtastic
       def extra_input_html_options
         {
           :multiple => multiple?,
-          :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
+          :name => multiple? ? input_html_options_name_multiple : input_html_options_name
         }
       end
       
+      def input_html_options_name
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{association_primary_key}]"
+        else
+          "#{object_name}[#{association_primary_key}]"
+        end
+      end
+
+      def input_html_options_name_multiple
+        input_html_options_name + "[]"
+      end
+
       def multiple_by_association?
         reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
       end
-      
+
       def multiple_by_options?
         options[:multiple] || (options[:input_html] && options[:input_html][:multiple])
       end
-      
+
       def multiple?
-        multiple_by_options? || multiple_by_association? 
+        multiple_by_options? || multiple_by_association?
       end
-      
+
       def single?
         !multiple?
       end