merb-core 0.9.7 → 0.9.8

data/lib/merb-core/test/helpers/multipart_request_helper.rb

@@ -1,5 +1,6 @@
 module Merb::Test::MultipartRequestHelper
   require 'rubygems'
+  gem "mime-types"
   require 'mime/types'
 
   class Param
@@ -129,7 +130,7 @@ module Merb::Test::MultipartRequestHelper
   def multipart_post(path, params = {}, env = {}, &block)
     env[:request_method] = "POST"
     env[:test_with_multipart] = true
-    request(path, params, env, &block)
+    mock_request(path, params, env, &block)
   end
 
   # An HTTP PUT request that operates through the router and uses multipart
@@ -149,7 +150,7 @@ module Merb::Test::MultipartRequestHelper
   def multipart_put(path, params = {}, env = {}, &block)
     env[:request_method] = "PUT"
     env[:test_with_multipart] = true
-    request(path, params, env, &block)
+    mock_request(path, params, env, &block)
   end
   
   # ==== Parameters

data/lib/merb-core/test/helpers/request_helper.rb

@@ -1,393 +1,61 @@
-require 'tempfile'
+require "rack"
 
 module Merb
   module Test
     module RequestHelper
-      # FakeRequest sets up a default enviroment which can be overridden either
-      # by passing and env into initialize or using request['HTTP_VAR'] = 'foo'
-      class FakeRequest < Request
 
-        # ==== Parameters
-        # env<Hash>:: Environment options that override the defaults.
-        # req<StringIO>:: The request to set as input for Rack.
-        def initialize(env = {}, req = StringIO.new)
-          env.environmentize_keys!
-          env['rack.input'] = req
-          super(DEFAULT_ENV.merge(env))
-        end
-
-        private
-        DEFAULT_ENV = Mash.new({
-          'SERVER_NAME' => 'localhost',
-          'PATH_INFO' => '/',
-          'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.0.1) Gecko/20060214 Camino/1.0',
-          'SCRIPT_NAME' => '/',
-          'SERVER_PROTOCOL' => 'HTTP/1.1',
-          'HTTP_CACHE_CONTROL' => 'max-age=0',
-          'HTTP_ACCEPT_LANGUAGE' => 'en,ja;q=0.9,fr;q=0.9,de;q=0.8,es;q=0.7,it;q=0.7,nl;q=0.6,sv;q=0.5,nb;q=0.5,da;q=0.4,fi;q=0.3,pt;q=0.3,zh-Hans;q=0.2,zh-Hant;q=0.1,ko;q=0.1',
-          'HTTP_HOST' => 'localhost',
-          'REMOTE_ADDR' => '127.0.0.1',
-          'SERVER_SOFTWARE' => 'Mongrel 1.1',
-          'HTTP_KEEP_ALIVE' => '300',
-          'HTTP_REFERER' => 'http://localhost/',
-          'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-          'HTTP_VERSION' => 'HTTP/1.1',
-          'REQUEST_URI' => '/',
-          'SERVER_PORT' => '80',
-          'GATEWAY_INTERFACE' => 'CGI/1.2',
-          'HTTP_ACCEPT' => 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
-          'HTTP_CONNECTION' => 'keep-alive',
-          'REQUEST_METHOD' => 'GET'
-        }) unless defined?(DEFAULT_ENV)
+      def describe_request(rack)
+        "a #{rack.original_env[:method] || rack.original_env["REQUEST_METHOD"] || "GET"} to '#{rack.url}'"
       end
 
-      # CookieJar keeps track of cookies in a simple Mash.
-      class CookieJar < Mash
-        
-        # ==== Parameters
-        # request<Merb::Request, Merb::FakeRequest>:: The controller request.
-        def update_from_request(request)
-          request.cookies.each do |key, value|
-            if value.blank?
-              self.delete(key)
-            else
-              self[key] = Merb::Request.unescape(value)
-            end
-          end
-        end
-        
-      end
-
-      # ==== Parameters
-      # env<Hash>:: A hash of environment keys to be merged into the default list.
-      # opt<Hash>:: A hash of options (see below).
-      #
-      # ==== Options (opt)
-      # :post_body<String>:: The post body for the request.
-      # :req<String>::
-      #   The request string. This will only be used if :post_body is left out.
-      #
-      # ==== Returns
-      # FakeRequest:: A Request object that is built based on the parameters.
-      #
-      # ==== Notes
-      # If you pass a post body, the content-type will be set to URL-encoded.
-      #
-      #---
-      # @public
-      def fake_request(env = {}, opt = {})
-        if opt[:post_body]
-          req = opt[:post_body]
-          env[:content_type] ||= "application/x-www-form-urlencoded"
+      def describe_input(input)
+        if input.respond_to?(:controller_name)
+          "#{input.controller_name}##{input.action_name}"
+        elsif input.respond_to?(:original_env)
+          describe_request(input)
         else
-          req = opt[:req]
+          input
         end
-        FakeRequest.new(env, StringIO.new(req || ''))
-      end
-
-      # Dispatches an action to the given class. This bypasses the router and is
-      # suitable for unit testing of controllers.
-      #
-      # ==== Parameters
-      # controller_klass<Controller>::
-      #   The controller class object that the action should be dispatched to.
-      # action<Symbol>:: The action name, as a symbol.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see +fake_request+), including :req or :post_body
-      #   for setting the request body itself.
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #
-      # ==== Example
-      #   dispatch_to(MyController, :create, :name => 'Homer' ) do |controller|
-      #     controller.stub!(:current_user).and_return(@user)
-      #   end
-      #
-      # ==== Notes
-      # Does not use routes.
-      #
-      #---
-      # @public
-      def dispatch_to(controller_klass, action, params = {}, env = {}, &blk)
-        params = merge_controller_and_action(controller_klass, action, params)
-        dispatch_request(build_request(params, env), controller_klass, action.to_s, &blk)
       end
       
-      # Keep track of cookie values in CookieJar within the context of the
-      # block; you need to set this up for secific controllers.
-      #
-      # ==== Parameters
-      # *controller_classes:: Controller classes to operate on in the context of the block.
-      # &blk:: The context to operate on; optionally accepts the cookie jar as an argument.
-      def with_cookies(*controller_classes, &blk)
-        cookie_jar = CookieJar.new
-        before_cb = lambda { |c| c.cookies.update(cookie_jar) }
-        after_cb  = lambda { |c| cookie_jar.update_from_request(c.request) }
-        controller_classes.each do |klass|
-          klass._before_dispatch_callbacks << before_cb
-          klass._after_dispatch_callbacks  << after_cb
-        end
-        blk.arity == 1 ? blk.call(cookie_jar) : blk.call
-        controller_classes.each do |klass|
-          klass._before_dispatch_callbacks.delete before_cb
-          klass._after_dispatch_callbacks.delete after_cb
-        end
-      end
-
-      # Dispatches an action to the given class and using HTTP Basic Authentication
-      # This bypasses the router and is suitable for unit testing of controllers.
-      #
-      # ==== Parameters
-      # controller_klass<Controller>::
-      #   The controller class object that the action should be dispatched to.
-      # action<Symbol>:: The action name, as a symbol.
-      # username<String>:: The username.
-      # password<String>:: The password.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see +fake_request+), including :req or :post_body
-      #   for setting the request body itself.
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #
-      # ==== Example
-      #   dispatch_with_basic_authentication_to(MyController, :create, 'Fred', 'secret', :name => 'Homer' ) do |controller|
-      #     controller.stub!(:current_user).and_return(@user)
-      #   end
-      #
-      # ==== Notes
-      # Does not use routes.
-      #
-      #---
-      # @public
-      def dispatch_with_basic_authentication_to(controller_klass, action, username, password, params = {}, env = {}, &blk)
-        env["X_HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("#{username}:#{password}")}"
-        
-        params = merge_controller_and_action(controller_klass, action, params)        
-        dispatch_request(build_request(params, env), controller_klass, action.to_s, &blk)
-      end
-      
-      def merge_controller_and_action(controller_klass, action, params)
-        params[:controller] = controller_klass.name.to_const_path
-        params[:action]     = action.to_s
-        
-        params
-      end
-
-      # Prepares and returns a request suitable for dispatching with
-      # dispatch_request. If you don't need to modify the request
-      # object before dispatching (e.g. to add cookies), you probably
-      # want to use dispatch_to instead.
-      #
-      # ==== Parameters
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see +fake_request+), including :req or :post_body
-      #   for setting the request body itself.
-      #
-      # ==== Example
-      #   req = build_request(:id => 1)
-      #   req.cookies['app_cookie'] = "testing"
-      #   dispatch_request(req, MyController, :edit)
-      #
-      # ==== Notes
-      # Does not use routes.
-      #
-      #---
-      # @public      
-      def build_request(params = {}, env = {})
-        params             = Merb::Request.params_to_query_string(params)
-
-        query_string = env[:query_string] || env['QUERY_STRING']
-        env[:query_string] = query_string ? "#{query_string}&#{params}" : params
-        
-        post_body = env[:post_body] || env['POST_BODY']
-        fake_request(env, { :post_body => post_body, :req => env[:req] })
+      def status_code(input)
+        input.respond_to?(:status) ? input.status : input
       end
 
-      # An HTTP GET request that operates through the router.
-      #
-      # ==== Parameters
-      # path<String>:: The path that should go to the router as the request uri.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see +fake_request+).
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #---
-      # @public      
-      def get(path, params = {}, env = {}, &block)
-        env[:request_method] = "GET"
-        request(path, params, env, &block)
-      end
-
-      # An HTTP POST request that operates through the router.
-      #
-      # ==== Parameters
-      # path<String>:: The path that should go to the router as the request uri.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see fake_request).
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #---
-      # @public      
-      def post(path, params = {}, env = {}, &block)
-        env[:request_method] = "POST"
-        request(path, params, env, &block)
-      end
-
-      # An HTTP PUT request that operates through the router.
-      #
-      # ==== Parameters
-      # path<String>:: The path that should go to the router as the request uri.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see fake_request).
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #---
-      # @public      
-      def put(path, params = {}, env = {}, &block)
-        env[:request_method] = "PUT"
-        request(path, params, env, &block)
-      end
+      def request(uri, env = {})
+        uri = url(uri) if uri.is_a?(Symbol)    
 
-      # An HTTP DELETE request that operates through the router
-      #
-      # ==== Parameters
-      # path<String>:: The path that should go to the router as the request uri.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see fake_request).
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #---
-      # @public
-      def delete(path, params = {}, env = {}, &block)
-        env[:request_method] = "DELETE"
-        request(path, params, env, &block)
-      end
-
-      # A generic request that checks the router for the controller and action.
-      # This request goes through the Merb::Router and finishes at the controller.
-      #
-      # ==== Parameters
-      # path<String>:: The path that should go to the router as the request uri.
-      # params<Hash>::
-      #   An optional hash that will end up as params in the controller instance.
-      # env<Hash>::
-      #   An optional hash that is passed to the fake request. Any request options
-      #   should go here (see +fake_request+).
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #
-      # ==== Example
-      #   request(path, { :name => 'Homer' }, { :request_method => "PUT" }) do |controller|
-      #     controller.stub!(:current_user).and_return(@user)
-      #   end
-      #
-      # ==== Notes
-      # Uses Routes.
-      #
-      #---
-      # @semi-public
-      def request(path, params = {}, env= {}, &block)
-        env[:request_method] ||= "GET"
-        env[:request_uri], env[:query_string] = path.split('?')
-        
-        multipart = env.delete(:test_with_multipart)
-
-        request = build_request(params, env)
+        if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST")
+          params = env.delete(:body_params) if env.key?(:body_params)
+          params = env.delete(:params) if env.key?(:params) && !env.key?(:input)
+          
+          unless env.key?(:input)
+            env[:input] = Merb::Request.params_to_query_string(params)
+            env["CONTENT_TYPE"] = "application/x-www-form-urlencoded"
+          end
+        end
 
-        opts = check_request_for_route(request) # Check that the request will be routed correctly
-        controller_name = (opts[:namespace] ? opts.delete(:namespace) + '/' : '') + opts.delete(:controller)
-        klass = Object.full_const_get(controller_name.snake_case.to_const_string)
-        
-        action = opts.delete(:action).to_s
-        params.merge!(opts)
+        if env[:params]
+          uri << "&#{Merb::Request.params_to_query_string(env.delete(:body_params))}"
+        end
 
-        multipart.nil? ? dispatch_to(klass, action, params, env, &block) : dispatch_multipart_to(klass, action, params, env, &block)
-      end
+        if @__cookie__
+          env["HTTP_COOKIE"] = @__cookie__
+        end
 
+        app = Merb::Rack::Application.new
+        rack = app.call(::Rack::MockRequest.env_for(uri, env))
 
-      # The workhorse for the dispatch*to helpers.
-      #
-      # ==== Parameters
-      # request<Merb::Test::RequestHelper::FakeRequest, Merb::Request>::
-      #   A request object that has been setup for testing.
-      # controller_klass<Merb::Controller>::
-      #   The class object off the controller to dispatch the action to.
-      # action<Symbol>:: The action to dispatch the request to.
-      # &blk::
-      #   The controller is yielded to the block provided for actions *prior* to
-      #   the action being dispatched.
-      #
-      # ==== Returns
-      # An instance of +controller_klass+ based on the parameters.
-      #
-      # ==== Notes
-      # Does not use routes.
-      #
-      #---
-      # @public
-      def dispatch_request(request, controller_klass, action, &blk)
-        controller = controller_klass.new(request)
-        yield controller if block_given?
-        controller._dispatch(action)
+        rack = Struct.new(:status, :headers, :body, :url, :original_env).
+          new(rack[0], rack[1], rack[2], uri, env)
 
-        Merb.logger.info controller._benchmarks.inspect
-        Merb.logger.flush
+        @__cookie__ = rack.headers["Set-Cookie"] && rack.headers["Set-Cookie"].join
 
-        controller
+        rack
       end
-
-      # Checks to see that a request is routable.
-      #
-      # ==== Parameters
-      # request<Merb::Test::RequestHelper::FakeRequest, Merb::Request>::
-      #   The request object to inspect.
-      #
-      # ==== Raises
-      # Merb::ControllerExceptions::BadRequest::
-      #   No matching route was found.
-      #
-      # ==== Returns
-      # Hash:: The parameters built based on the matching route.
-      #
-      #---
-      # @semi-public
-      def check_request_for_route(request)
-        match =  ::Merb::Router.match(request)
-        if match[0].nil? && match[1].empty?
-          raise ::Merb::ControllerExceptions::BadRequest, "No routes match the request"
-        else
-          match[1]
-        end
-      end # check_request_for_route
-    end # RequestHelper
-  end # Test
-end # Merb
+      alias requesting request
+      alias response_for request
+      
+    end
+  end
+end