actionpack 3.0.0.beta4 → 3.0.0.rc

data/lib/action_controller/base.rb

@@ -1,3 +1,5 @@
+require "action_controller/log_subscriber"
+
 module ActionController
   class Base < Metal
     abstract!
@@ -26,7 +28,6 @@ module ActionController
       SessionManagement,
       Caching,
       MimeResponds,
-      PolymorphicRoutes,
       ImplicitRender,
 
       Cookies,
@@ -58,19 +59,12 @@ module ActionController
     include ActionController::Compatibility
 
     def self.inherited(klass)
-      ::ActionController::Base.subclasses << klass.to_s
       super
       klass.helper :all
     end
 
-    def self.subclasses
-      @subclasses ||= []
-    end
-
-    config_accessor :asset_host, :asset_path
-
     ActiveSupport.run_load_hooks(:action_controller, self)
   end
 end
 
-require "action_controller/deprecated/base"
+require "action_controller/deprecated/base"

data/lib/action_controller/log_subscriber.rb

@@ -0,0 +1,56 @@
+require 'active_support/core_ext/object/blank'
+
+module ActionController
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    INTERNAL_PARAMS = %w(controller action format _method only_path)
+
+    def start_processing(event)
+      payload = event.payload
+      params  = payload[:params].except(*INTERNAL_PARAMS)
+
+      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
+      info "  Parameters: #{params.inspect}" unless params.empty?
+    end
+
+    def process_action(event)
+      payload   = event.payload
+      additions = ActionController::Base.log_process_action(payload)
+
+      message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration
+      message << " (#{additions.join(" | ")})" unless additions.blank?
+
+      info(message)
+    end
+
+    def send_file(event)
+      message = "Sent file %s"
+      message << " (%.1fms)"
+      info(message % [event.payload[:path], event.duration])
+    end
+
+    def redirect_to(event)
+      info "Redirected to #{event.payload[:location]}"
+    end
+
+    def send_data(event)
+      info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
+    end
+
+    %w(write_fragment read_fragment exist_fragment?
+       expire_fragment expire_page write_page).each do |method|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(event)
+          key_or_path = event.payload[:key] || event.payload[:path]
+          human_name  = #{method.to_s.humanize.inspect}
+          info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
+        end
+      METHOD
+    end
+
+    def logger
+      ActionController::Base.logger
+    end
+  end
+end
+
+ActionController::LogSubscriber.attach_to :action_controller

data/lib/action_controller/metal.rb

@@ -52,8 +52,7 @@ module ActionController
   class Metal < AbstractController::Base
     abstract!
 
-    # :api: public
-    attr_internal :params, :env
+    attr_internal :env
 
     # Returns the last part of the controller's name, underscored, without the ending
     # "Controller". For instance, MyApp::MyPostsController would return "my_posts" for
@@ -62,7 +61,7 @@ module ActionController
     # ==== Returns
     # String
     def self.controller_name
-      @controller_name ||= controller_path.split("/").last
+      @controller_name ||= self.name.demodulize.sub(/Controller$/, '').underscore
     end
 
     # Delegates to the class' #controller_name
@@ -85,6 +84,14 @@ module ActionController
       super
     end
 
+    def params
+      @_params ||= request.parameters
+    end
+
+    def params=(val)
+      @_params = val
+    end
+
     # Basic implementations for content_type=, location=, and headers are
     # provided to reduce the dependency on the RackDelegation module
     # in Renderer and Redirector.

data/lib/action_controller/metal/helpers.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/attribute'
 
 module ActionController
@@ -58,13 +59,13 @@ module ActionController
 
     module ClassMethods
       def helpers_dir
-        ActiveSupport::Deprecation.warn "helpers_dir is deprecated, use helpers_path instead"
+        ActiveSupport::Deprecation.warn "helpers_dir is deprecated, use helpers_path instead", caller
         self.helpers_path
       end
 
       def helpers_dir=(value)
-        ActiveSupport::Deprecation.warn "helpers_dir= is deprecated, use helpers_path= instead"
-        self.helpers_path = Array(value)
+        ActiveSupport::Deprecation.warn "helpers_dir= is deprecated, use helpers_path= instead", caller
+        self.helpers_path = Array.wrap(value)
       end
 
       # Declares helper accessors for controller attributes. For example, the
@@ -103,7 +104,7 @@ module ActionController
         # Extract helper names from files in app/helpers/**/*_helper.rb
         def all_application_helpers
           helpers = []
-          helpers_path.each do |path|
+          Array.wrap(helpers_path).each do |path|
             extract  = /^#{Regexp.quote(path.to_s)}\/?(.*)_helper.rb$/
             helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
           end

data/lib/action_controller/metal/hide_actions.rb

@@ -8,7 +8,7 @@ module ActionController
 
     included do
       class_attribute :hidden_actions
-      self.hidden_actions = Set.new
+      self.hidden_actions = Set.new.freeze
     end
 
   private
@@ -25,7 +25,7 @@ module ActionController
       # ==== Parameters
       # *args<#to_s>:: A list of actions
       def hide_action(*args)
-        self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s))
+        self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s)).freeze
       end
 
       def inherited(klass)
@@ -41,7 +41,7 @@ module ActionController
       # Overrides AbstractController::Base#action_methods to remove any methods
       # that are listed as hidden methods.
       def action_methods
-        @action_methods ||= Set.new(super.reject {|name| hidden_actions.include?(name)})
+        @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) })
       end
     end
   end

data/lib/action_controller/metal/instrumentation.rb

@@ -1,8 +1,9 @@
+require 'benchmark'
 require 'abstract_controller/logger'
 
 module ActionController
   # Adds instrumentation to several ends in ActionController::Base. It also provides
-  # some hooks related with process_action, this allows an ORM like ActiveRecord
+  # some hooks related with process_action, this allows an ORM like Active Record
   # and/or DataMapper to plug in ActionController and show related information.
   #
   # Check ActiveRecord::Railties::ControllerRuntime for an example.

data/lib/action_controller/metal/mime_responds.rb

@@ -12,27 +12,30 @@ module ActionController #:nodoc:
     end
 
     module ClassMethods
-      # Defines mimes that are rendered by default when invoking respond_with.
+      # Defines mime types that are rendered by default when invoking
+      # <tt>respond_with</tt>.
       #
       # Examples:
       #
       #   respond_to :html, :xml, :json
       #
-      # All actions on your controller will respond to :html, :xml and :json.
+      # Specifies that all actions in the controller respond to requests
+      # for <tt>:html</tt>, <tt>:xml</tt> and <tt>:json</tt>.
       #
-      # But if you want to specify it based on your actions, you can use only and
-      # except:
+      # To specify on per-action basis, use <tt>:only</tt> and
+      # <tt>:except</tt> with an array of actions or a single action:
       #
       #   respond_to :html
       #   respond_to :xml, :json, :except => [ :edit ]
       #
-      # The definition above explicits that all actions respond to :html. And all
-      # actions except :edit respond to :xml and :json.
-      #
-      # You can specify also only parameters:
+      # This specifies that all actions respond to <tt>:html</tt>
+      # and all actions except <tt>:edit</tt> respond to <tt>:xml</tt> and
+      # <tt>:json</tt>.
       #
       #   respond_to :rjs, :only => :create
       #
+      # This specifies that the <tt>:create</tt> action and no other responds
+      # to <tt>:rjs</tt>.
       def respond_to(*mimes)
         options = mimes.extract_options!
 
@@ -49,7 +52,7 @@ module ActionController #:nodoc:
         self.mimes_for_respond_to = new.freeze
       end
 
-      # Clear all mimes in respond_to.
+      # Clear all mime types in <tt>respond_to</tt>.
       #
       def clear_respond_to
         self.mimes_for_respond_to = ActiveSupport::OrderedHash.new.freeze
@@ -145,7 +148,7 @@ module ActionController #:nodoc:
     # and accept Rails' defaults, life will be much easier.
     #
     # If you need to use a MIME type which isn't supported by default, you can register your own handlers in
-    # environment.rb as follows.
+    # config/initializers/mime_types.rb as follows.
     #
     #   Mime::Type.register "image/jpg", :jpg
     #

data/lib/action_controller/metal/rack_delegation.rb

@@ -14,10 +14,6 @@ module ActionController
       super(action, request)
     end
 
-    def params
-      @_params ||= @_request.parameters
-    end
-
     def response_body=(body)
       response.body = body if response
       super

data/lib/action_controller/metal/request_forgery_protection.rb

@@ -55,7 +55,7 @@ module ActionController #:nodoc:
       config_accessor :request_forgery_protection_token
       self.request_forgery_protection_token ||= :authenticity_token
 
-      # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
+      # Controls whether request forgery protection is turned on or not. Turned off by default only in test mode.
       config_accessor :allow_forgery_protection
       self.allow_forgery_protection = true if allow_forgery_protection.nil?
 

data/lib/action_controller/metal/rescue.rb

@@ -3,6 +3,15 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
+    def rescue_with_handler(exception)
+      if (exception.respond_to?(:original_exception) &&
+          (orig_exception = exception.original_exception) &&
+          handler_for_rescue(orig_exception))
+        exception = orig_exception
+      end
+      super(exception)
+    end
+
     private
       def process_action(*args)
         super

data/lib/action_controller/metal/responder.rb

@@ -89,9 +89,7 @@ module ActionController #:nodoc:
 
     def initialize(controller, resources, options={})
       @controller = controller
-      @request = controller.request
-      @format = controller.formats.first
-      @resource = resources.is_a?(Array) ? resources.last : resources
+      @resource = resources.last
       @resources = resources
       @options = options
       @action = options.delete(:action)
@@ -101,6 +99,14 @@ module ActionController #:nodoc:
     delegate :head, :render, :redirect_to,   :to => :controller
     delegate :get?, :post?, :put?, :delete?, :to => :request
 
+    def request
+      @request ||= @controller.request
+    end
+
+    def format
+      @format ||= @controller.formats.first
+    end
+
     # Undefine :to_json and :to_yaml since it's defined on Object
     undef_method(:to_json) if method_defined?(:to_json)
     undef_method(:to_yaml) if method_defined?(:to_yaml)
@@ -147,7 +153,7 @@ module ActionController #:nodoc:
       elsif has_errors? && default_action
         render :action => default_action
       else
-        redirect_to resource_location
+        redirect_to navigation_location
       end
     end
 
@@ -160,7 +166,7 @@ module ActionController #:nodoc:
       elsif has_errors?
         display resource.errors, :status => :unprocessable_entity
       elsif post?
-        display resource, :status => :created, :location => resource_location
+        display resource, :status => :created, :location => api_location
       else
         head :ok
       end
@@ -178,6 +184,8 @@ module ActionController #:nodoc:
     def resource_location
       options[:location] || resources
     end
+    alias :navigation_location :resource_location
+    alias :api_location :resource_location
 
     # If a given response block was given, use it, otherwise call render on
     # controller.

data/lib/action_controller/metal/streaming.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/file/path'
+
 module ActionController #:nodoc:
   # Methods for sending arbitrary data and for streaming files to the browser,
   # instead of rendering.

data/lib/action_controller/metal/url_for.rb

@@ -12,17 +12,17 @@ module ActionController
       ).merge(:script_name => request.script_name)
     end
 
-    def _router
-      raise "In order to use #url_for, you must include the helpers of a particular " \
-            "router. For instance, `include Rails.application.routes.url_helpers"
+    def _routes
+      raise "In order to use #url_for, you must include routing helpers explicitly. " \
+            "For instance, `include Rails.application.routes.url_helpers"
     end
 
     module ClassMethods
       def action_methods
         @action_methods ||= begin
-          super - _router.named_routes.helper_names
+          super - _routes.named_routes.helper_names
         end
       end
     end
   end
-end
+end

data/lib/action_controller/railtie.rb

@@ -2,13 +2,9 @@ require "rails"
 require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
-require "active_support/core_ext/class/subclasses"
 require "active_support/deprecation/proxy_wrappers"
 require "active_support/deprecation"
 
-require "action_controller/railties/log_subscriber"
-require "action_controller/railties/url_helpers"
-
 module ActionController
   class Railtie < Rails::Railtie
     config.action_controller = ActiveSupport::OrderedOptions.new
@@ -35,23 +31,6 @@ module ActionController
       end
     end
 
-    log_subscriber :action_controller, ActionController::Railties::LogSubscriber.new
-
-    initializer "action_controller.set_configs" do |app|
-      paths = app.config.paths
-      ac = app.config.action_controller
-
-      ac.assets_dir           ||= paths.public.to_a.first
-      ac.javascripts_dir      ||= paths.public.javascripts.to_a.first
-      ac.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
-      ac.page_cache_directory ||= paths.public.to_a.first
-      ac.helpers_path         ||= paths.app.helpers.to_a
-
-      ActiveSupport.on_load(:action_controller) do
-        self.config.merge!(ac)
-      end
-    end
-
     initializer "action_controller.logger" do
       ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
     end
@@ -60,11 +39,23 @@ module ActionController
       ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
     end
 
-    initializer "action_controller.url_helpers" do |app|
+    initializer "action_controller.set_configs" do |app|
+      paths   = app.config.paths
+      options = app.config.action_controller
+
+      options.assets_dir           ||= paths.public.to_a.first
+      options.javascripts_dir      ||= paths.public.javascripts.to_a.first
+      options.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
+      options.page_cache_directory ||= paths.public.to_a.first
+      options.helpers_path         ||= paths.app.helpers.to_a
+
       ActiveSupport.on_load(:action_controller) do
-        extend ::ActionController::Railties::UrlHelpers.with(app.routes)
+        include app.routes.url_helpers
+        options.each { |k,v| send("#{k}=", v) }
       end
+    end
 
+    initializer "action_controller.deprecated_routes" do |app|
       message = "ActionController::Routing::Routes is deprecated. " \
                 "Instead, use Rails.application.routes"
 

data/lib/action_controller/record_identifier.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/module'
 
 module ActionController
-  # The record identifier encapsulates a number of naming conventions for dealing with records, like Active Records or 
+  # The record identifier encapsulates a number of naming conventions for dealing with records, like Active Records or
   # Active Resources or pretty much any other model type that has an id. These patterns are then used to try elevate
   # the view actions to a higher logical level. Example:
   #
@@ -28,7 +28,7 @@ module ActionController
   #   end
   #
   # As the example above shows, you can stop caring to a large extent what the actual id of the post is. You just know
-  # that one is being assigned and that the subsequent calls in redirect_to and the RJS expect that same naming 
+  # that one is being assigned and that the subsequent calls in redirect_to and the RJS expect that same naming
   # convention and allows you to write less code if you follow it.
   module RecordIdentifier
     extend self
@@ -46,7 +46,7 @@ module ActionController
     #   dom_class(post, :edit)   # => "edit_post"
     #   dom_class(Person, :edit) # => "edit_person"
     def dom_class(record_or_class, prefix = nil)
-      singular = singular_class_name(record_or_class)
+      singular = ActiveModel::Naming.singular(record_or_class)
       prefix ? "#{prefix}#{JOIN}#{singular}" : singular
     end
 
@@ -59,7 +59,7 @@ module ActionController
     # If you need to address multiple instances of the same class in the same view, you can prefix the dom_id:
     #
     #   dom_id(Post.find(45), :edit) # => "edit_post_45"
-    def dom_id(record, prefix = nil) 
+    def dom_id(record, prefix = nil)
       if record_id = record_key_for_dom_id(record)
         "#{dom_class(record, prefix)}#{JOIN}#{record_id}"
       else
@@ -67,6 +67,8 @@ module ActionController
       end
     end
 
+  protected
+
     # Returns a string representation of the key attribute(s) that is suitable for use in an HTML DOM id.
     # This can be overwritten to customize the default generated string representation if desired.
     # If you need to read back a key from a dom_id in order to query for the underlying database record,
@@ -85,26 +87,5 @@ module ActionController
     def sanitize_dom_id(candidate_id)
       candidate_id # TODO implement conversion to valid DOM id values
     end
-
-    # Returns the plural class name of a record or class. Examples:
-    #
-    #   plural_class_name(post)             # => "posts"
-    #   plural_class_name(Highrise::Person) # => "highrise_people"
-    def plural_class_name(record_or_class)
-      model_name_from_record_or_class(record_or_class).plural
-    end
-
-    # Returns the singular class name of a record or class. Examples:
-    #
-    #   singular_class_name(post)             # => "post"
-    #   singular_class_name(Highrise::Person) # => "highrise_person"
-    def singular_class_name(record_or_class)
-      model_name_from_record_or_class(record_or_class).singular
-    end
-
-    private
-      def model_name_from_record_or_class(record_or_class)
-        (record_or_class.is_a?(Class) ? record_or_class : record_or_class.class).model_name
-      end
   end
 end