actionview 4.2.11.3 → 5.0.0.beta1

data/lib/action_view/helpers/record_tag_helper.rb

@@ -1,108 +1,21 @@
-require 'action_view/record_identifier'
-
 module ActionView
-  # = Action View Record Tag Helpers
   module Helpers
     module RecordTagHelper
-      include ActionView::RecordIdentifier
-
-      # Produces a wrapper DIV element with id and class parameters that
-      # relate to the specified Active Record object. Usage example:
-      #
-      #    <%= div_for(@person, class: "foo") do %>
-      #       <%= @person.name %>
-      #    <% end %>
-      #
-      # produces:
-      #
-      #    <div id="person_123" class="person foo"> Joe Bloggs </div>
-      #
-      # You can also pass an array of Active Record objects, which will then
-      # get iterated over and yield each record as an argument for the block.
-      # For example:
-      #
-      #    <%= div_for(@people, class: "foo") do |person| %>
-      #      <%= person.name %>
-      #    <% end %>
-      #
-      # produces:
-      #
-      #    <div id="person_123" class="person foo"> Joe Bloggs </div>
-      #    <div id="person_124" class="person foo"> Jane Bloggs </div>
-      #
-      def div_for(record, *args, &block)
-        content_tag_for(:div, record, *args, &block)
+      def div_for(*)
+        raise NoMethodError, "The `div_for` method has been removed from " \
+          "Rails. To continue using it, add the `record_tag_helper` gem to " \
+          "your Gemfile:\n" \
+          "  gem 'record_tag_helper', '~> 1.0'\n" \
+          "Consult the Rails upgrade guide for details."
       end
 
-      # content_tag_for creates an HTML element with id and class parameters
-      # that relate to the specified Active Record object. For example:
-      #
-      #    <%= content_tag_for(:tr, @person) do %>
-      #      <td><%= @person.first_name %></td>
-      #      <td><%= @person.last_name %></td>
-      #    <% end %>
-      #
-      # would produce the following HTML (assuming @person is an instance of
-      # a Person object, with an id value of 123):
-      #
-      #    <tr id="person_123" class="person">....</tr>
-      #
-      # If you require the HTML id attribute to have a prefix, you can specify it:
-      #
-      #    <%= content_tag_for(:tr, @person, :foo) do %> ...
-      #
-      # produces:
-      #
-      #    <tr id="foo_person_123" class="person">...
-      #
-      # You can also pass an array of objects which this method will loop through
-      # and yield the current object to the supplied block, reducing the need for
-      # having to iterate through the object (using <tt>each</tt>) beforehand.
-      # For example (assuming @people is an array of Person objects):
-      #
-      #    <%= content_tag_for(:tr, @people) do |person| %>
-      #      <td><%= person.first_name %></td>
-      #      <td><%= person.last_name %></td>
-      #    <% end %>
-      #
-      # produces:
-      #
-      #    <tr id="person_123" class="person">...</tr>
-      #    <tr id="person_124" class="person">...</tr>
-      #
-      # content_tag_for also accepts a hash of options, which will be converted to
-      # additional HTML attributes. If you specify a <tt>:class</tt> value, it will be combined
-      # with the default class name for your object. For example:
-      #
-      #    <%= content_tag_for(:li, @person, class: "bar") %>...
-      #
-      # produces:
-      #
-      #    <li id="person_123" class="person bar">...
-      #
-      def content_tag_for(tag_name, single_or_multiple_records, prefix = nil, options = nil, &block)
-        options, prefix = prefix, nil if prefix.is_a?(Hash)
-
-        Array(single_or_multiple_records).map do |single_record|
-          content_tag_for_single_record(tag_name, single_record, prefix, options, &block)
-        end.join("\n").html_safe
+      def content_tag_for(*)
+        raise NoMethodError, "The `content_tag_for` method has been removed from " \
+          "Rails. To continue using it, add the `record_tag_helper` gem to " \
+          "your Gemfile:\n" \
+          "  gem 'record_tag_helper', '~> 1.0'\n" \
+          "Consult the Rails upgrade guide for details."
       end
-
-      private
-
-        # Called by <tt>content_tag_for</tt> internally to render a content tag
-        # for each record.
-        def content_tag_for_single_record(tag_name, record, prefix, options, &block)
-          options = options ? options.dup : {}
-          options[:class] = [ dom_class(record, prefix), options[:class] ].compact
-          options[:id]    = dom_id(record, prefix)
-
-          if block_given?
-            content_tag(tag_name, capture(record, &block), options)
-          else
-            content_tag(tag_name, "", options)
-          end
-        end
     end
   end
 end

data/lib/action_view/helpers/rendering_helper.rb

@@ -18,7 +18,7 @@ module ActionView
       #   performs HTML escape on the string first. Setting the content type as
       #   <tt>text/html</tt>.
       # * <tt>:body</tt> - Renders the text passed in, and inherits the content
-      #   type of <tt>text/html</tt> from <tt>ActionDispatch::Response</tt>
+      #   type of <tt>text/plain</tt> from <tt>ActionDispatch::Response</tt>
       #   object.
       #
       # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
@@ -32,7 +32,7 @@ module ActionView
             view_renderer.render(self, options)
           end
         else
-          view_renderer.render_partial(self, :partial => options, :locals => locals)
+          view_renderer.render_partial(self, :partial => options, :locals => locals, &block)
         end
       end
 

data/lib/action_view/helpers/sanitize_helper.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/object/try'
-require 'active_support/deprecation'
 require 'rails-html-sanitizer'
 
 module ActionView
@@ -121,7 +120,7 @@ module ActionView
         attr_writer :full_sanitizer, :link_sanitizer, :white_list_sanitizer
 
         # Vendors the full, link and white list sanitizers.
-        # Provided strictly for compabitility and can be removed in Rails 5.
+        # Provided strictly for compatibility and can be removed in Rails 5.
         def sanitizer_vendor
           Rails::Html::Sanitizer
         end

data/lib/action_view/helpers/tag_helper.rb

@@ -18,13 +18,14 @@ module ActionView
                            itemscope allowfullscreen default inert sortable
                            truespeed typemustmatch).to_set
 
-      BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map {|attribute| attribute.to_sym })
+      BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map(&:to_sym))
 
       TAG_PREFIXES = ['aria', 'data', :aria, :data].to_set
 
-      PRE_CONTENT_STRINGS = {
-        :textarea => "\n"
-      }
+      PRE_CONTENT_STRINGS             = Hash.new { "".freeze }
+      PRE_CONTENT_STRINGS[:textarea]  = "\n"
+      PRE_CONTENT_STRINGS["textarea"] = "\n"
+
 
       # Returns an empty HTML tag of type +name+ which by default is XHTML
       # compliant. Set +open+ to true to create an open tag compatible
@@ -143,24 +144,30 @@ module ActionView
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
           content     = ERB::Util.unwrapped_html_escape(content) if escape
-          "<#{name}#{tag_options}>#{PRE_CONTENT_STRINGS[name.to_sym]}#{content}</#{name}>".html_safe
+          "<#{name}#{tag_options}>#{PRE_CONTENT_STRINGS[name]}#{content}</#{name}>".html_safe
         end
 
         def tag_options(options, escape = true)
           return if options.blank?
-          attrs = []
+          output = ""
+          sep    = " ".freeze
           options.each_pair do |key, value|
             if TAG_PREFIXES.include?(key) && value.is_a?(Hash)
               value.each_pair do |k, v|
-                attrs << prefix_tag_option(key, k, v, escape)
+                output << sep
+                output << prefix_tag_option(key, k, v, escape)
               end
             elsif BOOLEAN_ATTRIBUTES.include?(key)
-              attrs << boolean_tag_option(key) if value
+              if value
+                output << sep
+                output << boolean_tag_option(key)
+              end
             elsif !value.nil?
-              attrs << tag_option(key, value, escape)
+              output << sep
+              output << tag_option(key, value, escape)
             end
           end
-          " #{attrs * ' '}" unless attrs.empty?
+          output unless output.empty?
         end
 
         def prefix_tag_option(prefix, key, value, escape)
@@ -177,11 +184,11 @@ module ActionView
 
         def tag_option(key, value, escape)
           if value.is_a?(Array)
-            value = escape ? safe_join(value, " ") : value.join(" ")
+            value = escape ? safe_join(value, " ".freeze) : value.join(" ".freeze)
           else
-            value = escape ? ERB::Util.unwrapped_html_escape(value) : value.to_s
+            value = escape ? ERB::Util.unwrapped_html_escape(value) : value
           end
-          %(#{key}="#{value.gsub('"'.freeze, '&quot;'.freeze)}")
+          %(#{key}="#{value}")
         end
     end
   end

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

@@ -14,7 +14,7 @@ module ActionView
           @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
           @object = retrieve_object(options.delete(:object))
           @options = options
-          @auto_index = retrieve_autoindex(Regexp.last_match.pre_match) if Regexp.last_match
+          @auto_index = Regexp.last_match ? retrieve_autoindex(Regexp.last_match.pre_match) : nil
         end
 
         # This is what child classes implement.
@@ -79,35 +79,30 @@ module ActionView
         end
 
         def add_default_name_and_id(options)
-          if options.has_key?("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["multiple"]) }
-            options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
-          else
-            options["name"] ||= options.fetch("name"){ tag_name(options["multiple"]) }
-            options["id"] = options.fetch("id"){ tag_id }
+          index = name_and_id_index(options)
+          options["name"] = options.fetch("name"){ tag_name(options["multiple"], index) }
+          options["id"] = options.fetch("id"){ tag_id(index) }
+          if namespace = options.delete("namespace")
+            options['id'] = options['id'] ? "#{namespace}_#{options['id']}" : namespace
           end
-
-          options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
-        end
-
-        def tag_name(multiple = false)
-          "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
         end
 
-        def tag_name_with_index(index, multiple = false)
-          "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
-        end
-
-        def tag_id
-          "#{sanitized_object_name}_#{sanitized_method_name}"
+        def tag_name(multiple = false, index = nil)
+          # a little duplication to construct less strings
+          if index
+            "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
+          else
+            "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
+          end
         end
 
-        def tag_id_with_index(index)
-          "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
+        def tag_id(index = nil)
+          # a little duplication to construct less strings
+          if index
+            "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
+          else
+            "#{sanitized_object_name}_#{sanitized_method_name}"
+          end
         end
 
         def sanitized_object_name
@@ -125,7 +120,12 @@ module ActionView
         def select_content_tag(option_tags, options, html_options)
           html_options = html_options.stringify_keys
           add_default_name_and_id(html_options)
-          options[:include_blank] ||= true unless options[:prompt] || select_not_required?(html_options)
+
+          if placeholder_required?(html_options)
+            raise ArgumentError, "include_blank cannot be false for a required field." if options[:include_blank] == false
+            options[:include_blank] ||= true unless options[:prompt]
+          end
+
           value = options.fetch(:selected) { value(object) }
           select = content_tag("select", add_options(option_tags, options, value), html_options)
 
@@ -136,8 +136,9 @@ module ActionView
           end
         end
 
-        def select_not_required?(html_options)
-          !html_options["required"] || html_options["multiple"] || html_options["size"].to_i > 1
+        def placeholder_required?(html_options)
+          # See https://html.spec.whatwg.org/multipage/forms.html#attr-select-required
+          html_options["required"] && !html_options["multiple"] && html_options.fetch("size", 1).to_i == 1
         end
 
         def add_options(option_tags, options, value = nil)
@@ -149,6 +150,10 @@ module ActionView
           end
           option_tags
         end
+
+        def name_and_id_index(options)
+          options.key?("index") ?  options.delete("index") || "" : @auto_index
+        end
       end
     end
   end

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

@@ -9,29 +9,13 @@ module ActionView
         class CheckBoxBuilder < Builder # :nodoc:
           def check_box(extra_html_options={})
             html_options = extra_html_options.merge(@input_html_options)
+            html_options[:multiple] = true
             @template_object.check_box(@object_name, @method_name, html_options, @value, nil)
           end
         end
 
         def render(&block)
-          rendered_collection = render_collection do |item, value, text, default_html_options|
-            default_html_options[:multiple] = true
-            builder = instantiate_builder(CheckBoxBuilder, item, value, text, default_html_options)
-
-            if block_given?
-              @template_object.capture(builder, &block)
-            else
-              render_component(builder)
-            end
-          end
-
-          # Append a hidden field to make sure something will be sent back to the
-          # server if all check boxes are unchecked.
-          if @options.fetch(:include_hidden, true)
-            rendered_collection + hidden_field
-          else
-            rendered_collection
-          end
+          render_collection_for(CheckBoxBuilder, &block)
         end
 
         private
@@ -39,18 +23,6 @@ module ActionView
         def render_component(builder)
           builder.check_box + builder.label
         end
-
-        def hidden_field
-          hidden_name = @html_options[:name]
-
-          hidden_name ||= if @options.has_key?(:index)
-            "#{tag_name_with_index(@options[:index])}[]"
-          else
-            "#{tag_name}[]"
-          end
-
-          @template_object.hidden_field_tag(hidden_name, "", id: nil)
-        end
       end
     end
   end

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

@@ -19,6 +19,8 @@ module ActionView
 
           def label(label_html_options={}, &block)
             html_options = @input_html_options.slice(:index, :namespace).merge(label_html_options)
+            html_options[:for] ||= @input_html_options[:id] if @input_html_options[:id]
+
             @template_object.label(@object_name, @sanitized_attribute_name, @text, html_options, &block)
           end
         end
@@ -79,6 +81,32 @@ module ActionView
             yield item, value, text, default_html_options.merge(additional_html_options)
           end.join.html_safe
         end
+
+        def render_collection_for(builder_class, &block) #:nodoc:
+          options = @options.stringify_keys
+          rendered_collection = render_collection do |item, value, text, default_html_options|
+            builder = instantiate_builder(builder_class, item, value, text, default_html_options)
+
+            if block_given?
+              @template_object.capture(builder, &block)
+            else
+              render_component(builder)
+            end
+          end
+
+          # Append a hidden field to make sure something will be sent back to the
+          # server if all radio buttons are unchecked.
+          if options.fetch('include_hidden', true)
+            rendered_collection + hidden_field
+          else
+            rendered_collection
+          end
+        end
+
+        def hidden_field #:nodoc:
+          hidden_name = @html_options[:name] || "#{tag_name(false, @options[:index])}[]"
+          @template_object.hidden_field_tag(hidden_name, "", id: nil)
+        end
       end
     end
   end

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

@@ -14,15 +14,7 @@ module ActionView
         end
 
         def render(&block)
-          render_collection do |item, value, text, default_html_options|
-            builder = instantiate_builder(RadioButtonBuilder, item, value, text, default_html_options)
-
-            if block_given?
-              @template_object.capture(builder, &block)
-            else
-              render_component(builder)
-            end
-          end
+          render_collection_for(RadioButtonBuilder, &block)
         end
 
         private

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

@@ -2,6 +2,21 @@ module ActionView
   module Helpers
     module Tags # :nodoc:
       class FileField < TextField # :nodoc:
+
+        def render
+          options = @options.stringify_keys
+
+          if options.fetch("include_hidden", true)
+            add_default_name_and_id(options)
+            options[:type] = "file"
+            tag("input", name: options["name"], type: "hidden", value: "") + tag("input", options)
+          else
+            options.delete("include_hidden")
+            @options = options
+
+            super
+          end
+        end
       end
     end
   end