Changeset 713

Timestamp:

02/20/05 13:50:13 (4 years ago)

Author:

david

Message:

Added new keyword to specify load paths as being component based. Added better logging for component calls

Files:

• trunk/actionpack/lib/action_controller/base.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/components.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_controller/dependencies.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml (modified) (1 diff)

trunk/actionpack/lib/action_controller/base.rb

@@ -225 +225 @@
-    # 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".
-attr
+lass_inheritable
-
-    # The logger is used for generating information on the action run-time (including benchmarking) if available.
@@ -298 +298 @@
-      def hide_actions(*names)
-        write_inheritable_attribute(:hidden_actions, hidden_actions | names.collect {|n| n.to_s})
+      end
+
+      # Set the template root to be one directory behind the root dir of the controller. Examples:
+      #   /code/weblog/components/admin/users_controller.rb with Admin::UsersController 
+      #     will use /code/weblog/components as template root 
+      #     and find templates in /code/weblog/components/admin/users/
+      #
+      #   /code/weblog/components/admin/parties/users_controller.rb with Admin::Parties::UsersController 
+      #     will also use /code/weblog/components as template root 
+      #     and find templates in /code/weblog/components/admin/parties/users/
+      def uses_component_template_root
+        path_of_calling_controller = File.dirname(caller[0].split(/:\d+:/).first)
+        path_of_controller_root    = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "")
+        self.template_root = path_of_controller_root
-      end
-    end

trunk/actionpack/lib/action_controller/components.rb

@@ -3 +3 @@
-    def self.append_features(base)
-      super
-
+
+
+
+
+
+
+
-    end
-
@@ -9 +15 @@
-      def render_component(options = {}) #:doc:
-        response = component_response(options)
+        logger.info "Rendering component (#{options.inspect}): "
-        render_text(response.body, response.headers["Status"])
+        logger.info("\n\nEnd of component rendering")
-      end
-  
@@ -23 +31 @@
-      def component_request(options)
-        component_request = @request.dup
-
-
+
+
+
+
+
-      end
-  end

trunk/actionpack/lib/action_controller/dependencies.rb

@@ -90 +90 @@
-  end
-end
-
-Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers'))) if defined?(RAILS_ROOT)

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

@@ -1 @@
-unless 
+if @exception.blamed_files && !
-  <a href="#" onclick="document.getElementById('blame_trace').style.display='block'; return false;">Show blamed files</a>
-  <pre id="blame_trace" style="display:none"><code><%=h @exception.describe_blame %></code></pre>