@@ -11,7 +11,7 @@ MNML's core philosophy is that I really love writing Python and want to do that * Is strictly WSGI; * Provides URL mapping to HTTP response relationship, aka routing; * Provides methods for all HTTP method verbs (`PUT` and `DELETE` are supported); -* Provides flexible regular expression matching for URLs with the ability to reverse said URLs (like Django's `reverse` function); +* Provides named route matching for URLs with the ability to reverse said URLs (like Django's `reverse` function); * Provides the ability to add middleware functions so one can alter the request or response as required; * Does not dictate the template or ORM layer you should use--MNML is strictly about URL routing and serving, and tools needed to do so; and mostly * Lets the implementer write Python, not a sub-set of Python. README.markdown @@ -98,23 +98,23 @@ class HttpResponse(object): class WebApplication(object): """The actual serving of Python code is done here""" def __init__(self, routes): - self.routes = tuple((re.compile(a), b) for a,b in routes) + self.routes = routes def __call__(self, environ, start_response): request = HttpRequest(environ) response = None - for route in self.routes: - url, view = route - match = url.match(environ['PATH_INFO']) - if match: + for pair in self.routes: + route, view = pair + matches = re.match(route_master(route), environ['PATH_INFO']) + if matches: if hasattr(view, '__call__'): to_call = view else: # TODO: do this better to_call = eval(view) try: - response = to_call(request, **match.groupdict()) + response = to_call(request, **matches.groupdict()) except Exception, error: # either the function failed, or it doesn't exist # TODO: log missing functions @@ -147,15 +147,54 @@ class WebApplication(object): server.serve_forever() +def route_master(route): + """returns a compiled regular expression""" + # chop off leading slash + if route.startswith('/'): + route = route[1:] + + trailing_slash = False + # check end slash and remember to keep it + if route.endswith('/'): + route = route[:-1] + trailing_slash = True + + # split into path components + bits = route.split('/') + + # compiled match starts with a slash, + # so we make it a list so we can join later + regex = [''] + for path_component in bits: + if path_component.startswith(':'): + # it's a route, so compile + name = path_component[1:] + # accept only valid URL characters + regex.append(r'(?P<%s>[-_a-zA-Z0-9+%%]+)' % name) + else: + # just a string/static path component + regex.append(path_component) + + # stick the trailing slash back on + if trailing_slash: + regex.append('') + + # stitch it back together as a path + return '^%s$' % '/'.join(regex) + if __name__ == '__main__': """run the basic server""" routes = ( - (r'^/$', 'homepage'), + ('/', 'homepage'), + ('/myview/:stuff/', 'other_thing') ) def homepage(request): return HttpResponse('hello world!') + def other_thing(request, stuff): + return HttpResponse('found stuff: %s!' % stuff) + web_app = WebApplication(routes) try: mnml.py d50fca799fe90ee88030f016abf7f74ae9168ae5 Bradley Wright brad@intranation.com http://github.com/bradleywright/mnml/commit/879941eef880a3208e245d53039e624c22fc4ea9 879941eef880a3208e245d53039e624c22fc4ea9 2009-02-25T14:43:01-08:00 2009-02-25T14:43:01-08:00 Switch to simple, name-based routing (`/path/:component/`) style. * This is far easier to reverse (I had a look at Django's reverse code and it's horrific); * This is simpler to get started with; and mostly * Straight regex-matching is realistically beyond what most people (myself include) will need. 42b5d0b782dc9dc5434e22de694b3e660a56f6a3 Bradley Wright brad@intranation.com