lib/merb-core/dispatch/default_exception/default_exception.rb lib/merb-core/dispatch/default_exception/views/_css.html.erb lib/merb-core/dispatch/default_exception/views/_javascript.html.erb lib/merb-core/dispatch/default_exception/views/index.html.erb @@ -20,8 +20,6 @@ class Merb::Controller < Merb::AbstractController include Merb::ControllerMixin include Merb::AuthenticationMixin - attr_accessor :route - class << self # ==== Parameters @@ -202,6 +200,7 @@ class Merb::Controller < Merb::AbstractController raise ActionNotFound, "Action '#{action}' was not found in #{self.class}" end @_benchmarks[:action_time] = Time.now - start + self end attr_reader :request, :headers @@ -242,6 +241,15 @@ class Merb::Controller < Merb::AbstractController # Hash:: The session that was extracted from the request object. def session() request.session end + # The results of the controller's render, to be returned to Rack. + # + # ==== Returns + # Array[Integer, Hash, String]:: + # The controller's status code, headers, and body + def rack_response + [status, headers, body] + end + # Hide any methods that may have been exposed as actions before. hide_action(*_callable_methods) @@ -258,8 +266,8 @@ class Merb::Controller < Merb::AbstractController end end -module Merb::ExceptionsHelper - def humanize_exception(e) - e.class.name.split("::").last.gsub(/([a-z])([A-Z])/, '\1 \2') - end -end +# module Merb::ExceptionsHelper +# def humanize_exception(e) +# e.class.name.split("::").last.gsub(/([a-z])([A-Z])/, '\1 \2') +# end +# end lib/merb-core/controller/merb_controller.rb @@ -216,26 +216,40 @@ module Kernel # [ 124, " @suspend_next = false", false ] # ] def __caller_lines__(file, line, size = 4) - return [['Template Error!', "problem while rendering", false]] if file =~ /\(erubis\)/ - lines = File.readlines(file) - current = line.to_i - 1 - - first = current - size - first = first < 0 ? 0 : first - - last = current + size - last = last > lines.size ? lines.size : last - - log = lines[first..last] - - area = [] - - log.each_with_index do |line, index| - index = index + first + 1 - area << [index, line.chomp, index == current + 1] + line = line.to_i + if file =~ /\(erubis\)/ + yield :error, "Template Error! Problem while rendering", false + elsif !File.file?(file) || !File.readable?(file) + yield :error, "File `#{file}' not available", false + else + lines = File.read(file).split("\n") + first_line = (f = line - size - 1) < 0 ? 0 : f + lines = lines[first_line, size * 2 + 1] + + lines.each_with_index do |str, index| + yield index + line - size, str.chomp + end end - - area + # + # lines = File.readlines(file) + # current = line.to_i - 1 + # + # first = current - size + # first = first < 0 ? 0 : first + # + # last = current + size + # last = last > lines.size ? lines.size : last + # + # log = lines[first..last] + # + # area = [] + # + # log.each_with_index do |line, index| + # index = index + first + 1 + # area << [index, line.chomp, index == current + 1] + # end + # + # area end # Takes a block, profiles the results of running the block lib/merb-core/core_ext/kernel.rb @@ -1,7 +1,6 @@ +require Merb.framework_root / "merb-core" / "dispatch" / "default_exception" / "default_exception" module Merb class Dispatcher - DEFAULT_ERROR_TEMPLATE = File.expand_path(File.dirname(__FILE__) / 'exceptions.html') - class << self include Merb::ControllerExceptions @@ -16,36 +15,26 @@ module Merb Merb::Dispatcher.use_mutex = ::Merb::Config[:use_mutex] - # This is where we grab the incoming request REQUEST_URI and use that in - # the merb RouteMatcher to determine which controller and method to run. - # Returns a 2 element tuple of: [controller, action] - # - # ControllerExceptions are rescued here and redispatched. + # Dispatch the rack environment. ControllerExceptions are rescued here + # and redispatched. # # ==== Parameters # rack_env<Rack::Environment>:: # The rack environment, which is used to instantiate a Merb::Request - # response<IO>:: - # An IO object to hold the response # # ==== Returns - # Array[Merb::Controller, Symbol]:: - # An array containing the Merb::Controller and the action that was - # dispatched to. - def handle(rack_env) + # Merb::Controller:: + # The Merb::Controller that was dispatched to + def handle(request) start = Time.now Merb.logger.info "Started request handling: #{start.to_s}" - request = Merb::Request.new(rack_env) - - route, params = Merb::Router.route_for(request) - return redirect(request, route) if route.redirects? - request.route_params = params - + request.find_route + return redirect(request) if request.redirects? + klass = request.controller - - Merb.logger.debug("Routed to: #{params.inspect}") - + Merb.logger.debug("Routed to: #{request.params.inspect}") + unless klass < Controller raise NotFound, "Controller '#{klass}' not found.\n" << @@ -59,13 +48,13 @@ module Merb end # TODO: move fixation logic to session loading - controller = dispatch_action(klass, request, route) + controller = dispatch_action(klass, request.params[:action], request) controller._benchmarks[:dispatch_time] = Time.now - start Merb.logger.info controller._benchmarks.inspect Merb.logger.flush controller rescue Object => exception - dispatch_exception(request, exception, route) + dispatch_exception(exception, request) end # def handle(rack_env) @@ -160,19 +149,16 @@ module Merb # action<Symbol>:: The action to dispatch. # request<Merb::Request>:: # The Merb::Request object that was created in #handle - # response<IO>:: The response object passed in from Mongrel # status<Integer>:: The status code to respond with. # # ==== Returns - # Array[Merb::Controller, Symbol]:: - # An array containing the Merb::Controller and the action that was - # dispatched to. - def dispatch_action(klass, request, route, status=200) + # Merb::Controller:: + # The Merb::Controller that was dispatched to. + def dispatch_action(klass, action, request, status=200) # build controller controller = klass.new(request, status) - controller.route = route if use_mutex - @@mutex.synchronize { controller._dispatch(request.params[:action]) } + @@mutex.synchronize { controller._dispatch(action) } else controller._dispatch(request.params[:action]) end @@ -184,54 +170,40 @@ module Merb # # You can handle exceptions by implementing actions for specific # exceptions such as not_found or for entire classes of exceptions - # such as client_error - # - # If it is not available then just render a simple text error. + # such as client_error. You can also implement handlers for + # exceptions outside the Merb exception hierarchy (e.g. + # StandardError is caught in standard_error). # # ==== Parameters # request<Merb::Request>:: # The request object associated with the failed request. - # response<IO>:: - # The response object to put the response into. # exception<Object>:: # The exception object that was created when trying to dispatch the # original controller. # # ==== Returns - # Array[Merb::Controller, String]:: - # An array containing the Merb::Controller and the name of the exception - # that triggrered #dispatch_exception. For instance, a NotFound exception - # will be "not_found". - def dispatch_exception(request, exception, route) + # Exceptions:: + # The Merb::Controller that was dispatched to. + def dispatch_exception(exception, request) Merb.logger.error(Merb.exception(exception)) - exception_klass = exception.class - exceptions = [exception] - request.exception_details = { - :params => request.params ? request.params.dup : {}, - :session => request.session || {}, - :cookies => request.cookies || {}, - } - + request.exceptions = [exception] + begin - e = exceptions.first - klass = Object.const_defined?("Exceptions") ? Exceptions : Controller - klass.send(:include, Merb::ExceptionsHelper) - request.exception_details[:exceptions] = exceptions + e = request.exceptions.first if action_name = e.action_name - request.params[:action] = action_name - dispatch_action(klass, request, route, e.class.status) + dispatch_action(Exceptions, action_name, request, e.class.status) else - dispatch_default_exception(klass, request, exceptions) + dispatch_default_exception(request, e.class.status) end rescue Object => dispatch_issue if e.same?(dispatch_issue) - dispatch_default_exception(klass, request, exceptions) + dispatch_default_exception(request, e.class.status) else Merb.logger.error("Dispatching #{e.class} raised another error.") Merb.logger.error(Merb.exception(dispatch_issue)) - exceptions.unshift dispatch_issue + request.exceptions.unshift dispatch_issue retry end end @@ -241,32 +213,16 @@ module Merb # will end up here for processing # # ==== Parameters - # klass<Merb::Controller>:: - # The class of the controller to use for exception dispatch. # request<Merb::Request>:: # The Merb request that produced the original error. - # response<IO>:: - # The response object that the response will be put into. - # e<Exception>:: - # The exception that caused #dispatch_exception to be called. + # status<Integer>:: + # The status code to return with the Exception. # # ==== Returns - # Array[Merb::Controller, String]:: - # An array containing the Merb::Controller that was dispatched to and the - # error's name. For instance, a NotFound error's name is "not_found". - def dispatch_default_exception(klass, request, exceptions) - e = exceptions.first - controller = klass.new(request, e.class.status) - if e.is_a? Redirection - controller.headers.merge!('Location' => e.message) - controller.body = - "<html><body>You are being <a href=\"#{e.message}\">redirected</a>.</body></html>" - else - controller.instance_variable_set("@exceptions", exceptions) - controller.body = controller.send( - Merb::Template.template_for(DEFAULT_ERROR_TEMPLATE)) - end - controller + # Merb::Dispatcher::DefaultException:: + # The DefaultException that was dispatched to. + def dispatch_default_exception(request, status) + Merb::Dispatcher::DefaultException.new(request, status)._dispatch end # Set up a faux controller to do redirection from the router @@ -274,7 +230,10 @@ module Merb # ==== Parameters # request<Merb::Request>:: # The Merb::Request object that was created in #handle - # route<Merb::Router::Route>:: Matched route object + # status<Integer>:: + # The status code to return with the controller + # url<String>:: + # The URL to return # # ==== Example # r.match("/my/old/crusty/url").redirect("http://example.com/index.html") @@ -282,9 +241,8 @@ module Merb # ==== Returns # Merb::Controller:: # Merb::Controller set with redirect headers and a 301/302 status - def redirect(request, route) - status, url = route.redirect_details - + def redirect(request) + status, url = request.redirect_status, request.redirect_url controller = Merb::Controller.new(request, status) Merb.logger.info("Dispatcher redirecting to: #{url} (#{status})") lib/merb-core/dispatch/dispatcher.rb @@ -4,7 +4,7 @@ module Merb class Request # def env def session def route_params - attr_accessor :env, :session, :exception_details + attr_accessor :env, :session, :exceptions, :route attr_reader :route_params # by setting these to false, auto-parsing is disabled; this way you can @@ -90,9 +90,21 @@ module Merb class_eval "def #{m}?() method == :#{m} end" end - def route_params=(params) - @route_params = params - @params.merge! params + def find_route + @route, @route_params = Merb::Router.route_for(self) + @params.merge! @route_params + end + + def redirect_status + route.redirect_status + end + + def redirect_url + route.redirect_url + end + + def redirects? + route.redirects? end private lib/merb-core/dispatch/request.rb @@ -113,12 +113,25 @@ module Merb end end + # ==== Returns + # Boolean:: + # Does the router specify a redirect? def redirects? behavior.redirects? end - def redirect_details - [behavior.redirect_status, behavior.redirect_url] + # ==== Returns + # Integer:: + # The status code to use if the route redirects + def redirect_status + behavior.redirect_status + end + + # ==== Returns + # String:: + # The URL to redirect to if the route redirects + def redirect_url + behavior.redirect_url end # ==== Returns lib/merb-core/dispatch/router/route.rb @@ -4,13 +4,13 @@ module Merb def call(env) begin - controller = ::Merb::Dispatcher.handle(env) + controller = ::Merb::Dispatcher.handle(Merb::Request.new(env)) rescue Object => e return [500, {"Content-Type"=>"text/html"}, e.message + "<br/>" + e.backtrace.join("<br/>")] end Merb.logger.info "\n\n" Merb.logger.flush - [controller.status, controller.headers, controller.body] + controller.rack_response end end lib/merb-core/rack/application.rb @@ -165,13 +165,13 @@ module Merb::Test::Rspec::ControllerMatchers def matches?(target) @target = target - @target.request.exception_details && - @target.request.exception_details[:exceptions].first.is_a?(@expected) + @target.request.exceptions && + @target.request.exceptions.first.is_a?(@expected) end def failure_message "expected #{@target} to be a #{@expected} error, but it was " << - @target.request.exception_details[:exceptions].first.inspect + @target.request.exceptions.first.inspect end def negative_failure_message lib/merb-core/test/matchers/controller_matchers.rb @@ -21,8 +21,9 @@ describe "Kernel#caller" do end it "should be able to get caller lines" do - __caller_lines__(__caller_info__[0], __caller_info__[1], 4).length.should == 9 - __caller_lines__(__caller_info__[0], __caller_info__[1], 4).should be_kind_of(Array) + i = 0 + __caller_lines__(__caller_info__[0], __caller_info__[1], 4) { i += 1 } + i.should == 9 end end spec/private/core_ext/kernel_spec.rb @@ -1,5 +1,3 @@ - - class Exceptions < Application attr_reader :handler spec/private/dispatch/fixture/app/controllers/exceptions.rb @@ -1,5 +1,3 @@ - - class Foo < Application def index spec/private/dispatch/fixture/app/controllers/foo.rb @@ -1,14 +1,13 @@ +$START_OPTIONS = {:merb_root => File.join(File.dirname(__FILE__), "fixture")} require File.join(File.dirname(__FILE__), "spec_helper") require 'rack/mock' require 'stringio' -Merb.start :environment => 'test', - :merb_root => File.dirname(__FILE__) / 'fixture' describe Merb::Dispatcher, "route params" do before(:each) do env = Rack::MockRequest.env_for("/foo/bar/54") env['REQUEST_URI'] = "/foo/bar/54" # MockRequest doesn't set this - @controller = Merb::Dispatcher.handle(env) + @controller = Merb::Dispatcher.handle(Merb::Request.new(env)) end it "should properly set the route params" do spec/private/dispatch/route_params_spec.rb @@ -13,6 +13,14 @@ describe Merb::Dispatcher do Merb.logger end + def dispatch(url) + Merb::Dispatcher.handle(request_for(url)) + end + + def request_for(url) + Merb::Request.new(Rack::MockRequest.env_for(url)) + end + before(:each) do Merb::Config[:exception_details] = true end @@ -22,16 +30,16 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/dispatch_to/index") + @url = "/dispatch_to/index" end it "dispatches to the right controller and action" do - controller = Merb::Dispatcher.handle(@env) + controller = dispatch(@url) controller.body.should == "Dispatched" end it "sets the Request#params to include the route params" do - controller = Merb::Dispatcher.handle(@env) + controller = dispatch(@url) controller.request.params.should == {"controller" => "dispatch_to", "action" => "index", "id" => nil, "format" => nil} @@ -39,31 +47,31 @@ describe Merb::Dispatcher do it "provides the time for start of request handling via Logger#info" do with_level(:info) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should include_log("Started request handling") with_level(:warn) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should_not include_log("Started request handling") end it "provides the routed params via Logger#debug" do with_level(:debug) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should include_log("Routed to:") with_level(:info) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should_not include_log("Routed to:") end it "provides the benchmarks via Logger#info" do with_level(:info) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should include_log(":after_filters_time") with_level(:warn) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should_not include_log(":after_filters_time") end end @@ -74,8 +82,8 @@ describe Merb::Dispatcher do r.match("/redirect/to/foo").redirect("/foo") r.default_routes end - @env = Rack::MockRequest.env_for("/redirect/to/foo") - @controller = Merb::Dispatcher.handle(@env) + @url = "/redirect/to/foo" + @controller = dispatch(@url) end it "redirects" do @@ -84,11 +92,11 @@ describe Merb::Dispatcher do it "reports that it is redirecting via Logger#info" do with_level(:info) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should include_log("Dispatcher redirecting to: /foo") with_level(:warn) do - Merb::Dispatcher.handle(@env) + dispatch(@url) end.should_not include_log("Dispatcher redirecting to: /foo") end @@ -106,8 +114,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/not_a_controller/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/not_a_controller/index" + @controller = dispatch(@url) end describe "with exception details showing" do @@ -144,8 +152,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_gone/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_gone/index" + @controller = dispatch(@url) end it "remembers that the Exception is Gone" do @@ -180,8 +188,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_gone/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_gone/index" + @controller = dispatch(@url) end it "renders the Exception from the Exceptions controller" do @@ -217,8 +225,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_load_error/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_load_error/index" + @controller = dispatch(@url) end it "knows that the error is a LoadError" do @@ -253,8 +261,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_load_error/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_load_error/index" + @controller = dispatch(@url) end it "knows that the error is a StandardError" do @@ -294,8 +302,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/page/not/found") - @controller = Merb::Dispatcher.handle(@env) + @url = "/page/not/found" + @controller = dispatch(@url) end it "knows that the error is a NotFound" do @@ -331,8 +339,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_load_error/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_load_error/index" + @controller = dispatch(@url) end it "knows that the error is a NotFound" do @@ -371,8 +379,8 @@ describe Merb::Dispatcher do Merb::Router.prepare do |r| r.default_routes end - @env = Rack::MockRequest.env_for("/raise_load_error/index") - @controller = Merb::Dispatcher.handle(@env) + @url = "/raise_load_error/index" + @controller = dispatch(@url) @body = @controller.body end spec/public/controller/dispatcher_spec.rb @@ -1,6 +1,5 @@ +$START_OPTIONS = {:merb_root => File.join(File.dirname(__FILE__), "directory")} require File.join(File.dirname(__FILE__), "..", "..", "spec_helper") -Merb.start :environment => 'test', - :merb_root => File.dirname(__FILE__) / "directory" describe "The default Merb directory structure" do spec/public/directory_structure/directory_spec.rb @@ -3,7 +3,9 @@ require "rubygems" require "spec" require File.join(File.dirname(__FILE__), "..", "lib", "merb-core") -Merb.start :environment => 'test', :adapter => 'runner' +default_options = {:environment => 'test', :adapter => 'runner'} +options = default_options.merge($START_OPTIONS || {}) +Merb.start options # -- Global custom matchers -- spec/spec_helper.rb lib/merb-core/dispatch/exceptions.html.erb spec/private/dispatch/dispatch_spec.rb spec/private/rack/application_spec.rb 4ca5195c6663b0f0060a70643580d358859b42ff 063c4caa2f098d221490418607cd43eab5cce4f3 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8c7398640ba4cafff011a6abd0d5e7655ccc5cec 8c7398640ba4cafff011a6abd0d5e7655ccc5cec 2008-08-08T18:14:19-07:00 2008-08-08T18:14:19-07:00 Resolve conflict. d742a6ccbc2149cf8bfb459408fd1448c7a0e320 Michael S. Klishin michael@novemberain.com