actionpack 3.0.0.beta3 → 3.0.0.beta4

data/CHANGELOG

@@ -1,3 +1,22 @@
+*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+
+* Remove middleware laziness [José Valim]
+
+* Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. [José Valim]
+
+* OAuth 2: HTTP Token Authorization support to complement Basic and Digest Authorization.  [Rick Olson]
+
+* Fixed inconsistencies in form builder and view helpers #4432 [Neeraj Singh]
+
+* Both :xml and :json renderers now forwards the given options to the model, allowing you to invoke them as render :xml => @projects, :include => :tasks [José Valim, Yehuda Katz]
+
+* Renamed the field error CSS class from fieldWithErrors to field_with_errors for consistency.  [Jeremy Kemper]
+
+* Add support for shorthand routes like /projects/status(.:format)  #4423 [Diego Carrion]
+
+* Changed translate helper so that it doesn’t mark every translation as safe HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. [Craig Davey]
+
+
 *Rails 3.0.0 [beta 3] (April 13th, 2010)*
 
 * New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> [spastorino]

data/lib/abstract_controller.rb

@@ -12,7 +12,6 @@ require 'active_support/i18n'
 module AbstractController
   extend ActiveSupport::Autoload
 
-  autoload :Assigns
   autoload :Base
   autoload :Callbacks
   autoload :Collector
@@ -21,5 +20,6 @@ module AbstractController
   autoload :Logger
   autoload :Rendering
   autoload :Translation
+  autoload :AssetPaths
   autoload :ViewPaths
 end

data/lib/abstract_controller/asset_paths.rb

@@ -0,0 +1,9 @@
+module AbstractController
+  module AssetPaths
+    extend ActiveSupport::Concern
+
+    included do
+      config_accessor :assets_dir, :javascripts_dir, :stylesheets_dir
+    end
+  end
+end

data/lib/abstract_controller/base.rb

@@ -1,4 +1,5 @@
-require 'active_support/ordered_options'
+require 'active_support/configurable'
+require 'active_support/core_ext/module/anonymous'
 
 module AbstractController
   class Error < StandardError; end
@@ -8,6 +9,8 @@ module AbstractController
     attr_internal :response_body
     attr_internal :action_name
 
+    include ActiveSupport::Configurable
+
     class << self
       attr_reader :abstract
       alias_method :abstract?, :abstract
@@ -29,14 +32,6 @@ module AbstractController
         @descendants ||= []
       end
 
-      def config
-        @config ||= ActiveSupport::InheritableOptions.new(superclass < Base ? superclass.config : {})
-      end
-
-      def configure
-        yield config
-      end
-
       # A list of all internal methods for a controller. This finds the first
       # abstract superclass of a controller, and gets a list of all public
       # instance methods on that abstract class. Public instance methods of
@@ -99,10 +94,6 @@ module AbstractController
 
     abstract!
 
-    def config
-      @config ||= ActiveSupport::InheritableOptions.new(self.class.config)
-    end
-
     # Calls the action going through the entire action dispatch stack.
     #
     # The actual method that is called is determined by calling
@@ -133,6 +124,7 @@ module AbstractController
     end
 
     private
+
       # Returns true if the name can be considered an action. This can
       # be overridden in subclasses to modify the semantics of what
       # can be considered an action.

data/lib/abstract_controller/callbacks.rb

@@ -20,7 +20,7 @@ module AbstractController
     end
 
     module ClassMethods
-      # If :only or :accept are used, convert the options into the
+      # If :only or :except are used, convert the options into the
       # primitive form (:per_key) used by ActiveSupport::Callbacks.
       # The basic idea is that :only => :index gets converted to
       # :if => proc {|c| c.action_name == "index" }, but that the

data/lib/abstract_controller/helpers.rb

@@ -8,7 +8,6 @@ module AbstractController
 
     included do
       class_attribute :_helpers
-      delegate :_helpers, :to => :'self.class'
       self._helpers = Module.new
     end
 

data/lib/abstract_controller/layouts.rb

@@ -245,7 +245,7 @@ module AbstractController
 
         case defined?(@_layout) ? @_layout : nil
         when String
-          self.class_eval %{def _layout; #{@_layout.inspect} end}
+          self.class_eval %{def _layout; #{@_layout.inspect} end}, __FILE__, __LINE__
         when Symbol
           self.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
             def _layout
@@ -259,9 +259,9 @@ module AbstractController
           ruby_eval
         when Proc
           define_method :_layout_from_proc, &@_layout
-          self.class_eval %{def _layout; _layout_from_proc(self) end}
+          self.class_eval %{def _layout; _layout_from_proc(self) end}, __FILE__, __LINE__
         when false
-          self.class_eval %{def _layout; end}
+          self.class_eval %{def _layout; end}, __FILE__, __LINE__
         when true
           raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
         when nil

data/lib/abstract_controller/logger.rb

@@ -6,7 +6,7 @@ module AbstractController
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :logger
+      config_accessor :logger
       extend ActiveSupport::Benchmarkable
     end
   end

data/lib/abstract_controller/rendering.rb

@@ -1,4 +1,5 @@
 require "abstract_controller/base"
+require "action_view"
 
 module AbstractController
   class DoubleRenderError < Error

data/lib/action_controller/base.rb

@@ -13,6 +13,7 @@ module ActionController
     MODULES = [
       AbstractController::Layouts,
       AbstractController::Translation,
+      AbstractController::AssetPaths,
 
       Helpers,
       HideActions,
@@ -35,6 +36,7 @@ module ActionController
       RecordIdentifier,
       HttpAuthentication::Basic::ControllerMethods,
       HttpAuthentication::Digest::ControllerMethods,
+      HttpAuthentication::Token::ControllerMethods,
 
       # Add instrumentations hooks at the bottom, to ensure they instrument
       # all the methods properly.
@@ -65,8 +67,10 @@ module ActionController
       @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/caching.rb

@@ -63,11 +63,10 @@ module ActionController #:nodoc:
     included do
       extend ConfigMethods
 
-      @@perform_caching = true
-      cattr_accessor :perform_caching
+      config_accessor :perform_caching
+      self.perform_caching = true if perform_caching.nil?
     end
 
-
     def caching_allowed?
       request.get? && response.status == 200
     end

data/lib/action_controller/caching/actions.rb

@@ -133,7 +133,7 @@ module ActionController #:nodoc:
             body = controller._save_fragment(cache_path.path, @store_options)
           end
 
-          body = controller.render_to_string(:text => cache, :layout => true) unless @cache_layout
+          body = controller.render_to_string(:text => body, :layout => true) unless @cache_layout
 
           controller.response_body = body
           controller.content_type = Mime[cache_path.extension || :html]

data/lib/action_controller/caching/fragments.rb

@@ -99,7 +99,7 @@ module ActionController #:nodoc:
       end
 
       def instrument_fragment_cache(name, key)
-        ActiveSupport::Notifications.instrument("action_controller.#{name}", :key => key){ yield }
+        ActiveSupport::Notifications.instrument("#{name}.action_controller", :key => key){ yield }
       end
     end
   end

data/lib/action_controller/caching/pages.rb

@@ -41,11 +41,11 @@ module ActionController #:nodoc:
         ##
         # :singleton-method:
         # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
-        # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
+        # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing
         # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
         # web server to look in the new location for cached files.
-        @@page_cache_directory = ''
-        cattr_accessor :page_cache_directory
+        config_accessor :page_cache_directory
+        self.page_cache_directory ||= ''
 
         ##
         # :singleton-method:
@@ -53,8 +53,8 @@ module ActionController #:nodoc:
         # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
         # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
         # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-        @@page_cache_extension = '.html'
-        cattr_accessor :page_cache_extension
+        config_accessor :page_cache_extension
+        self.page_cache_extension ||= '.html'
       end
 
       module ClassMethods
@@ -109,14 +109,14 @@ module ActionController #:nodoc:
           end
 
           def instrument_page_cache(name, path)
-            ActiveSupport::Notifications.instrument("action_controller.#{name}", :path => path){ yield }
+            ActiveSupport::Notifications.instrument("#{name}.action_controller", :path => path){ yield }
           end
       end
 
       # Expires the page that was cached with the +options+ as a key. Example:
       #   expire_page :controller => "lists", :action => "show"
       def expire_page(options = {})
-        return unless perform_caching
+        return unless self.class.perform_caching
 
         if options.is_a?(Hash)
           if options[:action].is_a?(Array)
@@ -135,7 +135,7 @@ module ActionController #:nodoc:
       # If no options are provided, the requested url is used. Example:
       #   cache_page "I'm the cached content", :controller => "lists", :action => "show"
       def cache_page(content = nil, options = nil)
-        return unless perform_caching && caching_allowed
+        return unless self.class.perform_caching && caching_allowed
 
         path = case options
           when Hash

data/lib/action_controller/caching/sweeping.rb

@@ -57,6 +57,7 @@ module ActionController #:nodoc:
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
+          true # before method from sweeper should always return true
         end
 
         def after(controller)

data/lib/action_controller/deprecated/base.rb

@@ -1,33 +1,16 @@
 module ActionController
   class Base
-    class << self
-      def deprecated_config_accessor(option, message = nil)
-        deprecated_config_reader(option, message)
-        deprecated_config_writer(option, message)
+    # Deprecated methods. Wrap them in a module so they can be overwritten by plugins
+    # (like the verify method.)
+    module DeprecatedBehavior #:nodoc:
+      def relative_url_root
+        ActiveSupport::Deprecation.warn "ActionController::Base.relative_url_root is ineffective. " <<
+          "Please stop using it.", caller
       end
 
-      def deprecated_config_reader(option, message = nil)
-        message ||= "Reading #{option} directly from ActionController::Base is deprecated. " \
-                    "Please read it from config.#{option}"
-
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{option}
-            ActiveSupport::Deprecation.warn #{message.inspect}, caller
-            config.#{option}
-          end
-        RUBY
-      end
-
-      def deprecated_config_writer(option, message = nil)
-        message ||= "Setting #{option} directly on ActionController::Base is deprecated. " \
-                    "Please set it on config.action_controller.#{option}"
-
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{option}=(val)
-            ActiveSupport::Deprecation.warn #{message.inspect}, caller
-            config.#{option} = val
-          end
-        RUBY
+      def relative_url_root=
+        ActiveSupport::Deprecation.warn "ActionController::Base.relative_url_root= is ineffective. " <<
+          "Please stop using it.", caller
       end
 
       def consider_all_requests_local
@@ -125,9 +108,7 @@ module ActionController
       def use_accept_header=(val)
         use_accept_header
       end
-    end
 
-    module DeprecatedBehavior
       # This method has been moved to ActionDispatch::Request.filter_parameters
       def filter_parameter_logging(*args, &block)
         ActiveSupport::Deprecation.warn("Setting filter_parameter_logging in ActionController is deprecated and has no longer effect, please set 'config.filter_parameters' in config/application.rb instead", caller)
@@ -146,14 +127,7 @@ module ActionController
 
     extend DeprecatedBehavior
 
-    deprecated_config_writer :session_store
-    deprecated_config_writer :session_options
-    deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it"
-    deprecated_config_accessor :assets_dir
-    deprecated_config_accessor :javascripts_dir
-    deprecated_config_accessor :stylesheets_dir
-
     delegate :consider_all_requests_local, :consider_all_requests_local=,
              :allow_concurrency, :allow_concurrency=, :to => :"self.class"
   end
-end
+end

data/lib/action_controller/metal.rb

@@ -1,6 +1,48 @@
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/object/blank'
+require 'action_dispatch/middleware/stack'
 
 module ActionController
+  # Extend ActionDispatch middleware stack to make it aware of options
+  # allowing the following syntax in controllers:
+  #
+  #   class PostsController < ApplicationController
+  #     use AuthenticationMiddleware, :except => [:index, :show]
+  #   end
+  #
+  class MiddlewareStack < ActionDispatch::MiddlewareStack #:nodoc:
+    class Middleware < ActionDispatch::MiddlewareStack::Middleware #:nodoc:
+      def initialize(klass, *args)
+        options = args.extract_options!
+        @only   = Array(options.delete(:only)).map(&:to_s)
+        @except = Array(options.delete(:except)).map(&:to_s)
+        args << options unless options.empty?
+        super
+      end
+
+      def valid?(action)
+        if @only.present?
+          @only.include?(action)
+        elsif @except.present?
+          !@except.include?(action)
+        else
+          true
+        end
+      end
+    end
+
+    def build(action, app=nil, &block)
+      app  ||= block
+      action = action.to_s
+      raise "MiddlewareStack#build requires an app" unless app
+
+      reverse.inject(app) do |a, middleware|
+        middleware.valid?(action) ?
+          middleware.build(a) : a
+      end
+    end
+  end
+
   # ActionController::Metal provides a way to get a valid Rack application from a controller.
   #
   # In AbstractController, dispatching is triggered directly by calling #process on a new controller.
@@ -91,10 +133,10 @@ module ActionController
     end
 
     class_attribute :middleware_stack
-    self.middleware_stack = ActionDispatch::MiddlewareStack.new
+    self.middleware_stack = ActionController::MiddlewareStack.new
 
     def self.inherited(base)
-      self.middleware_stack = base.middleware_stack.dup
+      base.middleware_stack = self.middleware_stack.dup
       super
     end
 
@@ -120,7 +162,7 @@ module ActionController
     # ==== Returns
     # Proc:: A rack application
     def self.action(name, klass = ActionDispatch::Request)
-      middleware_stack.build do |env|
+      middleware_stack.build(name.to_s) do |env|
         new.dispatch(name, klass.new(env))
       end
     end

data/lib/action_controller/metal/compatibility.rb

@@ -21,8 +21,8 @@ module ActionController
         delegate :default_charset=, :to => "ActionDispatch::Response"
       end
 
-      # cattr_reader :protected_instance_variables
-      cattr_accessor :protected_instance_variables
+      # TODO: Update protected instance variables list
+      config_accessor :protected_instance_variables
       self.protected_instance_variables = %w(@assigns @performed_redirect @performed_render
                                              @variables_added @request_origin @url
                                              @parent_controller @action_name

data/lib/action_controller/metal/helpers.rb

@@ -52,8 +52,8 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      class_attribute :helpers_path
-      self.helpers_path = []
+      config_accessor :helpers_path
+      self.helpers_path ||= []
     end
 
     module ClassMethods
@@ -104,7 +104,7 @@ module ActionController
         def all_application_helpers
           helpers = []
           helpers_path.each do |path|
-            extract  = /^#{Regexp.quote(path)}\/?(.*)_helper.rb$/
+            extract  = /^#{Regexp.quote(path.to_s)}\/?(.*)_helper.rb$/
             helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
           end
           helpers.sort!