diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/dispatcher.rb | 8 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 25 |
2 files changed, 18 insertions, 15 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 680b03fb42..0cb76ad104 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -22,7 +22,7 @@ #++ class Dispatcher - DEFAULT_SESSION_OPTIONS = { "database_manager" => CGI::Session::PStore, "prefix" => "ruby_sess.", "session_path" => "/" } + DEFAULT_SESSION_OPTIONS = { :database_manager => CGI::Session::PStore, :prefix => "ruby_sess.", :session_path => "/" } def self.dispatch(cgi = CGI.new, session_options = DEFAULT_SESSION_OPTIONS) begin @@ -38,12 +38,12 @@ class Dispatcher rescue Object => exception ActionController::Base.process_with_exception(request, response, exception).out ensure - ActiveRecord::Base.reset_associations_loaded - if ActionController::Base.reload_dependencies Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController) Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name)) - end + ActiveRecord::Base.reset_associations_loaded + ActiveRecord::Base.subclasses.each { |klass| klass.reset_inheritable_attributes } + end end end diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 885610d9a0..698ac3cbbf 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -50,7 +50,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet if @server_options[:index_controller] res.set_redirect WEBrick::HTTPStatus::MovedPermanently, "/#{@server_options[:index_controller]}/" else - res.set_redirect WEBrick::HTTPStatus::MovedPermanently, "/_doc/index.html" + res.set_redirect WEBrick::HTTPStatus::MovedPermanently, "/_doc/" end return true @@ -72,9 +72,8 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet end def handle_mapped(req, res) - parsed_ok, controller, action, id = DispatchServlet.parse_uri(req.request_uri.path) - if parsed_ok - query = "controller=#{controller}&action=#{action}&id=#{id}" + if mappings = DispatchServlet.parse_uri(req.request_uri.path) + query = mappings.collect { |pair| "#{pair.first}=#{pair.last}" }.join("&") query << "&#{req.request_uri.query}" if req.request_uri.query origin = req.request_uri.path + "?" + query req.request_uri.path = "/dispatch.rb" @@ -124,17 +123,21 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet end def self.parse_uri(path) - component = /([-_a-zA-Z0-9]+)/ + component, id = /([-_a-zA-Z0-9]+)/, /([0-9]+)/ case path.sub(%r{^/(?:fcgi|mruby|cgi)/}, "/") when %r{^/#{component}/?$} then - [true, $1, "index", nil] - when %r{^/#{component}/#{component}/?$} then - [true, $1, $2, nil] - when %r{^/#{component}/#{component}/#{component}/?$} then - [true, $1, $2, $3] + { :controller => $1, :action => "index" } + when %r{^/#{component}/#{component}$} then + { :controller => $1, :action => $2 } + when %r{^/#{component}/#{component}/$} then + { :module => $1, :controller => $2, :action => "index" } + when %r{^/#{component}/#{component}/#{id}$} then + { :controller => $1, :action => $2, :id => $3 } + when %r{^/#{component}/#{component}/#{component}/#{id}$} then + { :module => $1, :controller => $2, :action => $3, :id => $4 } else - [false, nil, nil, nil] + false end end end |