[waffle-scm] [180] trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java: exposing controller instance variables and methods to rhtml templates

[fabio . kung]

Title: [waffle-scm] [180] trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java: exposing controller instance variables and methods to rhtml templates

Revision

180

Author

fabio.kung

Date

2007-06-21 02:58:21 -0500 (Thu, 21 Jun 2007)

Log Message

exposing controller instance variables and methods to rhtml templates

Modified Paths

trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java

Diff

Modified: trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java (179 => 180)

--- trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java	2007-06-21 07:56:41 UTC (rev 179)
+++ trunk/core/src/main/java/org/codehaus/waffle/servlet/RhtmlServlet.java	2007-06-21 07:58:21 UTC (rev 180)
@@ -1,7 +1,9 @@
 package org.codehaus.waffle.servlet;
 
+import org.codehaus.waffle.Constants;
 import org.codehaus.waffle.WaffleException;
 import org.codehaus.waffle.context.RequestLevelContainer;
+import org.codehaus.waffle.controller.RubyController;
 import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.javasupport.JavaEmbedUtils;
@@ -16,33 +18,49 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+/**
+ * ERB (rhtml) views support
+ *
+ * @author Michael Ward
+ * @author Fabio Kung
+ */
 public class RhtmlServlet extends HttpServlet {
-
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-        System.out.println(request.getRequestURI()); // TODO determine what the requested rhtml is
-        String template = loadRhtml("hello.rhtml");
+        String template = loadRhtml(request.getServletPath());
 
         Ruby runtime = RequestLevelContainer.get().getComponentInstanceOfType(Ruby.class);
-
         runtime.evalScript("require 'erb'\n");
         RubyModule module = runtime.getClassFromPath("ERB");
 
         IRubyObject erb = (IRubyObject) JavaEmbedUtils.invokeMethod(runtime, module, "new",
                 new Object[] {JavaEmbedUtils.javaToRuby(runtime, template)}, IRubyObject.class); // cache?
 
-        // Need to include ERB::Util on whats being bound
-        // TODO bind the controller ... not self
-        runtime.evalScript("self.send :include, ERB::Util");
+        // TODO: Test with a non-ruby controller
+        Object controller = extractController(request);
 
-        String out = (String)JavaEmbedUtils.invokeMethod(runtime, erb, "result",
-                new Object[] {(Object) runtime.evalScript("self.send :binding")}, String.class);
+        JavaEmbedUtils.invokeMethod(runtime, controller, "extend",
+                new Object[]{runtime.getClassFromPath("ERB::Util")}, Object.class);
 
+        IRubyObject binding = (IRubyObject) JavaEmbedUtils.invokeMethod(runtime, controller, "send",
+                new Object[]{runtime.newSymbol("binding")}, IRubyObject.class);
+
+        String out = (String) JavaEmbedUtils.invokeMethod(runtime, erb, "result",
+                new Object[] {binding}, String.class);
+
         response.getOutputStream().println(out);
         response.getOutputStream().flush();
     }
 
+    private Object extractController(HttpServletRequest request) {
+        Object controller = request.getAttribute(Constants.CONTROLLER_KEY);
+        if(controller instanceof RubyController) {
+            controller = ((RubyController) controller).getRubyObject();
+        }
+        return controller;
+    }
+
     private String loadRhtml(String fileName) {
         BufferedReader bufferedReader = null;
         InputStream inputStream = null;

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email