actionpack 4.2.10 → 7.2.0.rc1

data/lib/action_controller/metal/head.rb

@@ -1,58 +1,67 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
 module ActionController
   module Head
-    # Returns a response that has no content (merely headers). The options
-    # argument is interpreted to be a hash of header names and values.
-    # This allows you to easily return a response that consists only of
-    # significant headers:
+    # Returns a response that has no content (merely headers). The options argument
+    # is interpreted to be a hash of header names and values. This allows you to
+    # easily return a response that consists only of significant headers:
     #
-    #   head :created, location: person_path(@person)
+    #     head :created, location: person_path(@person)
     #
-    #   head :created, location: @person
+    #     head :created, location: @person
     #
     # It can also be used to return exceptional conditions:
     #
-    #   return head(:method_not_allowed) unless request.post?
-    #   return head(:bad_request) unless valid_request?
-    #   render
+    #     return head(:method_not_allowed) unless request.post?
+    #     return head(:bad_request) unless valid_request?
+    #     render
     #
-    # See Rack::Utils::SYMBOL_TO_STATUS_CODE for a full list of valid +status+ symbols.
-    def head(status, options = {})
-      options, status = status, nil if status.is_a?(Hash)
-      status ||= options.delete(:status) || :ok
-      location = options.delete(:location)
-      content_type = options.delete(:content_type)
-
-      options.each do |key, value|
-        headers[key.to_s.dasherize.split('-').each { |v| v[0] = v[0].chr.upcase }.join('-')] = value.to_s
+    # See `Rack::Utils::SYMBOL_TO_STATUS_CODE` for a full list of valid `status`
+    # symbols.
+    def head(status, options = nil)
+      if status.is_a?(Hash)
+        raise ArgumentError, "#{status.inspect} is not a valid value for `status`."
+      end
+
+      status ||= :ok
+
+      if options
+        location = options.delete(:location)
+        content_type = options.delete(:content_type)
+
+        options.each do |key, value|
+          headers[key.to_s.split(/[-_]/).each { |v| v[0] = v[0].upcase }.join("-")] = value.to_s
+        end
       end
 
       self.status = status
       self.location = url_for(location) if location
 
-      self.response_body = ""
+      if include_content?(response_code)
+        unless self.media_type
+          self.content_type = content_type || ((f = formats) && Mime[f.first]) || Mime[:html]
+        end
 
-      if include_content?(self.response_code)
-        self.content_type = content_type || (Mime[formats.first] if formats)
-        self.response.charset = false if self.response
-      else
-        headers.delete('Content-Type')
-        headers.delete('Content-Length')
+        response.charset = false
       end
-      
+
+      self.response_body = ""
+
       true
     end
 
     private
-    # :nodoc:
-    def include_content?(status)
-      case status
-      when 100..199
-        false
-      when 204, 205, 304
-        false
-      else
-        true
+      def include_content?(status)
+        case status
+        when 100..199
+          false
+        when 204, 205, 304
+          false
+        else
+          true
+        end
       end
-    end
   end
 end

data/lib/action_controller/metal/helpers.rb

@@ -1,50 +1,64 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
 module ActionController
-  # The \Rails framework provides a large number of helpers for working with assets, dates, forms,
-  # numbers and model objects, to name a few. These helpers are available to all templates
-  # by default.
+  # # Action Controller Helpers
   #
-  # In addition to using the standard template helpers provided, creating custom helpers to
-  # extract complicated logic or reusable functionality is strongly encouraged. By default, each controller
-  # will include all helpers. These helpers are only accessible on the controller through <tt>.helpers</tt>
+  # The Rails framework provides a large number of helpers for working with
+  # assets, dates, forms, numbers and model objects, to name a few. These helpers
+  # are available to all templates by default.
   #
-  # In previous versions of \Rails the controller will include a helper whose
-  # name matches that of the controller, e.g., <tt>MyController</tt> will automatically
-  # include <tt>MyHelper</tt>. To return old behavior set +config.action_controller.include_all_helpers+ to +false+.
+  # In addition to using the standard template helpers provided, creating custom
+  # helpers to extract complicated logic or reusable functionality is strongly
+  # encouraged. By default, each controller will include all helpers. These
+  # helpers are only accessible on the controller through `#helpers`
   #
-  # Additional helpers can be specified using the +helper+ class method in ActionController::Base or any
-  # controller which inherits from it.
+  # In previous versions of Rails the controller will include a helper which
+  # matches the name of the controller, e.g., `MyController` will automatically
+  # include `MyHelper`. You can revert to the old behavior with the following:
+  #
+  #     # config/application.rb
+  #     class Application < Rails::Application
+  #       config.action_controller.include_all_helpers = false
+  #     end
   #
-  # The +to_s+ method from the \Time class can be wrapped in a helper method to display a custom message if
-  # a \Time object is blank:
+  # Additional helpers can be specified using the `helper` class method in
+  # ActionController::Base or any controller which inherits from it.
   #
-  #   module FormattedTimeHelper
-  #     def format_time(time, format=:long, blank_message="&nbsp;")
-  #       time.blank? ? blank_message : time.to_s(format)
+  # The `to_s` method from the Time class can be wrapped in a helper method to
+  # display a custom message if a Time object is blank:
+  #
+  #     module FormattedTimeHelper
+  #       def format_time(time, format=:long, blank_message="&nbsp;")
+  #         time.blank? ? blank_message : time.to_fs(format)
+  #       end
   #     end
-  #   end
   #
-  # FormattedTimeHelper can now be included in a controller, using the +helper+ class method:
+  # FormattedTimeHelper can now be included in a controller, using the `helper`
+  # class method:
   #
-  #   class EventsController < ActionController::Base
-  #     helper FormattedTimeHelper
-  #     def index
-  #       @events = Event.all
+  #     class EventsController < ActionController::Base
+  #       helper FormattedTimeHelper
+  #       def index
+  #         @events = Event.all
+  #       end
   #     end
-  #   end
   #
-  # Then, in any view rendered by <tt>EventController</tt>, the <tt>format_time</tt> method can be called:
+  # Then, in any view rendered by `EventsController`, the `format_time` method can
+  # be called:
   #
-  #   <% @events.each do |event| -%>
-  #     <p>
-  #       <%= format_time(event.time, :short, "N/A") %> | <%= event.name %>
-  #     </p>
-  #   <% end -%>
+  #     <% @events.each do |event| -%>
+  #       <p>
+  #         <%= format_time(event.time, :short, "N/A") %> | <%= event.name %>
+  #       </p>
+  #     <% end -%>
   #
-  # Finally, assuming we have two event instances, one which has a time and one which does not,
-  # the output might look like this:
+  # Finally, assuming we have two event instances, one which has a time and one
+  # which does not, the output might look like this:
   #
-  #   23 Aug 11:30 | Carolina Railhawks Soccer Match
-  #   N/A | Carolina Railhaws Training Workshop
+  #     23 Aug 11:30 | Carolina Railhawks Soccer Match
+  #     N/A | Carolina Railhawks Training Workshop
   #
   module Helpers
     extend ActiveSupport::Concern
@@ -53,61 +67,63 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      class_attribute :helpers_path, :include_all_helpers
-      self.helpers_path ||= []
-      self.include_all_helpers = true
+      class_attribute :helpers_path, default: []
+      class_attribute :include_all_helpers, default: true
     end
 
     module ClassMethods
       # Declares helper accessors for controller attributes. For example, the
-      # following adds new +name+ and <tt>name=</tt> instance methods to a
-      # controller and makes them available to the view:
-      #   attr_accessor :name
-      #   helper_attr :name
+      # following adds new `name` and `name=` instance methods to a controller and
+      # makes them available to the view:
+      #     attr_accessor :name
+      #     helper_attr :name
+      #
+      # #### Parameters
+      # *   `attrs` - Names of attributes to be converted into helpers.
       #
-      # ==== Parameters
-      # * <tt>attrs</tt> - Names of attributes to be converted into helpers.
       def helper_attr(*attrs)
         attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
       end
 
-      # Provides a proxy to access helpers methods from outside the view.
+      # Provides a proxy to access helper methods from outside the view.
+      #
+      # Note that the proxy is rendered under a different view context. This may cause
+      # incorrect behavior with capture methods. Consider using
+      # [helper](rdoc-ref:AbstractController::Helpers::ClassMethods#helper) instead
+      # when using `capture`.
       def helpers
-        @helper_proxy ||= begin 
-          proxy = ActionView::Base.new
+        @helper_proxy ||= begin
+          proxy = ActionView::Base.empty
           proxy.config = config.inheritable_copy
           proxy.extend(_helpers)
         end
       end
 
-      # Overwrite modules_for_helpers to accept :all as argument, which loads
-      # all helpers in helpers_path.
+      # Override modules_for_helpers to accept `:all` as argument, which loads all
+      # helpers in helpers_path.
       #
-      # ==== Parameters
-      # * <tt>args</tt> - A list of helpers
+      # #### Parameters
+      # *   `args` - A list of helpers
+      #
+      #
+      # #### Returns
+      # *   `array` - A normalized list of modules for the list of helpers provided.
       #
-      # ==== Returns
-      # * <tt>array</tt> - A normalized list of modules for the list of helpers provided.
       def modules_for_helpers(args)
         args += all_application_helpers if args.delete(:all)
         super(args)
       end
 
-      def all_helpers_from_path(path)
-        helpers = Array(path).flat_map do |_path|
-          extract = /^#{Regexp.quote(_path.to_s)}\/?(.*)_helper.rb$/
-          names = Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
-          names.sort!
+      private
+        # Extract helper names from files in `app/helpers/***/**_helper.rb`
+        def all_application_helpers
+          all_helpers_from_path(helpers_path)
         end
-        helpers.uniq!
-        helpers
-      end
+    end
 
-      private
-      # Extract helper names from files in <tt>app/helpers/**/*_helper.rb</tt>
-      def all_application_helpers
-        all_helpers_from_path(helpers_path)
-      end
+    # Provides a proxy to access helper methods from outside the view.
+    def helpers
+      @_helper_proxy ||= view_context
     end
   end
 end