r9551 - in helma-ng/trunk/modules/helma: . webapp

Author: hannes
Date: 2009-03-20 14:28:20 +0100 (Fri, 20 Mar 2009)
New Revision: 9551

Modified:
   helma-ng/trunk/modules/helma/httpserver.js
   helma-ng/trunk/modules/helma/webapp/request.js
Log:
Start rewriting Request object as pure JavaScript wrapper around the ral HttpServletRequest object.

Details at http://dev.helma.org/trac/helma/changeset/9551

Modified: helma-ng/trunk/modules/helma/httpserver.js
===================================================================
--- helma-ng/trunk/modules/helma/httpserver.js	2009-03-20 13:28:18 UTC (rev 9550)
+++ helma-ng/trunk/modules/helma/httpserver.js	2009-03-20 13:28:20 UTC (rev 9551)
@@ -3,6 +3,8 @@
  */
 
 import('helma/webapp', 'webapp');
+include('helma/webapp/request');
+include('helma/webapp/response');
 
 export('start', 'stop');
 
@@ -71,21 +73,13 @@
                 if (helmaCtx) {
                     // var helmaServlet = new HelmaServlet(engine);
                     var helmaServlet = new Packages.javax.servlet.http.HttpServlet({
-                        service: function(req, res) {
-                            var jsreq = new Request(req),
-                                jsres = new Response(res);
-                            webapp.handleRequest(jsreq, jsres);
+                        service: function(servletRequest, servletResponse) {
+                            var req = new Request(servletRequest),
+                                res = new Response(servletResponse);
+                            webapp.handleRequest(req, res);
                         }
                     });
                     var servletHolder = new jetty.servlet.ServletHolder(helmaServlet);
-                    var params = config.servletParams || {
-                        moduleName: 'helma/webapp',
-                        functionName: 'handleRequest',
-                        requestTimeout: 30
-                    };
-                    for (var p in params) {
-                        servletHolder.setInitParameter(p, params[p]);
-                    }
                     helmaCtx.addServlet(servletHolder, "/*");
                 }
                 // start server

Modified: helma-ng/trunk/modules/helma/webapp/request.js
===================================================================
--- helma-ng/trunk/modules/helma/webapp/request.js	2009-03-20 13:28:18 UTC (rev 9550)
+++ helma-ng/trunk/modules/helma/webapp/request.js	2009-03-20 13:28:20 UTC (rev 9551)
@@ -1,41 +1,94 @@
 require('core/string');
-import('helma/system', 'system');
+include('helma/functional');
+include('helma/util');
 
-if (!global.Request) {
+export('Request');
 
-    system.addHostObject(org.helma.web.Request);
-    system.addHostObject(org.helma.web.Session);
+// var log = require('helma/logging').getLogger(__name__);
 
-    var log = require('helma/logging').getLogger(__name__);
+function Request(servletRequest) {
 
-    Object.defineProperty(Request.prototype, "isGet", {
+    var params, cookies, session, headers;
+    var define = bindArguments(Object.defineProperty, this);
+
+    define("charset", readOnlyPropertyDesc(servletRequest, "characterEncoding"));
+    define("port", readOnlyPropertyDesc(servletRequest, "port"));
+    define("path", readOnlyPropertyDesc(servletRequest, "requestURI"));
+    define("method", readOnlyPropertyDesc(servletRequest, "method"));
+
+    define("params", {
         getter: function() {
-            return this.isMethod("GET");
+            if (!params)
+                params = new ScriptableMap(
+                        new org.helma.util.ParameterMap(
+                                servletRequest.getParameterMap()));
+            return params;
         }
     });
 
-    Object.defineProperty(Request.prototype, "isPost", {
+    define("cookies", {
         getter: function() {
-            return this.isMethod("POST");
+            if (!cookies)
+                cookies = new ScriptableMap();
+            return cookies;
         }
     });
 
-    Object.defineProperty(Request.prototype, "isPut", {
+    define("session", {
         getter: function() {
-            return this.isMethod("PUT");
+            if (!session)
+                session = new Session(servletRequest);
+            return session;
         }
-    });
+    })
 
-    Object.defineProperty(Request.prototype, "isDelete", {
+}
+
+function Session(servletRequest) {
+
+    var data;
+    var define = bindArguments(Object.defineProperty, this);
+
+    function getSession() {
+        return servletRequest.getSession();
+    }
+
+    define("data", {
         getter: function() {
-            return this.isMethod("DELETE");
+            if (!data) {
+                data = new ScriptableMap();
+                getSession().setAttribute("helma", data);
+            }
+            return data;
         }
     });
 
-    Object.defineProperty(Request.prototype, "isHead", {
+    define("isNew", {
         getter: function() {
-            return this.isMethod("HEAD");
+            getSession().isNew();
         }
-    });
+    })
 
-}
\ No newline at end of file
+}
+
+var defineRequestProperty = bindArguments(Object.defineProperty, Request.prototype);
+
+defineRequestProperty("isGet", {
+    getter: function() { return this.method == "GET"; }
+})
+
+defineRequestProperty("isPost", {
+    getter: function() { return this.method == "POST"; }
+})
+
+defineRequestProperty("isPut", {
+    getter: function() { return this.method == "PUT"; }
+})
+
+defineRequestProperty("isDelete", {
+    getter: function() { return this.method == "DELETE"; }
+})
+
+defineRequestProperty("isHead", {
+    getter: function() { return this.method == "HEAD"; }
+})