@@ -20,15 +20,17 @@ class CssWithConstants: def extract_parameters(self): # print self.data definition_blocks = re.compile('/\*\s*@cssconstants(.*?)\*/', re.S) - groups = definition_blocks.search(self.data).groups() - # pp.pprint(groups) - for group in groups: - definition_split_re = re.compile('@define') - definitions = definition_split_re.split(group) - for definition in definitions: - marker_value_re = re.compile('^\s*(\w*)\s*(.*?)\s*$', re.S) - pair = marker_value_re.search(definition).groups() - self.parameters.append(pair) + matches = definition_blocks.search(self.data) + if (matches): + groups = matches.groups() + # pp.pprint(groups) + for group in groups: + definition_split_re = re.compile('@define') + definitions = definition_split_re.split(group) + for definition in definitions: + marker_value_re = re.compile('^\s*(\w*)\s*(.*?)\s*$', re.S) + pair = marker_value_re.search(definition).groups() + self.parameters.append(pair) def set_override(self, key, value): self.override_parameters[key] = value constantcss.py @@ -6,11 +6,12 @@ from google.appengine.api import users from google.appengine.ext import webapp from google.appengine.ext import db from google.appengine.ext.webapp import template +from webob import Request class StoredCss(db.Model): owner = db.UserProperty() name = db.StringProperty() - content = db.StringProperty(multiline=True) + content = db.TextProperty() last_edited = db.DateTimeProperty(auto_now_add=True) class HomePage(webapp.RequestHandler): @@ -74,10 +75,16 @@ class SaveCss(webapp.RequestHandler): css.content = self.request.get('content') css.put() - self.redirect('/') + self.redirect('/list_css') class DisplayCss(webapp.RequestHandler): def get(self): + user = users.get_current_user() + + if not users.get_current_user(): + self.redirect(users.create_login_url(self.request.uri)) + return + if self.request.get('key'): css = StoredCss.get(self.request.get('key')) else: @@ -90,6 +97,10 @@ class DisplayCss(webapp.RequestHandler): for (key, value) in self.request.GET.items(): css.set_override(key, value) + referrer = Request.blank(self.request.referer) + for (key, value) in referrer.GET.items(): + css.set_override(key, value) + self.response.out.write(css.final()) web.py 598423b63f2fee76210d7aa96c670658bdab88ad Matthew Sheppard matthew.sheppard@gmail.com http://github.com/mattsheppard/constant-css/commit/977b08132d30cce0abc4348df9ac86ac713c8482 977b08132d30cce0abc4348df9ac86ac713c8482 2008-05-10T22:17:58-07:00 2008-05-10T22:17:58-07:00 Tweaking to actually work when displaying the CSS, and it also now extracts parameters from the referrer (to make tweaking easier). 569899777a06af5203b08a837200576227c569ca Matthew Sheppard matthew.sheppard@gmail.com