From ianb at codespeak.net Wed Apr 1 21:31:13 2009
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Wed, 1 Apr 2009 21:31:13 +0200 (CEST)
Subject: [z3-checkins] r63503 - z3/deliverance/trunk/deliverance
Message-ID: <20090401193113.0C48916847C@codespeak.net>
Author: ianb
Date: Wed Apr 1 21:31:12 2009
New Revision: 63503
Modified:
z3/deliverance/trunk/deliverance/middleware.py
z3/deliverance/trunk/deliverance/rules.py
Log:
Two patches from Malthe Borch; one to fix some attribute: rules (that copy attributes) and another for handling 304 responses gracefully
Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py (original)
+++ z3/deliverance/trunk/deliverance/middleware.py Wed Apr 1 21:31:12 2009
@@ -541,15 +541,22 @@
the given url.
"""
+ _response = None
+
def __init__(self, url):
self.url = url
+
def __call__(self, get_resource, app, orig_req):
from deliverance.ruleset import RuleSet
from lxml.etree import XML, XMLSyntaxError
import urlparse
url = urlparse.urljoin(orig_req.url, self.url)
doc_resp = get_resource(url)
- if doc_resp.status_int != 200:
+ if doc_resp.status_int == 304 and self._response is not None:
+ doc_resp = self._response
+ elif doc_resp.status_int == 200:
+ self._response = doc_resp
+ else:
## FIXME: better error
assert 0, "Bad response: %r" % doc_resp
## FIXME: better content-type detection
Modified: z3/deliverance/trunk/deliverance/rules.py
==============================================================================
--- z3/deliverance/trunk/deliverance/rules.py (original)
+++ z3/deliverance/trunk/deliverance/rules.py Wed Apr 1 21:31:12 2009
@@ -764,7 +764,7 @@
self.format_attribute_names(attributes),
self.format_tag(content_els[0]), self.format_tag(theme_el), log_text)
else:
- theme_el.attrib.update(content_els[0].attrib)
+ theme_el.attrib.update(dict(content_els[0].attrib))
if self.move:
content_els[0].attrib.clear()
log_text += ' and removed all attributes from the content'
From ianb at codespeak.net Wed Apr 1 21:39:42 2009
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Wed, 1 Apr 2009 21:39:42 +0200 (CEST)
Subject: [z3-checkins] r63505 - in z3/deliverance/trunk: . deliverance docs
Message-ID: <20090401193942.7DFF81684A4@codespeak.net>
Author: ianb
Date: Wed Apr 1 21:39:41 2009
New Revision: 63505
Modified:
z3/deliverance/trunk/deliverance/middleware.py
z3/deliverance/trunk/docs/news.txt
z3/deliverance/trunk/setup.py
Log:
Added a new rule getter, and an entry point for adding the middleware via WSGI
Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py (original)
+++ z3/deliverance/trunk/deliverance/middleware.py Wed Apr 1 21:39:41 2009
@@ -573,6 +573,46 @@
'Bad rule tag <%s> in document %s' % (doc.tag, url))
return RuleSet.parse_xml(doc, url)
+class FileRuleGetter(object):
+ """
+ An implementation of `rule_getter` for `DeliveranceMiddleware`.
+ This reads the rules from a file, and always returns the rules read from there.
+ """
+
+ def __init__(self, filename):
+ try:
+ doc = parse(filename, base_url='file://'+os.path.abspath(filename)).getroot()
+ except XMLSyntaxError, e:
+ raise Exception('Invalid syntax in %s: %s' % (filename, e))
+ assert doc.tag == 'ruleset', (
+ 'Bad rule tag <%s> in document %s' % (doc.tag, url))
+ assert doc.tag == 'ruleset', (
+ 'Bad rule tag <%s> in document %s' % (doc.tag, url))
+ self.ruleset = RuleSet.parse_xml(doc, url)
+
+ def __call__(self, get_resource, app, orig_req):
+ return self.ruleset
+
fp = open(os.path.join(os.path.dirname(__file__), 'media', 'clientside.js'))
CLIENTSIDE_JAVASCRIPT = fp.read()
del fp
+
+def make_deliverance_middleware(app, global_conf, rule_uri=None, rule_filename=None,
+ debug=None):
+ assert not rule_uri or not rule_filename, (
+ "You cannot give both rule_uri and rule_filename settings to Deliverance middleware")
+ assert rule_uri or rule_filename, (
+ "You must give one of rule_uri or rule_filename")
+ if rule_uri:
+ rule_getter = SubrequestRuleGetter(rule_uri)
+ else:
+ rule_getter = FileRuleGetter(rule_filename)
+ app = middleware.DeliveranceMiddleware(app, rule_getter)
+ from paste.deploy.converters import asbool
+ if debug is None:
+ debug = asbool(global_conf.get('debug', False))
+ else:
+ debug = asbool(debug)
+ from deliverance import security
+ return security.SecurityContext.middleware(app,
+ display_local_files=debug, display_logging=debug)
Modified: z3/deliverance/trunk/docs/news.txt
==============================================================================
--- z3/deliverance/trunk/docs/news.txt (original)
+++ z3/deliverance/trunk/docs/news.txt Wed Apr 1 21:39:41 2009
@@ -1,4 +1,15 @@
News
====
+svn trunk
+---------
+
+* Added :class:`deliverance.middleware:FileRuleGetter`
+
+* Added `Paste Deploy `_ entry point
+ (``egg:Deliverance``).
+
+0.3 prerelease
+--------------
+
Everything is new: no news yet!
Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py (original)
+++ z3/deliverance/trunk/setup.py Wed Apr 1 21:39:41 2009
@@ -51,5 +51,8 @@
[paste.paster_create_template]
deliverance = deliverance.paster_templates:DeliveranceTemplate
deliverance_plone = deliverance.paster_templates:PloneTemplate
+
+ [paste.filter_app_factory]
+ main = deliverance.middleware:make_deliverance_middleware
""",
)
From calvinhp at codespeak.net Wed Apr 1 22:26:19 2009
From: calvinhp at codespeak.net (calvinhp at codespeak.net)
Date: Wed, 1 Apr 2009 22:26:19 +0200 (CEST)
Subject: [z3-checkins] r63507 - z3/deliverance/trunk/deliverance
Message-ID: <20090401202619.F1BFF1684AB@codespeak.net>
Author: calvinhp
Date: Wed Apr 1 22:26:18 2009
New Revision: 63507
Modified:
z3/deliverance/trunk/deliverance/middleware.py
Log:
made the new rule getter actually work
Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py (original)
+++ z3/deliverance/trunk/deliverance/middleware.py Wed Apr 1 22:26:18 2009
@@ -17,13 +17,14 @@
from pygments.lexers import XmlLexer, HtmlLexer
from pygments.formatters import HtmlFormatter
from tempita import HTMLTemplate, html
-from lxml.etree import _Element
+from lxml.etree import _Element, parse, XMLSyntaxError
from lxml.html import fromstring, document_fromstring, tostring, Element
from deliverance.log import SavingLogger
from deliverance.security import display_logging, display_local_files, edit_local_files
from deliverance.util.filetourl import url_to_filename
from deliverance.editor.editorapp import Editor
from deliverance.rules import clientside_action
+from deliverance.ruleset import RuleSet
__all__ = ['DeliveranceMiddleware', 'SubrequestRuleGetter']
@@ -547,8 +548,7 @@
self.url = url
def __call__(self, get_resource, app, orig_req):
- from deliverance.ruleset import RuleSet
- from lxml.etree import XML, XMLSyntaxError
+ from lxml.etree import XML
import urlparse
url = urlparse.urljoin(orig_req.url, self.url)
doc_resp = get_resource(url)
@@ -585,10 +585,10 @@
except XMLSyntaxError, e:
raise Exception('Invalid syntax in %s: %s' % (filename, e))
assert doc.tag == 'ruleset', (
- 'Bad rule tag <%s> in document %s' % (doc.tag, url))
+ 'Bad rule tag <%s> in document %s' % (doc.tag, filename))
assert doc.tag == 'ruleset', (
- 'Bad rule tag <%s> in document %s' % (doc.tag, url))
- self.ruleset = RuleSet.parse_xml(doc, url)
+ 'Bad rule tag <%s> in document %s' % (doc.tag, filename))
+ self.ruleset = RuleSet.parse_xml(doc, filename)
def __call__(self, get_resource, app, orig_req):
return self.ruleset
@@ -607,7 +607,7 @@
rule_getter = SubrequestRuleGetter(rule_uri)
else:
rule_getter = FileRuleGetter(rule_filename)
- app = middleware.DeliveranceMiddleware(app, rule_getter)
+ app = DeliveranceMiddleware(app, rule_getter)
from paste.deploy.converters import asbool
if debug is None:
debug = asbool(global_conf.get('debug', False))
From z3-checkins at codespeak.net Fri Apr 3 15:04:22 2009
From: z3-checkins at codespeak.net (MensHealth.com)
Date: Fri, 3 Apr 2009 15:04:22 +0200 (CEST)
Subject: [z3-checkins] Credit limit exceeded
Message-ID: <20090403130422.0793D1684CD@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090403/a4bf0146/attachment.htm
From z3-checkins at codespeak.net Fri Apr 3 19:26:56 2009
From: z3-checkins at codespeak.net (MensHealth.com)
Date: Fri, 3 Apr 2009 19:26:56 +0200 (CEST)
Subject: [z3-checkins] Mortgage loan information
Message-ID: <20090403172656.A7BCC1684C9@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090403/aa01dbde/attachment.htm
From z3-checkins at codespeak.net Sat Apr 4 07:03:15 2009
From: z3-checkins at codespeak.net (MensHealth.com)
Date: Sat, 4 Apr 2009 07:03:15 +0200 (CEST)
Subject: [z3-checkins] Account liquidation service report
Message-ID: <20090404050315.2F70F1684C8@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090404/65ae05f0/attachment.htm
From z3-checkins at codespeak.net Sat Apr 4 16:06:08 2009
From: z3-checkins at codespeak.net (MensHealth.com)
Date: Sat, 4 Apr 2009 16:06:08 +0200 (CEST)
Subject: [z3-checkins] Mortgage loan information
Message-ID: <20090404140608.0868B168483@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090404/7a3c112a/attachment.htm
From z3-checkins at codespeak.net Sun Apr 5 02:27:39 2009
From: z3-checkins at codespeak.net (PFIZER Inc.)
Date: Sun, 5 Apr 2009 07:27:39 +0700
Subject: [z3-checkins] U.S.A. Pharmacy Discount ID#XYQVTH
Message-ID: <20090405142739.2810.qmail@amerblind.outbound.ed10.com>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090405/6a0f8d21/attachment-0001.htm
-------------- next part --------------
? Weight Loss Wisdom
? Skin & Beauty
? Living Better
? Allergies & Asthma
? Depression
? Pregnancy Week by Week
? Rheumatoid Arthritis
? Women's Health
? Sex & Relationships
? Fibromyalgia
? Healthy Bones
? Heart Health
? Weight Control
? Healthy Recipes
New from WebMD: Find Life Balance with a Healthy Fitness Routine!
Whether you're a yoga fanatic, a marathon runner, or just someone who is looking for ways to integrate fitness into your routine, there's something for you in the new WebMD Fitness newsletter. Sign-up today!
You are subscribed as z3-checkins at codespeak.net.
View and manage your WebMD newsletter preferences.
Subscribe to more newsletters. Change/update your email address.
WebMD Privacy Policy
WebMD Office of Privacy
1175 Peachtree Street, Suite 2400, Atlanta, GA 30361
? 2009 WebMD, LLC. All rights reserved.
From z3-checkins at codespeak.net Sun Apr 5 14:31:18 2009
From: z3-checkins at codespeak.net (MensHealth.com)
Date: Sun, 5 Apr 2009 14:31:18 +0200 (CEST)
Subject: [z3-checkins] Credit card reward offers
Message-ID: <20090405123118.BA4591684EA@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090405/e12c0263/attachment.htm
From z3-checkins at codespeak.net Thu Apr 9 17:24:20 2009
From: z3-checkins at codespeak.net (hyuuga Ubogyjw)
Date: Thu, 9 Apr 2009 17:24:20 +0200 (CEST)
Subject: [z3-checkins] I need you to answer!
Message-ID: <20090409152420.E8D7E168567@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090409/87817c94/attachment.htm
From z3-checkins at codespeak.net Fri Apr 10 22:22:16 2009
From: z3-checkins at codespeak.net (me)
Date: Fri, 10 Apr 2009 22:22:16 +0200 (CEST)
Subject: [z3-checkins] I want to chat
Message-ID: <20090410202216.2ECE5169DFB@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090410/553cebf6/attachment.htm
From rmarianski at codespeak.net Sat Apr 11 01:13:10 2009
From: rmarianski at codespeak.net (rmarianski at codespeak.net)
Date: Sat, 11 Apr 2009 01:13:10 +0200 (CEST)
Subject: [z3-checkins] r63969 - z3/deliverance/trunk/deliverance/tests
Message-ID: <20090410231310.40BF9169E0F@codespeak.net>
Author: rmarianski
Date: Sat Apr 11 01:13:09 2009
New Revision: 63969
Modified:
z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
resolve test failures (we know have a doctype appearing, probably from lxml)
Modified: z3/deliverance/trunk/deliverance/tests/test_middleware.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/tests/test_middleware.txt (original)
+++ z3/deliverance/trunk/deliverance/tests/test_middleware.txt Sat Apr 11 01:13:09 2009
@@ -118,6 +118,7 @@