actionpack 3.0.20 → 3.1.0.beta1

data/lib/action_controller/metal/testing.rb

@@ -14,18 +14,9 @@ module ActionController
         cookies.write(@_response)
       end
       @_response.prepare!
-      set_test_assigns
       ret
     end
 
-    def set_test_assigns
-      @assigns = {}
-      (instance_variable_names - self.class.protected_instance_variables).each do |var|
-        name, value = var[1..-1], instance_variable_get(var)
-        @assigns[name] = value
-      end
-    end
-
     # TODO : Rewrite tests using controller.headers= to use Rack env
     def headers=(new_headers)
       @_response ||= ActionDispatch::Response.new

data/lib/action_controller/metal/url_for.rb

@@ -2,27 +2,25 @@ module ActionController
   module UrlFor
     extend ActiveSupport::Concern
 
-    include ActionDispatch::Routing::UrlFor
+    include AbstractController::UrlFor
 
     def url_options
-      super.reverse_merge(
-        :host => request.host_with_port,
+      @_url_options ||= super.reverse_merge(
+        :host => request.host,
+        :port => request.optional_port,
         :protocol => request.protocol,
         :_path_segments => request.symbolized_path_parameters
-      ).merge(:script_name => request.script_name)
-    end
-
-    def _routes
-      raise "In order to use #url_for, you must include routing helpers explicitly. " \
-            "For instance, `include Rails.application.routes.url_helpers"
-    end
+      ).freeze
 
-    module ClassMethods
-      def action_methods
-        @action_methods ||= begin
-          super - _routes.named_routes.helper_names
+      if _routes.equal?(env["action_dispatch.routes"])
+        @_url_options.dup.tap do |options|
+          options[:script_name] = request.script_name.dup
+          options.freeze
         end
+      else
+        @_url_options
       end
     end
+
   end
 end

data/lib/action_controller/railtie.rb

@@ -2,35 +2,14 @@ require "rails"
 require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
-require "active_support/deprecation/proxy_wrappers"
-require "active_support/deprecation"
+require "abstract_controller/railties/routes_helpers"
+require "action_controller/railties/paths"
+require "sprockets/railtie"
 
 module ActionController
   class Railtie < Rails::Railtie
     config.action_controller = ActiveSupport::OrderedOptions.new
 
-    config.action_controller.singleton_class.tap do |d|
-      d.send(:define_method, :session) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-
-      d.send(:define_method, :session_store) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session_store=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-    end
-
     initializer "action_controller.logger" do
       ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
     end
@@ -43,24 +22,27 @@ module ActionController
       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
+      options.assets_dir           ||= paths["public"].first
+      options.javascripts_dir      ||= paths["public/javascripts"].first
+      options.stylesheets_dir      ||= paths["public/stylesheets"].first
+      options.page_cache_directory ||= paths["public"].first
+
+      # make sure readers methods get compiled
+      options.asset_path           ||= app.config.asset_path
+      options.asset_host           ||= app.config.asset_host
 
       ActiveSupport.on_load(:action_controller) do
-        include app.routes.url_helpers
+        include app.routes.mounted_helpers
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
+        extend ::ActionController::Railties::Paths.with(app)
         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"
-
-      proxy = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(app.routes, message)
-      ActionController::Routing::Routes = proxy
+    initializer "action_controller.compile_config_methods" do
+      ActiveSupport.on_load(:action_controller) do
+        config.compile_methods! if config.respond_to?(:compile_methods!)
+      end
     end
   end
-end
+end

data/lib/action_controller/railties/paths.rb

@@ -0,0 +1,24 @@
+module ActionController
+  module Railties
+    module Paths
+      def self.with(app)
+        Module.new do
+          define_method(:inherited) do |klass|
+            super(klass)
+
+            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
+              paths = namespace._railtie.paths["app/helpers"].existent
+            else
+              paths = app.config.helpers_paths
+            end
+
+            klass.helpers_path = paths
+            if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
+              klass.helper :all
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/action_controller/record_identifier.rb

@@ -18,18 +18,12 @@ module ActionController
   #     post = Post.find(params[:id])
   #     post.destroy
   #
-  #     respond_to do |format|
-  #       format.html { redirect_to(post) } # Calls polymorphic_url(post) which in turn calls post_url(post)
-  #       format.js do
-  #         # Calls: new Effect.fade('post_45');
-  #         render(:update) { |page| page[post].visual_effect(:fade) }
-  #       end
-  #     end
+  #     redirect_to(post) # Calls polymorphic_url(post) which in turn calls post_url(post)
   #   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
-  # convention and allows you to write less code if you follow it.
+  # 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 expect that
+  # same naming convention and allows you to write less code if you follow it.
   module RecordIdentifier
     extend self
 

data/lib/action_controller/test_case.rb

@@ -1,6 +1,7 @@
 require 'rack/session/abstract/id'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/class/attribute'
 
 module ActionController
   module TemplateAssertions
@@ -134,7 +135,7 @@ module ActionController
     class Result < ::Array #:nodoc:
       def to_s() join '/' end
       def self.new_escaped(strings)
-        new strings.collect {|str| URI.unescape str}
+        new strings.collect {|str| uri_parser.unescape str}
       end
     end
 
@@ -173,6 +174,10 @@ module ActionController
     end
 
     def recycle!
+      write_cookies!
+      @env.delete('HTTP_COOKIE') if @cookies.blank?
+      @env.delete('action_dispatch.cookies')
+      @cookies = nil
       @formats = nil
       @env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
       @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
@@ -196,20 +201,23 @@ module ActionController
     end
   end
 
-  class TestSession < ActionDispatch::Session::AbstractStore::SessionHash #:nodoc:
-    DEFAULT_OPTIONS = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS
+  class TestSession < Rack::Session::Abstract::SessionHash #:nodoc:
+    DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS
 
     def initialize(session = {})
+      @env, @by = nil, nil
       replace(session.stringify_keys)
       @loaded = true
     end
 
-    def exists?; true; end
+    def exists?
+      true
+    end
   end
 
   # Superclass for ActionController functional tests. Functional tests allow you to
   # test a single controller action per test method. This should not be confused with
-  # integration tests (see ActionController::IntegrationTest), which are more like
+  # integration tests (see ActionDispatch::IntegrationTest), which are more like
   # "stories" that can involve multiple controllers and multiple actions (i.e. multiple
   # different HTTP requests).
   #
@@ -254,7 +262,7 @@ module ActionController
   #      after calling +post+. If the various assert methods are not sufficient, then you
   #      may use this object to inspect the HTTP response in detail.
   #
-  # (Earlier versions of Rails required each functional test to subclass
+  # (Earlier versions of \Rails required each functional test to subclass
   # Test::Unit::TestCase and define @controller, @request, @response in +setup+.)
   #
   # == Controller is automatically inferred
@@ -267,7 +275,7 @@ module ActionController
   #     tests WidgetController
   #   end
   #
-  # == Testing controller internals
+  # == \Testing controller internals
   #
   # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
   # can be used against. These collections are:
@@ -275,7 +283,7 @@ module ActionController
   # * assigns: Instance variables assigned in the action that are available for the view.
   # * session: Objects being saved in the session.
   # * flash: The flash objects currently in the session.
-  # * cookies: Cookies being sent to the user on this request.
+  # * cookies: \Cookies being sent to the user on this request.
   #
   # These collections can be used just like any other hash:
   #
@@ -299,9 +307,13 @@ module ActionController
   # and cookies, though. For sessions, you just do:
   #
   #   @request.session[:key] = "value"
-  #   @request.cookies["key"] = "value"
+  #   @request.cookies[:key] = "value"
+  #
+  # To clear the cookies for a test just clear the request's cookies hash:
   #
-  # == Testing named routes
+  #   @request.cookies.clear
+  #
+  # == \Testing named routes
   #
   # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
   # Example:
@@ -324,11 +336,11 @@ module ActionController
 
         def controller_class=(new_class)
           prepare_controller_class(new_class) if new_class
-          write_inheritable_attribute(:controller_class, new_class)
+          self._controller_class = new_class
         end
 
         def controller_class
-          if current_controller_class = read_inheritable_attribute(:controller_class)
+          if current_controller_class = self._controller_class
             current_controller_class
           else
             self.controller_class = determine_default_controller_class(name)
@@ -403,16 +415,18 @@ module ActionController
         parameters ||= {}
         @request.assign_parameters(@routes, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
-        @request.session = ActionController::TestSession.new(session) unless session.nil?
+        @request.session = ActionController::TestSession.new(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
         @request.session["flash"].sweep
 
         @controller.request = @request
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
-        Base.class_eval { include Testing }
+        @controller.class.class_eval { include Testing }
         @controller.process_with_new_base_test(@request, @response)
+        @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?
+        @request.cookies.merge!(@response.cookies)
         @response
       end
 
@@ -426,7 +440,7 @@ module ActionController
 
         @request.env.delete('PATH_INFO')
 
-        if @controller
+        if defined?(@controller) && @controller
           @controller.request = @request
           @controller.params = {}
         end
@@ -440,6 +454,7 @@ module ActionController
       included do
         include ActionController::TemplateAssertions
         include ActionDispatch::Assertions
+        class_attribute :_controller_class
         setup :setup_controller_request_and_response
       end
 
@@ -447,7 +462,7 @@ module ActionController
 
       def build_request_uri(action, parameters)
         unless @request.env["PATH_INFO"]
-          options = @controller.__send__(:url_options).merge(parameters)
+          options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters
           options.update(
             :only_path => true,
             :action => action,
@@ -471,9 +486,11 @@ module ActionController
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
       def self.included(base)
-        base.class_eval do
-          attr_accessor :exception
-          protected :exception, :exception=
+        unless base.method_defined?(:exception) && base.method_defined?(:exception=)
+          base.class_eval do
+            attr_accessor :exception
+            protected :exception, :exception=
+          end
         end
       end
 

data/lib/action_controller/vendor/html-scanner/html/node.rb

@@ -18,14 +18,14 @@ module HTML #:nodoc:
             hash[k] = Conditions.new(v)
           when :children
             hash[k] = v = keys_to_symbols(v)
-            v.each do |k,v2|
-              case k
+            v.each do |key,value|
+              case key
                 when :count, :greater_than, :less_than
                   # keys are valid, and require no further processing
                 when :only
-                  v[k] = Conditions.new(v2)
+                  v[key] = Conditions.new(value)
                 else
-                  raise "illegal key #{k.inspect} => #{v2.inspect}"
+                  raise "illegal key #{key.inspect} => #{value.inspect}"
               end
             end
           else
@@ -156,7 +156,7 @@ module HTML #:nodoc:
           end
 
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[^\s!>\/]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
           name.downcase!
 
           unless closing

data/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute'
 
 module HTML
   class Sanitizer
@@ -60,7 +60,7 @@ module HTML
   class WhiteListSanitizer < Sanitizer
     [:protocol_separator, :uri_attributes, :allowed_attributes, :allowed_tags, :allowed_protocols, :bad_tags,
      :allowed_css_properties, :allowed_css_keywords, :shorthand_css_properties].each do |attr|
-      class_inheritable_accessor attr, :instance_writer => false
+      class_attribute attr, :instance_writer => false
     end
 
     # A regular expression of the valid characters used to separate protocols like
@@ -170,7 +170,7 @@ module HTML
 
     def contains_bad_protocols?(attr_name, value)
       uri_attributes.include?(attr_name) &&
-      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first))
+      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first.downcase))
     end
   end
 end

data/lib/action_controller/vendor/html-scanner/html/selector.rb

@@ -128,6 +128,8 @@ module HTML
   #   (no parent element).
   # * <tt>:empty</tt> -- Match the element only if it has no child elements,
   #   and no text content.
+  # * <tt>:content(string)</tt> -- Match the element only if it has <tt>string</tt>
+  #   as its text content (ignoring leading and trailing whitespace).
   # * <tt>:only-child</tt> -- Match the element if it is the only child (element)
   #   of its parent element.
   # * <tt>:only-of-type</tt> -- Match the element if it is the only child (element)

data/lib/action_dispatch.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2010 David Heinemeier Hansson
+# Copyright (c) 2004-2011 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -53,12 +53,14 @@ module ActionDispatch
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
+    autoload :Reloader
     autoload :RemoteIp
     autoload :Rescue
     autoload :ShowExceptions
     autoload :Static
   end
 
+  autoload :ClosedError, 'action_dispatch/middleware/closed_error'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
   autoload :Routing
 
@@ -85,6 +87,7 @@ module ActionDispatch
   autoload_under 'testing' do
     autoload :Assertions
     autoload :Integration
+    autoload :IntegrationTest, 'action_dispatch/testing/integration'
     autoload :PerformanceTest
     autoload :TestProcess
     autoload :TestRequest