actionpack 3.0.20 → 3.1.0.beta1

data/lib/action_dispatch/testing/integration.rb

@@ -1,6 +1,7 @@
 require 'stringio'
 require 'uri'
 require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/object/try'
 require 'rack/test'
 require 'test/unit/assertions'
@@ -26,31 +27,31 @@ module ActionDispatch
       # object's <tt>@response</tt> instance variable will point to the same
       # response object.
       #
-      # You can also perform POST, PUT, DELETE, and HEAD requests with +post+,
-      # +put+, +delete+, and +head+.
+      # You can also perform POST, PUT, DELETE, and HEAD requests with +#post+,
+      # +#put+, +#delete+, and +#head+.
       def get(path, parameters = nil, headers = nil)
         process :get, path, parameters, headers
       end
 
-      # Performs a POST request with the given parameters. See get() for more
+      # Performs a POST request with the given parameters. See +#get+ for more
       # details.
       def post(path, parameters = nil, headers = nil)
         process :post, path, parameters, headers
       end
 
-      # Performs a PUT request with the given parameters. See get() for more
+      # Performs a PUT request with the given parameters. See +#get+ for more
       # details.
       def put(path, parameters = nil, headers = nil)
         process :put, path, parameters, headers
       end
 
-      # Performs a DELETE request with the given parameters. See get() for
+      # Performs a DELETE request with the given parameters. See +#get+ for
       # more details.
       def delete(path, parameters = nil, headers = nil)
         process :delete, path, parameters, headers
       end
 
-      # Performs a HEAD request with the given parameters. See get() for more
+      # Performs a HEAD request with the given parameters. See +#get+ for more
       # details.
       def head(path, parameters = nil, headers = nil)
         process :head, path, parameters, headers
@@ -59,7 +60,7 @@ module ActionDispatch
       # Performs an XMLHttpRequest request with the given parameters, mirroring
       # a request from the Prototype library.
       #
-      # The request_method is :get, :post, :put, :delete or :head; the
+      # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
       # parameters are +nil+, a hash, or a url-encoded or multipart string;
       # the headers are a hash.  Keys are automatically upcased and prefixed
       # with 'HTTP_' if not already.
@@ -171,6 +172,7 @@ module ActionDispatch
 
       # Create and initialize a new Session instance.
       def initialize(app)
+        super()
         @app = app
 
         # If the app is a Rails app, make url_helpers available on the session
@@ -182,6 +184,7 @@ module ActionDispatch
         reset!
       end
 
+      remove_method :default_url_options
       def default_url_options
         { :host => host, :protocol => https? ? "https" : "http" }
       end
@@ -233,9 +236,7 @@ module ActionDispatch
       # Set the host name to use in the next request.
       #
       #   session.host! "www.example.com"
-      def host!(name)
-        @host = name
-      end
+      alias :host! :host=
 
       private
         def _mock_session
@@ -243,7 +244,8 @@ module ActionDispatch
         end
 
         # Performs the actual request.
-        def process(method, path, parameters = nil, rack_environment = nil)
+        def process(method, path, parameters = nil, env = nil)
+          env ||= {}
           if path =~ %r{://}
             location = URI.parse(path)
             https! URI::HTTPS === location if location.scheme
@@ -259,7 +261,7 @@ module ActionDispatch
 
           hostname, port = host.split(':')
 
-          env = {
+          default_env = {
             :method => method,
             :params => parameters,
 
@@ -277,9 +279,7 @@ module ActionDispatch
 
           session = Rack::Test::Session.new(_mock_session)
 
-          (rack_environment || {}).each do |key, value|
-            env[key] = value
-          end
+          env.reverse_merge!(default_env)
 
           # NOTE: rack-test v0.5 doesn't build a default uri correctly
           # Make sure requested path is always a full uri
@@ -307,7 +307,7 @@ module ActionDispatch
       include ActionDispatch::Assertions
 
       def app
-        @app
+        @app ||= nil
       end
 
       # Reset the current session. This is useful for testing multiple sessions
@@ -319,10 +319,10 @@ module ActionDispatch
       %w(get post put head delete cookies assigns
          xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
         define_method(method) do |*args|
-          reset! unless @integration_session
+          reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless %w(cookies assigns).include?(method)
-          @integration_session.__send__(method, *args).tap do
+          @html_document = nil unless method.in?(["cookies", "assigns"])
+          integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
         end
@@ -347,7 +347,7 @@ module ActionDispatch
       # Copy the instance variables from the current session instance into the
       # test instance.
       def copy_session_variables! #:nodoc:
-        return unless @integration_session
+        return unless integration_session
         %w(controller response request).each do |var|
           instance_variable_set("@#{var}", @integration_session.__send__(var))
         end
@@ -357,25 +357,34 @@ module ActionDispatch
       include ActionDispatch::Routing::UrlFor
 
       def url_options
-        reset! unless @integration_session
-        @integration_session.url_options
+        reset! unless integration_session
+        integration_session.url_options
+      end
+
+      def respond_to?(method, include_private = false)
+        integration_session.respond_to?(method, include_private) || super
       end
 
       # Delegate unhandled messages to the current session instance.
       def method_missing(sym, *args, &block)
-        reset! unless @integration_session
-        if @integration_session.respond_to?(sym)
-          @integration_session.__send__(sym, *args, &block).tap do
+        reset! unless integration_session
+        if integration_session.respond_to?(sym)
+          integration_session.__send__(sym, *args, &block).tap do
             copy_session_variables!
           end
         else
           super
         end
       end
+
+      private
+        def integration_session
+          @integration_session ||= nil
+        end
     end
   end
 
-  # An test that spans multiple controllers and actions,
+  # An integration test spans multiple controllers and actions,
   # tying them all together to ensure they work together as expected. It tests
   # more completely than either unit or functional tests do, exercising the
   # entire stack, from the dispatcher to the database.
@@ -385,7 +394,7 @@ module ActionDispatch
   #
   #   require "test_helper"
   #
-  #   class ExampleTest < ActionController::IntegrationTest
+  #   class ExampleTest < ActionDispatch::IntegrationTest
   #     fixtures :people
   #
   #     def test_login
@@ -409,7 +418,7 @@ module ActionDispatch
   #
   #   require "test_helper"
   #
-  #   class AdvancedTest < ActionController::IntegrationTest
+  #   class AdvancedTest < ActionDispatch::IntegrationTest
   #     fixtures :people, :rooms
   #
   #     def test_login_and_speak

data/lib/action_dispatch/testing/performance_test.rb

@@ -1,5 +1,4 @@
 require 'active_support/testing/performance'
-require 'active_support/testing/default'
 
 begin
   module ActionDispatch
@@ -11,9 +10,8 @@ begin
     # formats are written, so you'll have two output files per test method.
     class PerformanceTest < ActionDispatch::IntegrationTest
       include ActiveSupport::Testing::Performance
-      include ActiveSupport::Testing::Default
     end
   end
 rescue NameError
   $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
-end
+end

data/lib/action_dispatch/testing/test_process.rb

@@ -22,7 +22,7 @@ module ActionDispatch
     end
 
     def cookies
-      @request.cookies.merge(@response.cookies)
+      @request.cookies.merge(@response.cookies).with_indifferent_access
     end
 
     def redirect_to_url

data/lib/action_dispatch/testing/test_request.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/reverse_merge'
+require 'rack/utils'
 
 module ActionDispatch
   class TestRequest < Request
@@ -10,9 +11,10 @@ module ActionDispatch
     end
 
     def initialize(env = {})
-      env = Rails.application.env_defaults.merge(env) if defined?(Rails.application)
+      env = Rails.application.env_config.merge(env) if defined?(Rails.application)
       super(DEFAULT_ENV.merge(env))
 
+      @cookies = nil
       self.host        = 'test.host'
       self.remote_addr = '0.0.0.0'
       self.user_agent  = 'Rails Testing'
@@ -66,7 +68,7 @@ module ActionDispatch
 
     def accept=(mime_types)
       @env.delete('action_dispatch.request.accepts')
-      @env['HTTP_ACCEPT'] = Array(mime_types).collect { |mime_types| mime_types.to_s }.join(",")
+      @env['HTTP_ACCEPT'] = Array(mime_types).collect { |mime_type| mime_type.to_s }.join(",")
     end
 
     def cookies
@@ -76,10 +78,14 @@ module ActionDispatch
     private
       def write_cookies!
         unless @cookies.blank?
-          @env['HTTP_COOKIE'] = @cookies.map { |name, value| "#{name}=#{value};" }.join(' ')
+          @env['HTTP_COOKIE'] = @cookies.map { |name, value| escape_cookie(name, value) }.join('; ')
         end
       end
 
+      def escape_cookie(name, value)
+        "#{Rack::Utils.escape(name)}=#{Rack::Utils.escape(value)}"
+      end
+
       def delete_nil_values!
         @env.delete_if { |k, v| v.nil? }
       end

data/lib/action_dispatch/testing/test_response.rb

@@ -14,123 +14,16 @@ module ActionDispatch
       end
     end
 
-    module DeprecatedHelpers
-      def template
-        ActiveSupport::Deprecation.warn("response.template has been deprecated. Use controller.template instead", caller)
-        @template
-      end
-      attr_writer :template
-
-      def session
-        ActiveSupport::Deprecation.warn("response.session has been deprecated. Use request.session instead", caller)
-        @request.session
-      end
-
-      def assigns
-        ActiveSupport::Deprecation.warn("response.assigns has been deprecated. Use controller.assigns instead", caller)
-        @template.controller.assigns
-      end
-
-      def layout
-        ActiveSupport::Deprecation.warn("response.layout has been deprecated. Use template.layout instead", caller)
-        @template.layout
-      end
-
-      def redirected_to
-        ::ActiveSupport::Deprecation.warn("response.redirected_to is deprecated. Use response.redirect_url instead", caller)
-        redirect_url
-      end
-
-      def redirect_url_match?(pattern)
-        ::ActiveSupport::Deprecation.warn("response.redirect_url_match? is deprecated. Use assert_match(/foo/, response.redirect_url) instead", caller)
-        return false if redirect_url.nil?
-        p = Regexp.new(pattern) if pattern.class == String
-        p = pattern if pattern.class == Regexp
-        return false if p.nil?
-        p.match(redirect_url) != nil
-      end
-
-      # Returns the template of the file which was used to
-      # render this response (or nil)
-      def rendered
-        ActiveSupport::Deprecation.warn("response.rendered has been deprecated. Use template.rendered instead", caller)
-        @template.instance_variable_get(:@_rendered)
-      end
-
-      # A shortcut to the flash. Returns an empty hash if no session flash exists.
-      def flash
-        ActiveSupport::Deprecation.warn("response.flash has been deprecated. Use request.flash instead", caller)
-        request.session['flash'] || {}
-      end
-
-      # Do we have a flash?
-      def has_flash?
-        ActiveSupport::Deprecation.warn("response.has_flash? has been deprecated. Use flash.any? instead", caller)
-        !flash.empty?
-      end
-
-      # Do we have a flash that has contents?
-      def has_flash_with_contents?
-        ActiveSupport::Deprecation.warn("response.has_flash_with_contents? has been deprecated. Use flash.any? instead", caller)
-        !flash.empty?
-      end
-
-      # Does the specified flash object exist?
-      def has_flash_object?(name=nil)
-        ActiveSupport::Deprecation.warn("response.has_flash_object? has been deprecated. Use flash[name] instead", caller)
-        !flash[name].nil?
-      end
-
-      # Does the specified object exist in the session?
-      def has_session_object?(name=nil)
-        ActiveSupport::Deprecation.warn("response.has_session_object? has been deprecated. Use session[name] instead", caller)
-        !session[name].nil?
-      end
-
-      # A shortcut to the template.assigns
-      def template_objects
-        ActiveSupport::Deprecation.warn("response.template_objects has been deprecated. Use template.assigns instead", caller)
-        @template.assigns || {}
-      end
-
-      # Does the specified template object exist?
-      def has_template_object?(name=nil)
-        ActiveSupport::Deprecation.warn("response.has_template_object? has been deprecated. Use tempate.assigns[name].nil? instead", caller)
-        !template_objects[name].nil?
-      end
-
-      # Returns binary content (downloadable file), converted to a String
-      def binary_content
-        ActiveSupport::Deprecation.warn("response.binary_content has been deprecated. Use response.body instead", caller)
-        body
-      end
-    end
-    include DeprecatedHelpers
-
     # Was the response successful?
-    def success?
-      (200..299).include?(response_code)
-    end
+    alias_method :success?, :successful?
 
     # Was the URL not found?
-    def missing?
-      response_code == 404
-    end
+    alias_method :missing?, :not_found?
 
     # Were we redirected?
-    def redirect?
-      (300..399).include?(response_code)
-    end
+    alias_method :redirect?, :redirection?
 
     # Was there a server-side error?
-    def error?
-      (500..599).include?(response_code)
-    end
-    alias_method :server_error?, :error?
-
-    # Was there a client client?
-    def client_error?
-      (400..499).include?(response_code)
-    end
+    alias_method :error?, :server_error?
   end
 end

data/lib/action_pack.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

data/lib/action_pack/version.rb

@@ -1,9 +1,9 @@
 module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 20
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view.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
@@ -21,9 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
 require 'active_support/ruby/shim'
 require 'active_support/core_ext/class/attribute_accessors'
 
@@ -33,34 +30,52 @@ module ActionView
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :Base
     autoload :Context
-    autoload :Template
     autoload :Helpers
+    autoload :LookupContext
+    autoload :PathSet
+    autoload :Template
+    autoload :TestCase
 
-    autoload_under "render" do
-      autoload :Layouts
-      autoload :Partials
-      autoload :Rendering
+    autoload_under "renderer" do
+      autoload :Renderer
+      autoload :AbstractRenderer
+      autoload :PartialRenderer
+      autoload :TemplateRenderer
+      autoload :StreamingTemplateRenderer
     end
 
-    autoload :Base
-    autoload :LookupContext
-    autoload :Resolver,           'action_view/template/resolver'
-    autoload :PathResolver,       'action_view/template/resolver'
-    autoload :FileSystemResolver, 'action_view/template/resolver'
-    autoload :PathSet,            'action_view/paths'
+    autoload_at "action_view/template/resolver" do
+      autoload :Resolver
+      autoload :PathResolver
+      autoload :FileSystemResolver
+      autoload :FallbackFileSystemResolver
+    end
 
-    autoload :MissingTemplate,    'action_view/template/error'
-    autoload :ActionViewError,    'action_view/template/error'
-    autoload :EncodingError,      'action_view/template/error'
-    autoload :TemplateError,      'action_view/template/error'
-    autoload :WrongEncodingError, 'action_view/template/error'
+    autoload_at "action_view/buffers" do
+      autoload :OutputBuffer
+      autoload :StreamingBuffer
+    end
 
-    autoload :TemplateHandler,   'action_view/template'
-    autoload :TemplateHandlers,  'action_view/template'
-  end
+    autoload_at "action_view/flows" do
+      autoload :OutputFlow
+      autoload :StreamingFlow
+    end
 
-  autoload :TestCase, 'action_view/test_case'
+    autoload_at "action_view/template/error" do
+      autoload :MissingTemplate
+      autoload :ActionViewError
+      autoload :EncodingError
+      autoload :TemplateError
+      autoload :WrongEncodingError
+    end
+
+    autoload_at "action_view/template" do
+      autoload :TemplateHandler
+      autoload :TemplateHandlers
+    end
+  end
 
   ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
 end