Changeset 51

Timestamp:

12/06/04 18:25:01 (4 years ago)

Author:

david

Message:

Syntax errors and other exceptions thrown outside of an action are now gracefully handled by the dispatcher

Files:

• trunk/actionpack (modified) (2 props)
• trunk/actionpack/lib/action_controller.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/base.rb (modified) (5 diffs)
• trunk/actionpack/lib/action_controller/dependencies.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/rescue.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml (modified) (1 diff)
• trunk/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/templates/rescues/template_error.rhtml (modified) (2 diffs)
• trunk/actionpack/README (modified) (1 diff)
• trunk/railties (modified) (1 prop)
• trunk/railties/dispatches/start_server (deleted)
• trunk/railties/lib/dispatcher.rb (modified) (2 diffs)
• trunk/railties/lib/generator.rb (modified) (1 diff)
• trunk/railties/lib/webrick_server.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller.rb

@@ -33 +33 @@
-require 'action_controller/layout'
-require 'action_controller/flash'
+require 'action_controller/dependencies'
-require 'action_controller/scaffolding'
-require 'action_controller/helpers'
-require 'action_controller/dependencies'
-require 'action_controller/cookies'
-require 'action_controller/cgi_process'
@@ -45 +45 @@
-  include ActionController::Benchmarking
-  include ActionController::Rescue
+  include ActionController::Dependencies
-  include ActionController::Scaffolding
-  include ActionController::Helpers
-  include ActionController::Dependencies
-  include ActionController::Cookies
-end

trunk/actionpack/lib/action_controller/base.rb

@@ -5 +5 @@
-require 'action_controller/support/class_inheritable_attributes'
-require 'action_controller/support/inflector'
-
-unless Object.respond_to?(:require_dependency)
-  Object.send(:define_method, :require_dependency) { |file_name| ActionController::Base.require_dependency(file_name) }
-end
-
-module ActionController #:nodoc:
@@ -198 +194 @@
-    cattr_accessor :consider_all_requests_local
-
-    # When turned on (which is default), all dependencies are included using "load". This mean that any change is instant in cached
-    # environments like mod_ruby or FastCGI. When set to false, "require" is used, which is faster but requires server restart to
-    # be effective.
-    @@reload_dependencies = true
-    cattr_accessor :reload_dependencies
-
-    # Template root determines the base from which template references will be made. So a call to render("test/template")
-    # will be converted to "#{template_root}/test/template.rhtml".
@@ -249 +239 @@
-        new.process(request, response)
-      end
-
+
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
-      def controller_class_name
@@ -259 +249 @@
-        Inflector.underscore(controller_class_name.sub(/Controller/, ""))
-      end
-
-      # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false.
-      def require_dependency(file_name)
-        reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
-      end
-    end
-
-    public
-      # Extracts the action_name from the request parameters and performs that action.
-
+, method = :perform_action, *arguments
-        initialize_template_class(response)
-        assign_shortcuts(request, response)
@@ -274 +259 @@
-
-        log_processing unless logger.nil?
-perform_action
+send(method, *arguments)
-        close_session
-

trunk/actionpack/lib/action_controller/dependencies.rb

@@ +1 @@
+unless Object.respond_to?(:require_dependency)
+  Object.send(:define_method, :require_dependency) { |file_name| ActionController::Base.require_dependency(file_name) }
+end
+
-module ActionController #:nodoc:
-  module Dependencies #:nodoc:
-    def self.append_features(base)
-      super
+
+      base.class_eval do
+        # When turned on (which is default), all dependencies are included using "load". This mean that any change is instant in cached
+        # environments like mod_ruby or FastCGI. When set to false, "require" is used, which is faster but requires server restart to
+        # be effective.
+        @@reload_dependencies = true
+        cattr_accessor :reload_dependencies
+      end
+
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
+      # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false.
+      def require_dependency(file_name)
+        reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
+      end
+      
-      def model(*models)
-        require_dependencies(:model, models)

trunk/actionpack/lib/action_controller/rescue.rb

@@ -9 +9 @@
-    def self.append_features(base) #:nodoc:
-      super
+      base.extend(ClassMethods)
-      base.class_eval do
-        alias_method :perform_action_without_rescue, :perform_action
-        alias_method :perform_action, :perform_action_with_rescue
+      end
+    end
+
+    module ClassMethods
+      def process_with_exception(request, response, exception)
+        new.process(request, response, :rescue_action, exception)
-      end
-    end
@@ -88 +95 @@
-      
-      def clean_backtrace(exception)
-
-
+
-      end
-  end

trunk/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml

@@ -1 +1 @@
-<%
-  base_dir = File.expand_path(File.dirname(__FILE__))
-    
-  request_parameters_without_action = @request.parameters.clone
-  request_parameters_without_action.delete("action")

trunk/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml

@@ -1 +1 @@
-<%
-
-
-
-
+
+
-  framework_trace = clean_backtrace - app_trace
-%>
@@ -11 +9 @@
-  <%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
-</h1>
-
+Object.const_defined?(:RAILS_ROOT) ? @exception.message.gsub(RAILS_ROOT, "") : 
-
-collect { |line| line.gsub("/../", "") }.
+
-
-<% unless framework_trace.empty? %>

trunk/actionpack/lib/action_controller/templates/rescues/template_error.rhtml

@@ -1 @@
-<%
-  base_dir = File.expand_path(File.dirname(__FILE__))
-  
-  framework_trace = @exception.original_exception.backtrace.collect do |line| 
-    line.gsub(base_dir, "").gsub("/../config/environments/../../", "")
-  end
-%>
-
-<h1>
-  <%=h @exception.original_exception.class.to_s %> in
@@ -22 +14 @@
-
-<a href="#" onclick="document.getElementById('framework_trace').style.display='block'">Show template trace</a>
-framework_trace
+@exception.original_exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }
-
-<%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>

trunk/actionpack/README

@@ -326 +326 @@
-    def create
-      @post = Post.create(@params["post"])
-      @post.save
-      redirect_to :action => "display", :id => @post.id
-    end

trunk/railties/lib/dispatcher.rb

@@ -25 +25 @@
-  DEFAULT_SESSION_OPTIONS = { "database_manager" => CGI::Session::PStore, "prefix" => "ruby_sess.", "session_path" => "/" }
-
-, error_page = nil
+
-    begin
-      request  = ActionController::CgiRequest.new(cgi, session_options)
@@ -36 +36 @@
-
-      controller_class(controller_name).process(request, response).out
-
-
-
-
-
-
-
-
+
+
-    ensure
-      ActiveRecord::Base.reset_associations_loaded

trunk/railties/lib/generator.rb

@@ -74 +74 @@
-  end
-
-
+ 
-  class Model < Base
-    def generate

trunk/railties/lib/webrick_server.rb

@@ -86 +86 @@
-      return true
-    rescue => err
-      p err
-      return false
-    end