spec/public/controller/controllers/redirect.rb spec/public/controller/redirect_spec.rb @@ -118,13 +118,21 @@ module Merb # redirect("/posts/34") # redirect("http://www.merbivore.com/") # redirect("http://www.merbivore.com/", true) - def redirect(url, permanent = false) - self.status = permanent ? 301 : 302 + def redirect(url, message = nil) + if message + notice = Merb::Request.escape([Marshal.dump(message)].pack("m")) + url = url =~ /\?/ ? "#{url}&_message=#{notice}" : "#{url}?_message=#{notice}" + end + self.status = 302 Merb.logger.info("Redirecting to: #{url} (#{self.status})") headers['Location'] = url "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>" end + def message + @_message = defined?(@_message) ? @_message : request.message + end + # Sends a file over HTTP. When given a path to a file, it will set the # right headers so that the static file is served directly. # lib/merb-core/controller/mixins/controller.rb @@ -168,6 +168,15 @@ module Merb h end end + + def message + return {} unless params[:_message] + begin + Marshal.load(Merb::Request.unescape(params[:_message]).unpack("m").first) + rescue ArgumentError + {} + end + end # Resets the params to a nil value. def reset_params! lib/merb-core/dispatch/request.rb @@ -6,5 +6,6 @@ require File.join(__DIR__, "controllers", "base") require File.join(__DIR__, "controllers", "responder") require File.join(__DIR__, "controllers", "display") require File.join(__DIR__, "controllers", "authentication") +require File.join(__DIR__, "controllers", "redirect") Merb.start :environment => 'test' \ No newline at end of file spec/public/controller/spec_helper.rb 950ad54582e03bbf174498e21b2aa3254c1ae8fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5ae0124fd58464e668896335c5015b786fbb591c 5ae0124fd58464e668896335c5015b786fbb591c

2008-07-09T16:17:07-07:00

Adds message support (like flash in Rails but with somewhat different semantics) af594e0b32d92c94229fc0f07099e8658e058e10 Yehuda Katz wycats@gmail.com