actionpack 4.0.0.beta1 → 4.0.0.rc1

data/lib/action_view/helpers/form_helper.rb

@@ -433,7 +433,7 @@ module ActionView
 
         builder = instantiate_builder(object_name, object, options)
         output  = capture(builder, &block)
-        html_options[:multipart] = builder.multipart?
+        html_options[:multipart] ||= builder.multipart?
 
         form_tag(options[:url] || {}, html_options) { output }
       end
@@ -655,14 +655,6 @@ module ActionView
       #     ...
       #   <% end %>
       #
-      # When projects is already an association on Person you can use
-      # +accepts_nested_attributes_for+ to define the writer method for you:
-      #
-      #   class Person < ActiveRecord::Base
-      #     has_many :projects
-      #     accepts_nested_attributes_for :projects
-      #   end
-      #
       # If you want to destroy any of the associated models through the
       # form, you have to enable it first using the <tt>:allow_destroy</tt>
       # option for +accepts_nested_attributes_for+:
@@ -1160,12 +1152,65 @@ module ActionView
         end
     end
 
+    # A +FormBuilder+ object is associated with a particular model object and
+    # allows you to generate fields associated with the model object. The
+    # +FormBuilder+ object is yielded when using +form_for+ or +fields_for+.
+    # For example:
+    #
+    #   <%= form_for @person do |person_form| %>
+    #     Name: <%= person_form.text_field :name %>
+    #     Admin: <%= person_form.check_box :admin %>
+    #   <% end %>
+    #
+    # In the above block, the a +FormBuilder+ object is yielded as the
+    # +person_form+ variable. This allows you to generate the +text_field+
+    # and +check_box+ fields by specifying their eponymous methods, which
+    # modify the underlying template and associates the +@person+ model object
+    # with the form.
+    #
+    # The +FormBuilder+ object can be thought of as serving as a proxy for the
+    # methods in the +FormHelper+ module. This class, however, allows you to
+    # call methods with the model object you are building the form for.
+    #
+    # You can create your own custom FormBuilder templates by subclasses this
+    # class. For example:
+    #
+    #   class MyFormBuilder < ActionView::Helpers::FormBuilder
+    #     def div_radio_button(method, tag_value, options = {})
+    #       @template.content_tag(:div,
+    #         @template.radio_button(
+    #           @object_name, method, tag_value, objectify_options(options)
+    #         )
+    #       )
+    #     end
+    #
+    # The above code creates a new method +div_radio_button+ which wraps a div
+    # around the a new radio button. Note that when options are passed in, you
+    # must called +objectify_options+ in order for the model object to get
+    # correctly passed to the method. If +objectify_options+ is not called,
+    # then the newly created helper will not be linked back to the model.
+    #
+    # The +div_radio_button+ code from above can now be used as follows:
+    #
+    #   <%= form_for @person, :builder => MyFormBuilder do |f| %>
+    #     I am a child: <%= f.div_radio_button(:admin, "child") %>
+    #     I am an adult: <%= f.div_radio_button(:admin, "adult") %>
+    #   <% end -%>
+    #
+    # The standard set of helper methods for form building are located in the
+    # +field_helpers+ class attribute.
     class FormBuilder
       include ModelNaming
 
       # The methods which wrap a form helper call.
       class_attribute :field_helpers
-      self.field_helpers = FormHelper.instance_methods - [:form_for, :convert_to_model, :model_name_from_record_or_class]
+      self.field_helpers = [:fields_for, :label, :text_field, :password_field,
+                            :hidden_field, :file_field, :text_area, :check_box,
+                            :radio_button, :color_field, :search_field,
+                            :telephone_field, :phone_field, :date_field,
+                            :time_field, :datetime_field, :datetime_local_field,
+                            :month_field, :week_field, :url_field, :email_field,
+                            :number_field, :range_field]
 
       attr_accessor :object_name, :object, :options
 
@@ -1247,7 +1292,7 @@ module ActionView
       #       Admin?  : <%= permission_fields.check_box :admin %>
       #     <% end %>
       #
-      #     <%= f.submit %>
+      #     <%= person_form.submit %>
       #   <% end %>
       #
       # In this case, the checkbox field will be represented by an HTML +input+
@@ -1425,14 +1470,6 @@ module ActionView
       #     ...
       #   <% end %>
       #
-      # When projects is already an association on Person you can use
-      # +accepts_nested_attributes_for+ to define the writer method for you:
-      #
-      #   class Person < ActiveRecord::Base
-      #     has_many :projects
-      #     accepts_nested_attributes_for :projects
-      #   end
-      #
       # If you want to destroy any of the associated models through the
       # form, you have to enable it first using the <tt>:allow_destroy</tt>
       # option for +accepts_nested_attributes_for+:

data/lib/action_view/helpers/form_options_helper.rb

@@ -380,7 +380,7 @@ module ActionView
       # should produce the desired results.
       def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
         options = collection.map do |element|
-          [value_for_collection(element, text_method), value_for_collection(element, value_method)]
+          [value_for_collection(element, text_method), value_for_collection(element, value_method), option_html_attributes(element)]
         end
         selected, disabled = extract_selected_and_disabled(selected)
         select_deselect = {
@@ -565,7 +565,7 @@ module ActionView
 
         if priority_zones
           if priority_zones.is_a?(Regexp)
-            priority_zones = zones.grep(priority_zones)
+            priority_zones = zones.select { |z| z =~ priority_zones }
           end
 
           zone_options.safe_concat options_for_select(convert_zones[priority_zones], selected)
@@ -752,7 +752,7 @@ module ActionView
         end
 
         def prompt_text(prompt)
-          prompt = prompt.kind_of?(String) ? prompt : I18n.translate('helpers.select.prompt', :default => 'Please select')
+          prompt.kind_of?(String) ? prompt : I18n.translate('helpers.select.prompt', :default => 'Please select')
         end
     end
 

data/lib/action_view/helpers/form_tag_helper.rb

@@ -778,7 +778,7 @@ module ActionView
 
         # see http://www.w3.org/TR/html4/types.html#type-name
         def sanitize_to_id(name)
-          name.to_s.gsub(']','').gsub(/[^-a-zA-Z0-9:.]/, "_")
+          name.to_s.delete(']').gsub(/[^-a-zA-Z0-9:.]/, "_")
         end
     end
   end

data/lib/action_view/helpers/javascript_helper.rb

@@ -81,7 +81,7 @@ module ActionView
       #   # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
       #
       def button_to_function(name, function=nil, html_options={})
-        message = "button_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
+        message = "button_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
           "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
         ActiveSupport::Deprecation.warn message
 
@@ -103,7 +103,7 @@ module ActionView
       #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
       #
       def link_to_function(name, function, html_options={})
-        message = "link_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
+        message = "link_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
           "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
         ActiveSupport::Deprecation.warn message
 

data/lib/action_view/helpers/number_helper.rb

@@ -28,6 +28,8 @@ module ActionView
       # Formats a +number+ into a US phone number (e.g., (555)
       # 123-9876). You can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:area_code</tt> - Adds parentheses around the area code.
       # * <tt>:delimiter</tt> - Specifies the delimiter to use
       #   (defaults to "-").
@@ -38,6 +40,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_phone(5551234)                                           # => 555-1234
       #   number_to_phone("5551234")                                         # => 555-1234
       #   number_to_phone(1235551234)                                        # => 123-555-1234
@@ -61,6 +65,8 @@ module ActionView
       # Formats a +number+ into a currency string (e.g., $13.65). You
       # can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the level of precision (defaults
@@ -82,6 +88,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_currency(1234567890.50)                    # => $1,234,567,890.50
       #   number_to_currency(1234567890.506)                   # => $1,234,567,890.51
       #   number_to_currency(1234567890.506, precision: 3)     # => $1,234,567,890.506
@@ -108,6 +116,7 @@ module ActionView
       # Formats a +number+ as a percentage string (e.g., 65%). You can
       # customize the format in the +options+ hash.
       #
+      # ==== Options
       #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
@@ -128,6 +137,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_percentage(100)                                        # => 100.000%
       #   number_to_percentage("98")                                       # => 98.000%
       #   number_to_percentage(100, precision: 0)                          # => 100%
@@ -151,6 +162,8 @@ module ActionView
       # (e.g., 12,324). You can customize the format in the +options+
       # hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
@@ -160,6 +173,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_with_delimiter(12345678)                        # => 12,345,678
       #   number_with_delimiter("123456")                        # => 123,456
       #   number_with_delimiter(12345678.05)                     # => 12,345,678.05
@@ -185,6 +200,8 @@ module ActionView
       # +:significant+ is +false+, and 5 if +:significant+ is +true+).
       # You can customize the format in the +options+ hash.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -202,6 +219,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_with_precision(111.2345)                                         # => 111.235
       #   number_with_precision(111.2345, precision: 2)                           # => 111.23
       #   number_with_precision(13, precision: 5)                                 # => 13.00000
@@ -233,6 +252,8 @@ module ActionView
       # See <tt>number_to_human</tt> if you want to pretty-print a
       # generic number.
       #
+      # ==== Options
+      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -252,6 +273,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_human_size(123)                                          # => 123 Bytes
       #   number_to_human_size(1234)                                         # => 1.21 KB
       #   number_to_human_size(12345)                                        # => 12.1 KB
@@ -324,6 +347,8 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
+      # ==== Examples
+      #
       #   number_to_human(123)                                          # => "123"
       #   number_to_human(1234)                                         # => "1.23 Thousand"
       #   number_to_human(12345)                                        # => "12.3 Thousand"

data/lib/action_view/helpers/tags/base.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Base #:nodoc:
+    module Tags # :nodoc:
+      class Base # :nodoc:
         include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
         include FormOptionsHelper
 
@@ -73,27 +73,26 @@ module ActionView
 
         def add_default_name_and_id(options)
           if options.has_key?("index")
-            options["name"] ||= options.fetch("name"){ tag_name_with_index(options["index"]) }
+            options["name"] ||= options.fetch("name"){ tag_name_with_index(options["index"], options["multiple"]) }
             options["id"] = options.fetch("id"){ tag_id_with_index(options["index"]) }
             options.delete("index")
           elsif defined?(@auto_index)
-            options["name"] ||= options.fetch("name"){ tag_name_with_index(@auto_index) }
+            options["name"] ||= options.fetch("name"){ tag_name_with_index(@auto_index, options["multiple"]) }
             options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
           else
-            options["name"] ||= options.fetch("name"){ tag_name }
+            options["name"] ||= options.fetch("name"){ tag_name(options["multiple"]) }
             options["id"] = options.fetch("id"){ tag_id }
           end
 
-          options["name"] += "[]" if options["multiple"]
           options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
         end
 
-        def tag_name
-          "#{@object_name}[#{sanitized_method_name}]"
+        def tag_name(multiple = false)
+          "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
         end
 
-        def tag_name_with_index(index)
-          "#{@object_name}[#{index}][#{sanitized_method_name}]"
+        def tag_name_with_index(index, multiple = false)
+          "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
         end
 
         def tag_id

data/lib/action_view/helpers/tags/check_box.rb

@@ -2,7 +2,7 @@ require 'action_view/helpers/tags/checkable'
 
 module ActionView
   module Helpers
-    module Tags
+    module Tags # :nodoc:
       class CheckBox < Base #:nodoc:
         include Checkable
 

data/lib/action_view/helpers/tags/checkable.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      module Checkable
+    module Tags # :nodoc:
+      module Checkable # :nodoc:
         def input_checked?(object, options)
           if options.has_key?("checked")
             checked = options.delete "checked"

data/lib/action_view/helpers/tags/collection_check_boxes.rb

@@ -2,11 +2,11 @@ require 'action_view/helpers/tags/collection_helpers'
 
 module ActionView
   module Helpers
-    module Tags
-      class CollectionCheckBoxes < Base
+    module Tags # :nodoc:
+      class CollectionCheckBoxes < Base # :nodoc:
         include CollectionHelpers
 
-        class CheckBoxBuilder < Builder
+        class CheckBoxBuilder < Builder # :nodoc:
           def check_box(extra_html_options={})
             html_options = extra_html_options.merge(@input_html_options)
             @template_object.check_box(@object_name, @method_name, html_options, @value, nil)

data/lib/action_view/helpers/tags/collection_helpers.rb

@@ -1,8 +1,8 @@
 module ActionView
   module Helpers
-    module Tags
-      module CollectionHelpers
-        class Builder
+    module Tags # :nodoc:
+      module CollectionHelpers # :nodoc:
+        class Builder # :nodoc:
           attr_reader :object, :text, :value
 
           def initialize(template_object, object_name, method_name, object,

data/lib/action_view/helpers/tags/collection_radio_buttons.rb

@@ -2,11 +2,11 @@ require 'action_view/helpers/tags/collection_helpers'
 
 module ActionView
   module Helpers
-    module Tags
-      class CollectionRadioButtons < Base
+    module Tags # :nodoc:
+      class CollectionRadioButtons < Base # :nodoc:
         include CollectionHelpers
 
-        class RadioButtonBuilder < Builder
+        class RadioButtonBuilder < Builder # :nodoc:
           def radio_button(extra_html_options={})
             html_options = extra_html_options.merge(@input_html_options)
             @template_object.radio_button(@object_name, @method_name, @value, html_options)

data/lib/action_view/helpers/tags/collection_select.rb

@@ -1,6 +1,6 @@
 module ActionView
   module Helpers
-    module Tags
+    module Tags # :nodoc:
       class CollectionSelect < Base #:nodoc:
         def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
           @collection   = collection

data/lib/action_view/helpers/tags/color_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class ColorField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class ColorField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
           options["value"] = @options.fetch("value") { validate_color_string(value(object)) }

data/lib/action_view/helpers/tags/date_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DateField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class DateField < DatetimeField # :nodoc:
         private
 
           def format_date(value)

data/lib/action_view/helpers/tags/date_select.rb

@@ -2,8 +2,8 @@ require 'active_support/core_ext/time/calculations'
 
 module ActionView
   module Helpers
-    module Tags
-      class DateSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class DateSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, options, html_options)
           @html_options = html_options
 

data/lib/action_view/helpers/tags/datetime_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
           options["value"] = @options.fetch("value") { format_date(value(object)) }

data/lib/action_view/helpers/tags/datetime_local_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeLocalField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeLocalField < DatetimeField # :nodoc:
         class << self
           def field_type
             @field_type ||= "datetime-local"