Changeset 12

Timestamp:

11/18/08 12:57:04 (7 weeks ago)

Author:

mbertoldi

Message:

Added request layer to gnr.web, added GnrWebSite? object

Location:

gnrpy/gnr/web

Files:

• apache/gnrwebpage_apache.py (modified) (1 diff)
• apache/gnrwebreqresp_apache.py (added)
• _gnrbasewebpage.py (modified) (21 diffs)
• _gnrbasewebreqresp.py (added)
• gnrwebapphandler.py (modified) (1 diff)
• gnrwebpage.py (modified) (1 diff)
• gnrwebreqresp.py (added)
• gnrwebsite.py (added)
• wsgi/gnrwebpage_wsgi.py (modified) (2 diffs)
• wsgi/gnrwebreqresp_wsgi.py (added)

gnrpy/gnr/web/apache/gnrwebpage_apache.py

@@ -28 +28 @@
 Copyright (c) 2007 Softwell. All rights reserved.
 """
+import os
+import urllib
 
 from mod_python import apache, Session, Cookie
 
 from gnr.web._gnrbasewebpage import GnrBaseWebPage
+from gnr.web.apache.gnrwebreqresp_apache import GnrWebRequest,GnrWebResponse
 
-cookie_types = {'marshal': Cookie.MarshalCookie}
     
 class GnrWebPage(GnrBaseWebPage):
     
-    
-    
-    def newMarshalCookie(self, name, value, secret=None, **kw):
-        return Cookie.MarshalCookie(name,value,secret=secret,**kw)
+    def __init__(self, request, customclass, filepath, response=None, **kwargs):
+        self._request = request
+        if not response: response = request
+        self._response = response    
+        self.request = GnrWebRequest(request)
+        self.response = GnrWebResponse(response)
+        self._initialize(customclass, filepath, **kwargs)
     
     def raiseUnauthorized(self):
         raise apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED
         
-    def get_cookie(self, cookieName, cookieType, secret = None):
-        cookieType = cookie_types[cookieType]
-        cookie=Cookie.get_cookie(self.request, cookieName, cookieType, secret = secret)
-        if type(cookie) is not cookieType: cookie=None
-        return cookie
-    
-    def add_cookie(self,cookie):
-        Cookie.add_cookie(self.request,cookie)
-    
-    def get_session(self, **kwargs):
-        return Session.Session(self.request,**kwargs)
+    def add_response_header(self,header,value):
+        self.response.headers[header] = value
+     
+    def externalUrl(self, path, **kwargs):
+        params = urllib.urlencode(kwargs)
+        path = os.path.join(self.homeUrl(), path)
+        if params:
+            path = '%s?%s' % (path, params)
+        return self.request.construct_url(path)
         

gnrpy/gnr/web/_gnrbasewebpage.py

@@ -29 +29 @@
 """
 import md5
-import os, sys
-import re
+import os
+#import sys
+#import re
 import time
 import datetime
@@ -40 +41 @@
 import zipfile
 import StringIO
-from decimal import Decimal
+#from decimal import Decimal
 
 from gnr.core.gnrlog import gnrlogging
@@ -49 +50 @@
 
 #from mod_python import apache, Session, Cookie
-from mako.template import Template
+#from mako.template import Template
 
 import simplejson as json
@@ -55 +56 @@
 from mako.lookup import TemplateLookup
 
-from gnr.core.gnrbag import Bag, DirectoryResolver, TraceBackResolver, TxtDocResolver, UrlResolver, XmlDocResolver, BagFormula
+from gnr.core.gnrbag import Bag, DirectoryResolver, TraceBackResolver
 
 from gnr.core.gnrlang import GnrObject
-from gnr.core import gnrlist
-
-from gnr.core.gnrlang import getUuid
-from gnr.core.gnrstring import templateReplace, splitAndStrip, countOf, toText, toJson, concat
+
+from gnr.core.gnrlang import getUuid, NotImplementedException, deprecated
+from gnr.core.gnrstring import templateReplace, splitAndStrip, toText, toJson
 from gnr.core import gnrdate
 
@@ -67 +67 @@
 
 from gnr.web.gnrwebstruct import GnrDomSrc_dojo_12, GnrDomSrc_dojo_11, GnrGridStruct
-from gnr.web.gnrwebapp import GnrWebApp
-
-from gnr.sql.gnrsqldata import SqlRelatedSelectionResolver, SqlRelatedRecordResolver
-
-from gnr.web.gnrwebapphandler import GnrProcessHandler,GnrWebAppHandler,BatchExecutor
+
+from gnr.web.gnrwebreqresp import GnrWebRequest, GnrWebResponse
+from gnr.web.gnrwebapphandler import GnrProcessHandler,GnrWebAppHandler
 
 CONNECTION_TIMEOUT = 3600
@@ -79 +77 @@
 AUTH_FORBIDDEN=-1
 
+import threading
+pagelocals = threading.local()
+
 class GrowlStub(object):
     def notify(self, *args, **kwargs):
@@ -89 +90 @@
     pass
 
-    
+
 class GnrBaseWebPage(GnrObject):
-    
-    def newMarshalCookie(self):
+
+    def _init_request_response(self,request,response):
         raise NotImplementedException()
+    
+    #def newMarshalCookie(self):
+    #    raise NotImplementedException()
+    
+    def newMarshalCookie(self, name, value, secret=None, **kw):
+        return self.request.newMarshalCookie(name,value,secret=secret,**kw)
 
     def raiseUnauthorized(self):
         raise NotImplementedException()
     
-    def get_cookie(self, request, cookieName, cookieType, secret = None):
+    #def get_cookie(self, request, cookieName, cookieType, secret = None):
+    #    raise NotImplementedException()
+    #
+    #def add_cookie(self,cookie):
+    #    raise NotImplementedException()
+    #
+    #def get_session(self, **kwargs):
+    #    raise NotImplementedException()
+    
+    def add_response_header(self,header,value):
         raise NotImplementedException()
     
+    def get_request_header(self,header):
+        raise NotImplementedException()
+        
+    def get_cookie(self, cookieName, cookieType, secret = None):
+        return self.request.get_cookie(cookieName, cookieType, secret = secret)
+
     def add_cookie(self,cookie):
+        self.request.add_cookie(cookie)
+
+    def get_session(self, **kwargs):
+        return self.request.get_session(**kwargs)
+    
+    def __init__(self, request, customclass, filepath, response=None, **kwargs):
         raise NotImplementedException()
     
-    def get_session(self, **kwargs):
-        raise NotImplementedException()
-    
-    def __init__(self, req, customclass, filepath, page_id=None,
-                 _rpc_resultPath=None, _dk_=None, xxcnt=None, _user_login=None, **kwargs):
+    def _initialize(self, customclass, filepath, page_id=None,
+                 _rpc_resultPath=None,xxcnt=None, _user_login=None, **kwargs):
         self._rpc_resultPath=_rpc_resultPath
-        self.request = req
-        req.headers_out["Pragma"] = "no-cache"
-        
+        self.response.add_header('Pragma','no-cache')
         self.page_id = page_id or getUuid()
-        self._dk=_dk_
         self.filepath = filepath # TOGLIERE ????
         self._user_login = _user_login
@@ -120 +142 @@
         self._htmlHeaders=[]
         self._ctxData = Bag()
-        self.folders= {'pages':req.hlist.directory,
-                       'site':os.path.dirname(req.hlist.directory),
-                       'current':os.path.dirname(req.filename),
-                       'document_root': self.request.document_root().rstrip('/') # the path may end with / or not depending to httpd.config
+        self.filename = self.request.filename
+        self.folders= {'pages':self.request.hlist.directory,
+                       'site':os.path.dirname(self.request.hlist.directory),
+                       'current':os.path.dirname(self.filename),
+                       'document_root': self.request.document_root.rstrip('/') # the path may end with / or not depending to httpd.config
                        }
-        self.filename = req.filename
         self.pagename = os.path.splitext(os.path.basename(self.filename))[0]
         self.pagepath = self.filename.replace(self.folders['pages'], '')
-
         self.theme = getattr(customclass, 'theme', None) or self.config['dojo?theme'] or 'tundra'
         self.dojoversion = getattr(customclass, 'dojoversion', None) or self.config['dojo?version'] or '11'
@@ -297 +318 @@
             raise str("No template %s found in %s" % (tpl, str(tpldirectories)))
         
-        
         arg_dict = {}
         self.htmlHeaders()
         arg_dict['customHeaders']=self._htmlHeaders
-        arg_dict['charset'] = 'utf-8'
+        arg_dict['charset'] = charset
         arg_dict['filename'] = self.pagename
         arg_dict['startArgs'] = toJson(startArgs)
@@ -423 +443 @@
         
     def requestWrite(self, txt, encoding='utf-8'):
-        self.request.write(txt.encode(encoding)) 
+        self.responseWrite(txt,encoding=encoding)
+
+    def responseWrite(self, txt, encoding='utf-8'):
+        self.response.write(txt.encode(encoding))
 
     def gnotify(self, title, description, always=False):
@@ -524 +547 @@
             if self.session.pagedata['page_id']!=self.page_id :
                 self.raiseUnauthorized()
-            if self._dk:
-                cl= ['%s_%s'%(k,v) for k,v in kwargs.items()]
-                cl.append('method_%s'%method)
-                cl.sort()
-                if md5.md5('%s%s%s'%(self.page_id,'_'.join(cl),self.page_id)).hexdigest()!=self._dk:
-                    self.raiseUnauthorized()
         parameters = dict(kwargs)
         for k,v in kwargs.items():
@@ -653 +670 @@
     def _get_locale(self): # TODO IMPLEMENT DEFAULT FROM APP OR AVATAR 
         if not hasattr(self, '_locale'):
-            self._locale = self.connection.locale or self.request.headers_in.get('Accept-Language', 'en').split(',')[0] or 'en'
+            self._locale = self.connection.locale or self.request.headers.get('Accept-Language', 'en').split(',')[0] or 'en'
         return self._locale
     locale = property(_get_locale, _set_locale)
@@ -734 +751 @@
         
     def externalUrl(self, path, **kwargs):
-        params = urllib.urlencode(kwargs)
-        path = os.path.join(self.homeUrl(), path)
-        if params:
-            path = '%s?%s' % (path, params)
-        return self.request.construct_url(path)
+        raise NotImplementedException()
         
     def externalUrl_OLD(self,path,  **kwargs):
         params = urllib.urlencode(kwargs)
-        referer = self.request.headers_in.get('Referer')
+        referer = self.request.headers.get('Referer')
         if not referer: return ''
         referer = referer.split('?')[0]
@@ -850 +863 @@
     workdate = property(_get_workdate)
     
-    
     def _get_logfile(self):
         if not hasattr(self, '_logfile'):
@@ -859 +871 @@
         return self._logfile
     logfile = property(_get_logfile)
-    
+        
     def _get_siteHandler(self):
         if not hasattr(self, '_siteHandler'):
-            global GNR_PROCESS_HANDLER
+            #global GNR_PROCESS_HANDLER
             try: 
-                GNR_PROCESS_HANDLER # fare come thread.local
-            except NameError :
+                pagelocals.GNR_PROCESS_HANDLER # fare come thread.local
+            except AttributeError :
                 self.newprocess = True
-                GNR_PROCESS_HANDLER = GnrProcessHandler()
-            self._siteHandler = GNR_PROCESS_HANDLER.getSiteHandler(self)
+                pagelocals.GNR_PROCESS_HANDLER = GnrProcessHandler()
+            self._siteHandler = pagelocals.GNR_PROCESS_HANDLER.getSiteHandler(self)
         return self._siteHandler
     siteHandler = property(_get_siteHandler)
+    
     
     def _findInheritedResource(self, moduleName,ext='py',uri=False):
@@ -1124 +1137 @@
             kwargs[k] = v
         kwargs.update(auxkwargs)
-        self.request.content_type = "text/xml"
+        self.response.content_type = "text/xml"
         resolverclass=str(resolverclass)
         if resolverclass in globals():
@@ -1151 +1164 @@
                               output_encoding='utf-8', encoding_errors='replace')                      
         template = lookup.get_template(os.path.basename(path))
-        self.request.content_type = 'text/html'
+        self.response.content_type = 'text/html'
         css_dojo = getattr(self, '_css_dojo_d%s' % self.dojoversion)()
         gnrlibpath='gnr_d%s' % self.dojoversion
@@ -1342 +1355 @@
             envelope.setItem('dataChanges', dataChanges)
         
-        page.request.content_type = "text/xml"
+        page.response.content_type = "text/xml"
         xmlresult= envelope.toXml(unresolved=True, jsonmode=True, jsonkey=page.page_id, 
                               translate_cb=page.translateText, omitUnknownTypes=True, catalog=page.catalog)
@@ -1365 +1378 @@
     
     def _call_html(self, page, method, kwargs, result, error):
-        page.request.content_type = "text/html"
+        page.response.content_type = "text/html"
         return result or error
 
@@ -1416 +1429 @@
         #    self.page.gnotify('write cookie', self.page.siteUri, always=False)
             self.cookie.value['timestamp'] = time.time()
-            self.data['ip'] = self.page.request.get_remote_host()
+            self.data['ip'] = self.page.request.remote_addr
             self.data['pages'] = Bag(self.page.session.getActivePages(self.connection_id))
             self.write()
@@ -1578 +1591 @@
     def loadSessionData(self, locking=True):
         if locking and (not(self.locked)):
+            self.session.load()
             self.session.lock()
-            self.session.load()
             self.locked = True
         self.pagedata = self.getSessionData(self.page_id)

gnrpy/gnr/web/gnrwebapphandler.py

@@ -70 +70 @@
 
 from gnr.sql.gnrsqldata import SqlRelatedSelectionResolver, SqlRelatedRecordResolver
-
 
 

gnrpy/gnr/web/gnrwebpage.py

@@ -1 @@
-try:
-    from mod_python import apache
-    from apache.gnrwebpage_apache import *
-except ImportError:
-    from wsgi.gnrwebpage_wsgi import *
+#try:
+from mod_python import apache
+from gnr.web.apache.gnrwebpage_apache import *
+#except ImportError:
+#    from gnr.web.wsgi.gnrwebpage_wsgi import *
 
 from gnr.core.gnrbag import Bag, DirectoryResolver, TraceBackResolver, TxtDocResolver, UrlResolver, XmlDocResolver, BagFormula

gnrpy/gnr/web/wsgi/gnrwebpage_wsgi.py

@@ -28 +28 @@
 Copyright (c) 2007 Softwell. All rights reserved.
 """
-import md5
-import os, sys
-import re
-import time
-import datetime
-import traceback
-import weakref
-import random
-import itertools
-import urllib
-import zipfile
-import StringIO
-from decimal import Decimal
-
-from gnr.core.gnrlog import gnrlogging
-from gnr.core.gnrlang import optArgs
-from gnr.core.gnrlang import gnrImport
-
-gnrlogger = gnrlogging.getLogger('gnr.web.gnrwebcore')
-
-#from mod_python import apache, Session, Cookie
-from mako.template import Template
-import cookie_wsgi as Cookie
-import simplejson as json
-
-from mako.lookup import TemplateLookup
-
-from gnr.core.gnrbag import Bag, DirectoryResolver, TraceBackResolver, TxtDocResolver, UrlResolver, XmlDocResolver, BagFormula
-
-from gnr.core.gnrlang import GnrObject
-from gnr.core import gnrlist
-
-from gnr.core.gnrlang import getUuid
-from gnr.core.gnrstring import templateReplace, splitAndStrip, countOf, toText, toJson, concat
-from gnr.core import gnrdate
-
-from gnr.web.jsmin import jsmin
-
-from gnr.web.gnrwebstruct import GnrDomSrc_dojo_12, GnrDomSrc_dojo_11, GnrGridStruct
-from gnr.web.gnrwebapp import GnrWebApp
-
-from gnr.sql.gnrsqldata import SqlRelatedSelectionResolver, SqlRelatedRecordResolver
-
-import threading
-pagelocals = threading.local()
-
-
-CONNECTION_TIMEOUT = 3600
-CONNECTION_REFRESH = 20
-AUTH_OK=0
-AUTH_NOT_LOGGED=1
-AUTH_FORBIDDEN=-1
 
 from webob import Request
@@ -85 +33 @@
 from webob import exc
 from webob.exc import HTTPFound, HTTPNotFound, HTTPUnauthorized
+import gnr.web.wsgi.cookie_wsgi as Cookie
+from gnr.web._gnrbasewebpage import GnrBaseWebPage
+from gnr.web.apache.gnrwebreqresp_wsgi import GnrWebRequest,GnrWebResponse
+cookie_types = {'marshal': Cookie.MarshalCookie}
+    
+class GnrWebPage(GnrBaseWebPage):
+    
+    def __init__(self, request, customclass, filepath, response=None, **kwargs):
+        self._request = request
+        if not response: response = Response()
+        self._response = response    
+        self.request = GnrWebRequest(request)
+        self.response = GnrWebResponse(response)
+        self._initialize(customclass, filepath, **kwargs)
+        
+    def newMarshalCookie(self, name, value, secret=None, **kw):
+        return Cookie.MarshalCookie(name,value,secret=secret,**kw)
+    
+    def raiseUnauthorized(self):
+        raise HTTPUnauthorized
+        
+    def get_cookie(self, cookieName, cookieType, secret = None):
+        cookieType = cookie_types[cookieType]
+        cookie=Cookie.get_cookie(self.request, cookieName, cookieType, secret = secret)
+        if type(cookie) is not cookieType: cookie=None
+        return cookie
+    
+    def add_cookie(self,cookie):
+        Cookie.add_cookie(self.request,cookie)
+    
+    def get_session(self, **kwargs):
+        return self._request.environ['beaker.session']
+        
+    def add_response_header(self,header,value):
+        self.response.headers.add(header, value)
 
-var_regex = re.compile(r'''
-                       \{          # The exact character "{"
-                       (\w+)       # The variable name (restricted to a-z, 0-9, _)
-                       (?::([^}]+))? # The optional :regex part
-                       \}          # The exact character "}"
-                       ''', re.VERBOSE)
-
-def template_to_regex(template):
-    regex = ''
-    last_pos = 0
-    for match in var_regex.finditer(template):
-        regex += re.escape(template[last_pos:match.start()])
-        var_name = match.group(1)
-        expr = match.group(2) or '[^/]+'
-        expr = '(?P<%s>%s)' % (var_name, expr)
-        regex += expr
-        last_pos = match.end()
-    regex += re.escape(template[last_pos:])
-    regex = '^%s$' % regex
-    return regex
-
-class Router(object):
-    def __init__(self):
-        self.routes = []
-
-    def add_route(self, template, controller, **vars):
-        if isinstance(controller, basestring):
-            controller = load_controller(controller)
-        self.routes.append((re.compile(template_to_regex(template)),
-                            controller,
-                            vars))
-
-    def __call__(self, environ, start_response):
-        req = Request(environ)
-
-        for regex, controller, vars in self.routes:
-            match = regex.match(req.path_info)
-            if match:
-                req.urlvars = match.groupdict()
-                req.urlvars.update(vars)
-                return controller(environ, start_response)
-        return exc.HTTPNotFound()(environ, start_response)
-
-def controller(func):
-    def replacement(environ, start_response):
-        req = Request(environ)
-        try:
-            resp = func(req, **req.urlvars)
-        except exc.HTTPException, e:
-            resp = e
-        if isinstance(resp, basestring):
-            resp = Response(body=resp)
-        return resp(environ, start_response)
-    return replacement
-
-class GrowlStub(object):
-    def notify(self, *args, **kwargs):
-        pass
-
-class GnrWebClientError(Exception):
-    pass
-
-class GnrWebServerError(Exception):
-    pass
-
-class GnrWebPage(GnrObject):
-    def __init__(self, req, customclass, filepath, page_id=None, response=None,
-                 _rpc_resultPath=None, _dk_=None, xxcnt=None, _user_login=None, sitepath=None, **kwargs):
-        self._rpc_resultPath=_rpc_resultPath
-        self.request = req
-        if response:
-            self.response=response
-        else:
-            self.response=Response()
-        self.response.headers.add("Pragma", "no-cache")
-#        req.headers_out["Pragma"] = "no-cache"
-
-        self.page_id = page_id or getUuid()
-        self._dk=_dk_
-        self.filepath = filepath # TOGLIERE ????
-        self._user_login = _user_login
-        self.kwargs = kwargs
-        self._htmlHeaders=[]
-        self._ctxData = Bag()
-        if sitepath:
-            self.sitepath=sitepath
-        else:
-            self.sitepath=os.path.dirname(os.path.dirname(self.filepath))
-        self.folders= {'pages':os.path.join(self.sitepath,'pages'),
-                       'site':self.sitepath,
-                       'current':os.path.dirname(self.filepath),
-                       'document_root': os.path.dirname(self.filepath).rstrip('/')
-                       }
-        self.filename = os.path.basename(self.filepath)
-        self.pagename = os.path.splitext(os.path.basename(self.filename))[0]
-        self.pagepath = self.filename.replace(self.folders['pages'], '')
-
-        self.theme = getattr(customclass, 'theme', None) or self.config['dojo?theme'] or 'tundra'
-        self.dojoversion = getattr(customclass, 'dojoversion', None) or self.config['dojo?version'] or '11'
-        self.pagetemplate = getattr(customclass, 'pagetemplate', None) or self.config['dojo?pagetemplate']
-        self.maintable = getattr(customclass, 'maintable', None)
-        self.js_requires = splitAndStrip( getattr(customclass, 'js_requires', ''),',')
-        self.css_requires = splitAndStrip(getattr(customclass, 'css_requires', ''),',')
-        py_requires = splitAndStrip(getattr(customclass, 'py_requires', '') ,',')
-        self.eagers = getattr(customclass, 'eagers', {})
-        self._baseMixins()
-        self._pyrequiresMixin(py_requires)
-        self.mixin(customclass)
-        self._customPageMixins()
-        self.css_requires.reverse()
-
-    def getUuid(self):
-        return getUuid()
-
-    def _baseMixins(self):
-        pkgId = self.packageId
-        pkg=None
-        if pkgId:
-            pkg = self.application.packages[pkgId]
-        if pkg:
-            self.mixin(pkg.webPageMixin) # first the package standard
-        self.mixin(self.application.webPageCustom) # then the application custom
-        if pkg:
-            self.mixin(pkg.webPageMixinCustom) # finally the package custom
-
-    def _customPageMixins(self):
-        """Look in the instance custom folder for a file named as the current webpage"""
-        if self.packageId:
-            filepath = self.pagepath.split('/',1)
-            if len(filepath) == 2: #the page is into a package, not root level
-                filepath = filepath[1]
-                customPagePath=os.path.join(self.application.customFolder, self.packageId, 'webpages', filepath)
-                if os.path.isfile(customPagePath):
-                    raise self.filename
-                    self.mixin('%s:%s' % (customPagePath,'WebPage'))
-
-    def _pyrequiresMixin(self, py_requires):
-        for mix in py_requires:
-            if mix:
-                modName, clsName = mix.split(':')
-                modPathList = self.getResourceList(modName, 'py') or []
-                if modPathList:
-                    modPathList.reverse()
-                    for modPath in modPathList:
-                        self.mixin('%s:%s' % (modPath, clsName))
-                else:
-                    raise GnrWebServerError('Cannot import component %s' % modName)
-
-
-    def indexo(self ,**kwargs):
-        self.kwargs.update(kwargs)
-        self.onInit()
-        if self._user_login:
-            user=self.user # if we have an embedded login we get the user right now
-
-        try:
-            if 'mako' in self.kwargs:
-                result = self.makoTemplate(path=self.kwargs['mako'], **self.kwargs)
-            elif 'method' in self.kwargs:
-                result = self._rpcDispatcher(**self.kwargs)
-            else:
-                result = self.indexPage()
-                self.session.loadSessionData()
-                self.session.pagedata['pageArgs'] = self.kwargs
-                self.session.pagedata['page_id'] = self.page_id
-                self.session.pagedata['connection_id'] = self.connection.connection_id
-                self.session.pagedata['pagepath'] = self.pagepath
-                self.session.saveSessionData()
-        except:
-            self._onEnd()
-            raise
-        self._onEnd()
-        return result
-
-    def reqargs(self,req):
-        return dict(getattr(req,req.method))
-
-    def index(self ,**kwargs):
-        #req = Request(environ)
-        #kwargs = self.reqargs(req)
-        self.kwargs.update(kwargs)
-        self.onInit()
-        if self._user_login:
-            user=self.user # if we have an embedded login we get the user right now
-
-        try:
-      &