From ldr at codespeak.net  Wed Jan 13 17:07:13 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 13 Jan 2010 17:07:13 +0100 (CET)
Subject: [z3-checkins] r70567 - z3/xdv/trunk/lib/xdv
Message-ID: <20100113160713.93507168048@codespeak.net>

Author: ldr
Date: Wed Jan 13 17:07:13 2010
New Revision: 70567

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
Factor out inclusions to prepare for SSI / ESI support

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Jan 13 17:07:13 2010
@@ -194,21 +194,17 @@
                         <xsl:attribute name="test">
                             <xsl:value-of select="@if-content"/>
                         </xsl:attribute>
-                        <xsl:element name="xsl:copy-of">
-                            <xsl:attribute name="select">
-                                <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                ><xsl:value-of select="@content"/>
-                            </xsl:attribute>
-                        </xsl:element>
+                        <xsl:call-template name="include">
+                            <xsl:with-param name="href" select="@href"/>
+                            <xsl:with-param name="content" select="@content"/>
+                        </xsl:call-template>
                     </xsl:element>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:element name="xsl:copy-of">
-                        <xsl:attribute name="select">
-                            <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                            ><xsl:value-of select="@content"/>
-                        </xsl:attribute>
-                    </xsl:element>
+                    <xsl:call-template name="include">
+                        <xsl:with-param name="href" select="@href"/>
+                        <xsl:with-param name="content" select="@content"/>
+                    </xsl:call-template>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
@@ -289,13 +285,11 @@
             <xsl:when test="$matching-this/@nocontent='drop'">
                 <!-- <replace nocontent="drop" ...
                 Toss out the theme node.  Simply 
-                <xsl:copy-of the @content. -->
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">
-                        <xsl:if test="$matching-this/@href">document('<xsl:value-of select="$matching-this/@href"/>', .)</xsl:if
-                        ><xsl:value-of select="$matching-this/@content"/>
-                    </xsl:attribute>
-                </xsl:element>
+                include the @content. -->
+                <xsl:call-template name="include">
+                    <xsl:with-param name="href" select="$matching-this/@href"/>
+                    <xsl:with-param name="content" select="$matching-this/@content"/>
+                </xsl:call-template>
                 <!-- jump to after rules -->
                 <xsl:call-template name="after">
                     <xsl:with-param name="matching-rules" select="$matching-other"/>
@@ -308,18 +302,16 @@
                 <xsl:copy-of the @content. Otherwise keep theme node. -->
                 <xsl:element name="xsl:choose">
                     <xsl:element name="xsl:when">
-                        <xsl:attribute name="test">
+                        <xsl:attribute name="test"> <!-- XXX -->
                             <xsl:if test="$matching-this/@href">document('<xsl:value-of select="$matching-this/@href"/>', .)</xsl:if><xsl:choose>
                                 <xsl:when test="$matching-this/@if-condition"><xsl:value-of select="$matching-this/@if-condition"/></xsl:when>
                                 <xsl:otherwise><xsl:value-of select="$matching-this/@content"/></xsl:otherwise>
                             </xsl:choose>
                         </xsl:attribute>
-                        <xsl:element name="xsl:copy-of">
-                            <xsl:attribute name="select">
-                                <xsl:if test="$matching-this/@href">document('<xsl:value-of select="$matching-this/@href"/>', .)</xsl:if
-                                ><xsl:value-of select="$matching-this/@content"/>
-                            </xsl:attribute>
-                        </xsl:element>
+                        <xsl:call-template name="include">
+                            <xsl:with-param name="href" select="$matching-this/@href"/>
+                            <xsl:with-param name="content" select="$matching-this/@content"/>
+                        </xsl:call-template>
                         <!-- jump to after rules -->
                         <xsl:call-template name="after">
                             <xsl:with-param name="matching-rules" select="$matching-other"/>
@@ -362,21 +354,17 @@
                                     <xsl:attribute name="test">
                                         <xsl:value-of select="@if-content"/>
                                     </xsl:attribute>
-                                    <xsl:element name="xsl:copy-of">
-                                        <xsl:attribute name="select">
-                                            <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                            ><xsl:value-of select="@content"/>
-                                        </xsl:attribute>
-                                    </xsl:element>
+                                    <xsl:call-template name="include">
+                                        <xsl:with-param name="href" select="@href"/>
+                                        <xsl:with-param name="content" select="@content"/>
+                                    </xsl:call-template>
                                 </xsl:element>
                             </xsl:when>
                             <xsl:otherwise>
-                                <xsl:element name="xsl:copy-of">
-                                    <xsl:attribute name="select">
-                                        <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                        ><xsl:value-of select="@content"/>
-                                    </xsl:attribute>
-                                </xsl:element>
+                                <xsl:call-template name="include">
+                                    <xsl:with-param name="href" select="@href"/>
+                                    <xsl:with-param name="content" select="@content"/>
+                                </xsl:call-template>
                             </xsl:otherwise>
                         </xsl:choose>
                     </xsl:for-each>
@@ -391,14 +379,11 @@
                             <xsl:choose>
                                 <xsl:when test="$this/@nocontent='empty'">
                                     <!-- Copy the node and its attributes, but clear 
-                                        the children and content.  Just have an 
-                                        <xsl:copy-of> for the @content -->
-                                    <xsl:element name="xsl:copy-of">
-                                        <xsl:attribute name="select">
-                                            <xsl:if test="$this/@href">document('<xsl:value-of select="$this/@href"/>', .)</xsl:if
-                                            ><xsl:value-of select="$this/@content"/>
-                                        </xsl:attribute>
-                                    </xsl:element>
+                                    the children and content.  Just invclude the @content -->
+                                    <xsl:call-template name="include">
+                                        <xsl:with-param name="href" select="$this/@href"/>
+                                        <xsl:with-param name="content" select="$this/@content"/>
+                                    </xsl:call-template>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <!-- When the rule matches, copy the node and its attributes,
@@ -406,18 +391,16 @@
                                     for the @content. Otherwise keep theme node. -->
                                     <xsl:element name="xsl:choose">
                                         <xsl:element name="xsl:when">
-                                            <xsl:attribute name="test">
+                                            <xsl:attribute name="test"> <!-- XXX -->
                                                 <xsl:if test="$this/@href">document('<xsl:value-of select="$this/@href"/>', .)</xsl:if><xsl:choose>
                                                     <xsl:when test="$this/@if-condition"><xsl:value-of select="$this/@if-condition"/></xsl:when>
                                                     <xsl:otherwise><xsl:value-of select="$this/@content"/></xsl:otherwise>
                                                 </xsl:choose>
                                             </xsl:attribute>
-                                            <xsl:element name="xsl:copy-of">
-                                                <xsl:attribute name="select">
-                                                    <xsl:if test="$this/@href">document('<xsl:value-of select="$this/@href"/>', .)</xsl:if
-                                                    ><xsl:value-of select="$this/@content"/>
-                                                </xsl:attribute>
-                                            </xsl:element>
+                                            <xsl:call-template name="include">
+                                                <xsl:with-param name="href" select="$this/@href"/>
+                                                <xsl:with-param name="content" select="$this/@content"/>
+                                            </xsl:call-template>
                                         </xsl:element>
                                         <xsl:element name="xsl:otherwise">
                                             <xsl:apply-templates select="node()" mode="apply-rules">
@@ -441,21 +424,17 @@
                                     <xsl:attribute name="test">
                                         <xsl:value-of select="@if-content"/>
                                     </xsl:attribute>
-                                    <xsl:element name="xsl:copy-of">
-                                        <xsl:attribute name="select">
-                                            <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                            ><xsl:value-of select="@content"/>
-                                        </xsl:attribute>
-                                    </xsl:element>
+                                    <xsl:call-template name="include">
+                                        <xsl:with-param name="href" select="@href"/>
+                                        <xsl:with-param name="content" select="@content"/>
+                                    </xsl:call-template>
                                 </xsl:element>
                             </xsl:when>
                             <xsl:otherwise>
-                                <xsl:element name="xsl:copy-of">
-                                    <xsl:attribute name="select">
-                                        <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                        ><xsl:value-of select="@content"/>
-                                    </xsl:attribute>
-                                </xsl:element>
+                                <xsl:call-template name="include">
+                                    <xsl:with-param name="href" select="@href"/>
+                                    <xsl:with-param name="content" select="@content"/>
+                                </xsl:call-template>
                             </xsl:otherwise>
                         </xsl:choose>
                     </xsl:for-each>
@@ -489,21 +468,17 @@
                         <xsl:attribute name="test">
                             <xsl:value-of select="@if-content"/>
                         </xsl:attribute>
-                        <xsl:element name="xsl:copy-of">
-                            <xsl:attribute name="select">
-                                <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                                ><xsl:value-of select="@content"/>
-                            </xsl:attribute>
-                        </xsl:element>
+                        <xsl:call-template name="include">
+                            <xsl:with-param name="href" select="@href"/>
+                            <xsl:with-param name="content" select="@content"/>
+                        </xsl:call-template>
                     </xsl:element>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:element name="xsl:copy-of">
-                        <xsl:attribute name="select">
-                            <xsl:if test="@href">document('<xsl:value-of select="@href"/>', .)</xsl:if
-                            ><xsl:value-of select="@content"/>
-                        </xsl:attribute>
-                    </xsl:element>
+                    <xsl:call-template name="include">
+                        <xsl:with-param name="href" select="@href"/>
+                        <xsl:with-param name="content" select="@content"/>
+                    </xsl:call-template>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
@@ -521,6 +496,16 @@
             </xsl:apply-templates>
         </xsl:copy>
     </xsl:template>
+    <xsl:template name="include">
+        <xsl:param name="href"/>
+        <xsl:param name="content"/>
+        <xsl:element name="xsl:copy-of">
+            <xsl:attribute name="select">
+                <xsl:if test="$href">document('<xsl:value-of select="$href"/>', .)</xsl:if
+                ><xsl:value-of select="$content"/>
+            </xsl:attribute>
+        </xsl:element>
+    </xsl:template>
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>
         <xsl:if test="$trace">

From ldr at codespeak.net  Wed Jan 13 20:15:40 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 13 Jan 2010 20:15:40 +0100 (CET)
Subject: [z3-checkins] r70569 - z3/xdv/trunk/lib/xdv
Message-ID: <20100113191540.B741C16804E@codespeak.net>

Author: ldr
Date: Wed Jan 13 20:15:33 2010
New Revision: 70569

Added:
   z3/xdv/trunk/lib/xdv/filter.xsl
Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
Basic SSI href support for nginx. href urls must be absolute local paths. replace and copy without nocontent=drop will have problems in SSI mode

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Wed Jan 13 20:15:33 2010
@@ -50,7 +50,7 @@
             return self.resolve_string(self.extra, context)
 
 
-def compile_theme(rules, theme, extra=None, css=True, xinclude=False, update=True, trace=False, parser=None, compiler_parser=None):
+def compile_theme(rules, theme, extra=None, css=True, xinclude=False, update=True, trace=False, includemode=None, parser=None, compiler_parser=None):
     """Invoke the xdv compiler
     """
     rules_doc = etree.parse(rules)
@@ -77,6 +77,9 @@
         resolver = CompileResolver(etree.tostring(rules_doc))
     if trace:
         params['trace'] = '1'
+    if includemode:
+        params['includemode'] = "'%s'" % includemode
+
     compiler_parser.resolvers.add(resolver)
     compiled = compiler_transform(theme_doc, **params)
     for msg in compiler_transform.error_log:
@@ -111,6 +114,9 @@
     parser.add_option("--xinclude", action="store_true",
                       help="Run XInclude on rules.xml",
                       dest="xinclude", default=False)
+    parser.add_option("-i", "--includemode", metavar="INC",
+                      help="include mode (document or ssi)",
+                      dest="includemode", default='document')
     (options, args) = parser.parse_args()
     
     if len(args) !=2:
@@ -120,7 +126,7 @@
     if options.trace:
         logger.setLevel(logging.DEBUG)
 
-    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude)
+    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, includemode=options.includemode)
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Jan 13 20:15:33 2010
@@ -9,6 +9,8 @@
     <xsl:param name="boilerplateurl">boilerplate.xsl</xsl:param>
     <xsl:param name="extraurl"/>
     <xsl:param name="trace"/>
+    <xsl:param name="includemode">document</xsl:param>
+    <xsl:param name="ssiprefix">/_include</xsl:param>
     <xsl:variable name="theme" select="/"/>
     <!-- Multi-stage theme compiler -->
     <xsl:template match="/">
@@ -499,12 +501,34 @@
     <xsl:template name="include">
         <xsl:param name="href"/>
         <xsl:param name="content"/>
-        <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">
-                <xsl:if test="$href">document('<xsl:value-of select="$href"/>', .)</xsl:if
-                ><xsl:value-of select="$content"/>
-            </xsl:attribute>
-        </xsl:element>
+        <xsl:choose>
+            <xsl:when test="not($href)">
+                <xsl:element name="xsl:copy-of">
+                    <xsl:attribute name="select">
+                        <xsl:value-of select="$content"/>
+                    </xsl:attribute>
+                </xsl:element>
+            </xsl:when>
+            <xsl:when test="$includemode = 'document'">
+                <xsl:element name="xsl:copy-of">
+                    <xsl:attribute name="select">
+                        document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/>
+                    </xsl:attribute>
+                </xsl:element>
+            </xsl:when>
+            <xsl:when test="$includemode = 'ssi'">
+                <!-- Assumptions:
+                    * $href is an absolute local path (e.g.  /foo/bar)
+                -->
+                <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
+                    /><xsl:value-of select="$href"/>?content=<xsl:value-of select="$content"/>" </xsl:element>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">
+                    ERROR: Unknown includemode.
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>

Added: z3/xdv/trunk/lib/xdv/filter.xsl
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/filter.xsl	Wed Jan 13 20:15:33 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8"/>
+    <!-- Filter document by xpath content -->
+    <xsl:param name="content">/</xsl:param>
+    <xsl:template match="/">
+        <xsl:copy-of select="$content"/>
+        <xsl:if test="not($content)">
+            <!-- Make sure we at least return something to avoid errors -->
+            <xsl:comment>WARNING: No content found</xsl:comment>
+        </xsl:if>
+    </xsl:template>
+</xsl:stylesheet>

From ldr at codespeak.net  Wed Jan 13 20:16:11 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 13 Jan 2010 20:16:11 +0100 (CET)
Subject: [z3-checkins] r70570 - in z3/xdv/trunk: . examples examples/nginx
Message-ID: <20100113191611.11FE416804E@codespeak.net>

Author: ldr
Date: Wed Jan 13 20:16:08 2010
New Revision: 70570

Removed:
   z3/xdv/trunk/examples/theme.xsl
Modified:
   z3/xdv/trunk/examples/nginx/nginx.conf.in
   z3/xdv/trunk/examples/rules.xml
   z3/xdv/trunk/nginx.cfg
Log:
nginx ssi include example

Modified: z3/xdv/trunk/examples/nginx/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/examples/nginx/nginx.conf.in	(original)
+++ z3/xdv/trunk/examples/nginx/nginx.conf.in	Wed Jan 13 20:16:08 2010
@@ -1,4 +1,5 @@
-worker_processes 2;
+worker_processes 1;
+error_log ${buildout:directory}/var/log/nginx-error.log debug;
 
 events {
 #    worker_connections  1024;
@@ -14,11 +15,17 @@
         root ${nginx-conf:root};
         autoindex on;
 
+        location = /styled/ {
+            alias ${nginx-conf:root};
+            # don't style the index page, we include it
+        }
+
         location /styled {
             alias ${nginx-conf:root};
-            xslt_stylesheet ${nginx-conf:root}/theme.xsl;
+            xslt_stylesheet ${nginx-conf:theme-xsl};
             xslt_html_parser on;
             xslt_types text/html;
+            ssi on;
         }
 
         location /styled/ploneorg {
@@ -27,5 +34,25 @@
             xslt_html_parser on;
             xslt_types text/html;
         }
+        
+        location = /_include_400 {
+            return 400;
+        }
+        
+        location /_include { 
+            alias ${nginx-conf:root};
+            error_page 400 = /_include_400;
+            if ($arg_content !~ .) {
+                return 400;
+            }
+        
+#        location ~ ^/_include(.+)$ {
+#            echo_location_async $1;
+            xslt_stylesheet ${nginx-conf:filter-xsl}
+                content=$arg_content
+                ;
+            xslt_html_parser on;
+            xslt_types text/html;
+        }
     }
 }

Modified: z3/xdv/trunk/examples/rules.xml
==============================================================================
--- z3/xdv/trunk/examples/rules.xml	(original)
+++ z3/xdv/trunk/examples/rules.xml	Wed Jan 13 20:16:08 2010
@@ -5,6 +5,7 @@
     <copy css:theme="#pageheading" content="/html/head/title/text()"/>
     <copy theme="/html/body/h1" content="/html/head/title/text()"/>
     <copy css:theme="#pagecontent" content="/html/body/div[@id='content']/*"/>
+    <append css:theme="#nav" css:content="pre" href="/"/>
     <!-- assume this is an index view -->
     <append css:theme="#nav" css:content="pre" if-content="not(/html/body/div[@id='content'])"/>
 </rules>

Deleted: /z3/xdv/trunk/examples/theme.xsl
==============================================================================
--- /z3/xdv/trunk/examples/theme.xsl	Wed Jan 13 20:16:08 2010
+++ (empty file)
@@ -1,79 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
-  <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-    <xsl:template match="/">
-
-        <!-- Pass incoming content through initial-stage filter. -->
-        <xsl:variable name="initial-stage-rtf">
-            <xsl:apply-templates select="/" mode="initial-stage"/>
-        </xsl:variable>
-        <xsl:variable name="initial-stage" select="exsl:node-set($initial-stage-rtf)"/>
-
-        <!-- Now apply the theme to the initial-stage content -->
-        <xsl:variable name="themedcontent-rtf">
-            <xsl:apply-templates select="$initial-stage" mode="apply-theme"/>
-        </xsl:variable>
-        <xsl:variable name="content" select="exsl:node-set($themedcontent-rtf)"/>
-
-        <!-- We're done, so generate some output by passing 
-            through a final stage. -->
-        <xsl:apply-templates select="$content" mode="final-stage"/>
-
-    </xsl:template>
-
-    <!-- 
-    
-        Utility templates
-    -->
-    <xsl:template match="//*[@id = 'byline']" mode="initial-stage"><!--Do nothing, skip these nodes--></xsl:template>
-    <xsl:template match="node()|@*" mode="initial-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="initial-stage"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="/" mode="apply-theme">
-        <html><head><xsl:choose><xsl:when test="/html/head/title"><xsl:copy-of select="/html/head/title"/></xsl:when><xsl:otherwise><title>Theme Page Title</title></xsl:otherwise></xsl:choose></head><body>
-        <h1 class="somethemeclass"><xsl:choose><xsl:when test="/html/head/title/text()"><xsl:copy-of select="/html/head/title/text()"/></xsl:when><xsl:otherwise>Theme Page Heading</xsl:otherwise></xsl:choose></h1>
-        <table border="0" height="300" cellpadding="20"><tr><td width="200" bgcolor="gray" valign="top" id="nav">
-                    <h2 align="center">Navigation</h2>
-                <xsl:if test="not(/html/body/div[@id='content'])"><xsl:copy-of select="//pre"/></xsl:if></td>
-                <td valign="top">
-                    <h1 id="pageheading"><xsl:choose><xsl:when test="/html/head/title/text()"><xsl:copy-of select="/html/head/title/text()"/></xsl:when><xsl:otherwise>Theme Page Heading</xsl:otherwise></xsl:choose></h1>
-                    <div id="pagecontent"><xsl:choose><xsl:when test="/html/body/div[@id='content']/*"><xsl:copy-of select="/html/body/div[@id='content']/*"/></xsl:when><xsl:otherwise>Theme content to replace.</xsl:otherwise></xsl:choose></div>
-                </td>
-            </tr></table></body></html>
-    </xsl:template>
-    <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:apply-templates select="@*" mode="final-stage"/>
-            <xsl:value-of select="text()" disable-output-escaping="yes"/>
-        </xsl:element>
-    </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template match="node()|@*" priority="1" mode="final-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="final-stage"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- 
-    
-        Extra templates
-    -->
-    
-</xsl:stylesheet>
\ No newline at end of file

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Wed Jan 13 20:16:08 2010
@@ -3,11 +3,12 @@
 parts +=
     nginx
     nginx-conf
+    compile-theme
 
 [nginx]
 recipe = zc.recipe.cmmi
-url = http://html-xslt.googlecode.com/files/nginx-0.7.64-html-xslt.tar.gz
-md5sum = f7eb0fef7cd0317294431153ce8e1817
+url = http://html-xslt.googlecode.com/files/nginx-0.7.64-html-xslt2.tar.gz
+md5sum = 76a25c47d0aa01399102c477542a70b5
 extra_options =
     --conf-path=${buildout:directory}/etc/nginx.conf
     --sbin-path=${buildout:directory}/bin
@@ -19,11 +20,22 @@
     --with-http_xslt_module
     --with-libxml2=${buildout:directory}/parts/lxml/libxml2
     --with-libxslt=${buildout:directory}/parts/lxml/libxslt
-#    --with-debug --with-cc-opt="-O0" # helps debugging with gdb
+    --with-debug --with-cc-opt="-O0" # helps debugging with gdb
 
 [nginx-conf]
 recipe = collective.recipe.template
 port = 8000
 root = ${buildout:directory}/examples
+filter-xsl = ${buildout:directory}/lib/xdv/filter.xsl
+theme-xsl = ${buildout:directory}/etc/theme.xsl
 input = ${buildout:directory}/examples/nginx/nginx.conf.in
 output = ${buildout:directory}/etc/nginx.conf
+
+[compile-theme]
+recipe = plone.recipe.command
+command = 
+    ${buildout:directory}/bin/xdvcompiler \
+        --includemode=ssi  --output=${nginx-conf:theme-xsl} \
+        ${nginx-conf:root}/rules.xml ${nginx-conf:root}/theme.html
+
+update-command = ${compile-theme:command}
\ No newline at end of file

From ldr at codespeak.net  Thu Jan 14 19:34:26 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 14 Jan 2010 19:34:26 +0100 (CET)
Subject: [z3-checkins] r70593 - in z3/xdv/trunk: examples/nginx lib/xdv
Message-ID: <20100114183426.AAB2316803B@codespeak.net>

Author: ldr
Date: Thu Jan 14 19:34:26 2010
New Revision: 70593

Modified:
   z3/xdv/trunk/examples/nginx/nginx.conf.in
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/filter.xsl
Log:
tweaks to ssi include mode. relative urls are now ok

Modified: z3/xdv/trunk/examples/nginx/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/examples/nginx/nginx.conf.in	(original)
+++ z3/xdv/trunk/examples/nginx/nginx.conf.in	Thu Jan 14 19:34:26 2010
@@ -8,18 +8,47 @@
 http {
     include ${buildout:directory}/etc/mime.types;
 #    gzip on;
-
     server {
         listen ${nginx-conf:port};
         server_name localhost;
         root ${nginx-conf:root};
         autoindex on;
 
-        location = /styled/ {
-            alias ${nginx-conf:root};
-            # don't style the index page, we include it
+        # Decide if we need to filter
+        if ($args ~ "^(.*);filter_xpath=(.*)$") {
+            set $newargs $1;
+            set $filter_xpath $2;
+            # rewrite args to avoid looping
+            rewrite    ^(.*)$    /_include$1?$newargs?;
         }
-
+        
+        location @include500 { return 500; }
+        location @include404 { return 404; }
+        
+        location ^~ /_include {
+            # Restrict to subrequests
+            internal;
+            error_page 404 = @include404;
+            
+            rewrite    ^/_include(.*)$    $1    break;
+            proxy_pass http://127.0.0.1:${nginx-conf:port};
+            
+            # Our safety belt.
+            proxy_set_header X-Loop 1$http_X_Loop; # unary count
+            error_page 500 = @include500;
+            if ($http_X_Loop ~ "11111") {
+                return 500;
+            }
+            
+            # Filter by xpath
+            xslt_stylesheet ${nginx-conf:filter-xsl}
+                xpath=$filter_xpath
+                ;
+            xslt_html_parser on;
+            xslt_types text/html;
+        }    
+        
+        
         location /styled {
             alias ${nginx-conf:root};
             xslt_stylesheet ${nginx-conf:theme-xsl};
@@ -33,26 +62,6 @@
             xslt_stylesheet ${nginx-conf:root}/ploneorg/plone.xsl;
             xslt_html_parser on;
             xslt_types text/html;
-        }
-        
-        location = /_include_400 {
-            return 400;
-        }
-        
-        location /_include { 
-            alias ${nginx-conf:root};
-            error_page 400 = /_include_400;
-            if ($arg_content !~ .) {
-                return 400;
-            }
-        
-#        location ~ ^/_include(.+)$ {
-#            echo_location_async $1;
-            xslt_stylesheet ${nginx-conf:filter-xsl}
-                content=$arg_content
-                ;
-            xslt_html_parser on;
-            xslt_types text/html;
-        }
+        }    
     }
 }

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Thu Jan 14 19:34:26 2010
@@ -116,7 +116,7 @@
                       dest="xinclude", default=False)
     parser.add_option("-i", "--includemode", metavar="INC",
                       help="include mode (document or ssi)",
-                      dest="includemode", default='document')
+                      dest="includemode", default=None)
     (options, args) = parser.parse_args()
     
     if len(args) !=2:

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Thu Jan 14 19:34:26 2010
@@ -10,7 +10,8 @@
     <xsl:param name="extraurl"/>
     <xsl:param name="trace"/>
     <xsl:param name="includemode">document</xsl:param>
-    <xsl:param name="ssiprefix">/_include</xsl:param>
+    <xsl:param name="ssiprefix"></xsl:param>
+    <xsl:param name="ssisuffix">;filter_xpath=</xsl:param>
     <xsl:variable name="theme" select="/"/>
     <!-- Multi-stage theme compiler -->
     <xsl:template match="/">
@@ -521,7 +522,8 @@
                     * $href is an absolute local path (e.g.  /foo/bar)
                 -->
                 <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
-                    /><xsl:value-of select="$href"/>?content=<xsl:value-of select="$content"/>" </xsl:element>
+                    /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
+                    ><xsl:value-of select="$ssisuffix"/><xsl:value-of select="$content"/>" </xsl:element>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">

Modified: z3/xdv/trunk/lib/xdv/filter.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/filter.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/filter.xsl	Thu Jan 14 19:34:26 2010
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8"/>
-    <!-- Filter document by xpath content -->
-    <xsl:param name="content">/</xsl:param>
+    <!-- Filter document by xpath -->
+    <xsl:param name="xpath">/</xsl:param>
     <xsl:template match="/">
-        <xsl:copy-of select="$content"/>
-        <xsl:if test="not($content)">
+        <xsl:copy-of select="$xpath"/>
+        <xsl:if test="not($xpath)">
             <!-- Make sure we at least return something to avoid errors -->
             <xsl:comment>WARNING: No content found</xsl:comment>
         </xsl:if>

From ldr at codespeak.net  Thu Jan 14 19:39:59 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 14 Jan 2010 19:39:59 +0100 (CET)
Subject: [z3-checkins] r70594 - z3/xdv/trunk/examples/nginx
Message-ID: <20100114183959.CA07B16803B@codespeak.net>

Author: ldr
Date: Thu Jan 14 19:39:59 2010
New Revision: 70594

Modified:
   z3/xdv/trunk/examples/nginx/nginx.conf.in
Log:
tweaks to ssi include mode. relative urls are now ok

Modified: z3/xdv/trunk/examples/nginx/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/examples/nginx/nginx.conf.in	(original)
+++ z3/xdv/trunk/examples/nginx/nginx.conf.in	Thu Jan 14 19:39:59 2010
@@ -30,6 +30,7 @@
             internal;
             error_page 404 = @include404;
             
+            # Proxy
             rewrite    ^/_include(.*)$    $1    break;
             proxy_pass http://127.0.0.1:${nginx-conf:port};
             
@@ -46,22 +47,24 @@
                 ;
             xslt_html_parser on;
             xslt_types text/html;
-        }    
-        
+        }
         
+        # Our styled location.
         location /styled {
             alias ${nginx-conf:root};
             xslt_stylesheet ${nginx-conf:theme-xsl};
             xslt_html_parser on;
             xslt_types text/html;
+            # Switch on ssi here to enable external includes.
             ssi on;
         }
 
+        # Another styled location.
         location /styled/ploneorg {
             alias ${nginx-conf:root}/ploneorg;
             xslt_stylesheet ${nginx-conf:root}/ploneorg/plone.xsl;
             xslt_html_parser on;
             xslt_types text/html;
-        }    
+        }
     }
 }

From ldr at codespeak.net  Thu Jan 14 22:01:06 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 14 Jan 2010 22:01:06 +0100 (CET)
Subject: [z3-checkins] r70597 - z3/xdv/trunk/lib/xdv
Message-ID: <20100114210106.EB6C3168048@codespeak.net>

Author: ldr
Date: Thu Jan 14 22:01:03 2010
New Revision: 70597

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
improve tracing support to print matching rules

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Thu Jan 14 22:01:03 2010
@@ -186,7 +186,7 @@
         <xsl:variable name="rule-name">before</xsl:variable>
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
+        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <!--
             Always copy all content matching before rules
         -->
@@ -222,7 +222,7 @@
         <xsl:variable name="rule-name">drop</xsl:variable>
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
+        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
             <xsl:when test="$matching-this[not(@if-content)]">
                 <!--
@@ -278,7 +278,7 @@
         <xsl:variable name="rule-name">replace</xsl:variable>
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
+        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
             <xsl:when test="count($matching-this) > 1">
                 <xsl:message terminate="yes">
@@ -343,7 +343,7 @@
         <xsl:variable name="rule-name">prepend-copy-append</xsl:variable>
         <xsl:variable name="matching-this" select="$matching-rules[name()='prepend' or name()='copy' or name()='append']"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
+        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
             <xsl:when test="$matching-this">
                 <xsl:copy>
@@ -460,7 +460,7 @@
         <xsl:variable name="rule-name">after</xsl:variable>
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
+        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <!--
             Always copy all content matching after rules
         -->
@@ -534,8 +534,13 @@
     </xsl:template>
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>
+        <xsl:param name="matching" select="/.."/>
         <xsl:if test="$trace">
             <xsl:message>TRACE: <xsl:call-template name="printpath"/> - <xsl:value-of select="$rule-name"/></xsl:message>
+            <xsl:for-each select="$matching">
+                <xsl:message>RULE: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
+                    <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
+            </xsl:for-each>
         </xsl:if>
     </xsl:template>
     <xsl:template name="printpath"

From ldr at codespeak.net  Thu Jan 14 22:20:37 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 14 Jan 2010 22:20:37 +0100 (CET)
Subject: [z3-checkins] r70598 - z3/xdv/trunk/lib/xdv
Message-ID: <20100114212037.2BAB7168048@codespeak.net>

Author: ldr
Date: Thu Jan 14 22:20:36 2010
New Revision: 70598

Modified:
   z3/xdv/trunk/lib/xdv/cssrules.py
Log:
error checking for empty css attributes

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Thu Jan 14 22:20:36 2010
@@ -17,13 +17,19 @@
 
 import utils
 
+import logging
+logger = logging.getLogger('xdv')
+
 def convert_css_selectors(rules, prefix='//'):
     """Convert css rules to xpath rules element tree in place
     """
     for element in rules.xpath("//@*[namespace-uri()='%s']/.." % utils.namespaces['css']):
         for name, value in element.attrib.items():
-            if name.startswith('{%s}' % utils.namespaces['css']):
-                element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = css_to_xpath(value, prefix=prefix)
+            if value: 
+                if name.startswith('{%s}' % utils.namespaces['css']):
+                    element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = css_to_xpath(value, prefix=prefix)
+            else:
+                logger.error("Missing value for attribute %s" %name)
 
 def main():
     """Called from console script

From ldr at codespeak.net  Sat Jan 23 00:40:37 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sat, 23 Jan 2010 00:40:37 +0100 (CET)
Subject: [z3-checkins] r70787 - z3/xdv/trunk
Message-ID: <20100122234037.ABDA116802D@codespeak.net>

Author: ldr
Date: Sat Jan 23 00:40:34 2010
New Revision: 70787

Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/setup.py
Log:
prepare 0.3a1 release

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Sat Jan 23 00:40:34 2010
@@ -55,6 +55,3 @@
 
 2) Link rewriting
 
-3) CSS Selector syntax
-
-

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Sat Jan 23 00:40:34 2010
@@ -1,7 +1,12 @@
 from setuptools import setup, find_packages
 setup(
     name='xdv',
-    version='0.3',
+    version='0.3a1',
+    description='''\
+xdv implements a subset of Deliverance using a pure XSLT engine. With xdv, you
+"compile" your theme and ruleset in one step, then use a superfast/simple
+transform on each request thereafter. Alternatively, compile your theme during
+development, check it into Subversion, and not touch xdv during deployment.''',
     packages=find_packages('lib'),
     package_dir = {'':'lib'},
     include_package_data=True,

From ldr at codespeak.net  Sat Jan 23 00:41:44 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sat, 23 Jan 2010 00:41:44 +0100 (CET)
Subject: [z3-checkins] r70788 - z3/xdv/tags
Message-ID: <20100122234144.44D53168030@codespeak.net>

Author: ldr
Date: Sat Jan 23 00:41:43 2010
New Revision: 70788

Added:
   z3/xdv/tags/
Log:
tags directory

From ldr at codespeak.net  Sat Jan 23 00:42:45 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sat, 23 Jan 2010 00:42:45 +0100 (CET)
Subject: [z3-checkins] r70789 - z3/xdv/tags/0.3a1
Message-ID: <20100122234245.96764168039@codespeak.net>

Author: ldr
Date: Sat Jan 23 00:42:45 2010
New Revision: 70789

Added:
   z3/xdv/tags/0.3a1/
      - copied from r70788, z3/xdv/trunk/
Log:
tag 0.1

From marshall at codespeak.net  Thu Jan 28 18:59:50 2010
From: marshall at codespeak.net (marshall at codespeak.net)
Date: Thu, 28 Jan 2010 18:59:50 +0100 (CET)
Subject: [z3-checkins] r70958 - in
	z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk: docs
	dv/xdvserver
Message-ID: <20100128175950.08B241680F4@codespeak.net>

Author: marshall
Date: Thu Jan 28 18:59:50 2010
New Revision: 70958

Modified:
   z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/docs/HISTORY.txt
   z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/dv/xdvserver/xdvcompiler.py
Log:
Added through the web resolving of the rules file.


Modified: z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/docs/HISTORY.txt
==============================================================================
--- z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/docs/HISTORY.txt	(original)
+++ z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/docs/HISTORY.txt	Thu Jan 28 18:59:50 2010
@@ -7,6 +7,9 @@
 * Apply patch from Lukas Zdych to fix absolute prefix.
   [optilude]
 
+* Added through the web resolving of the rules file.
+  [Marshall Scorcio]
+
 1.0b6 - 2009-10-27
 ------------------
 

Modified: z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/dv/xdvserver/xdvcompiler.py
==============================================================================
--- z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/dv/xdvserver/xdvcompiler.py	(original)
+++ z3/deliverance/sandboxes/optilude/dv.xdvserver/trunk/dv/xdvserver/xdvcompiler.py	Thu Jan 28 18:59:50 2010
@@ -9,6 +9,14 @@
 
 IMPORT_STYLESHEET_PATTERN = re.compile('@import url\\([\'"](.+)[\'"]\\);', re.I)
 
+class WWWResolver(etree.Resolver):
+    def resolve(self, system_url, public_id, context):
+        try:
+            data = urllib2.urlopen(system_url)
+            return self.resolve_string(data.read(), context)
+        except:
+            pass
+
 def to_absolute(src, prefix):
     if not (src.startswith('/') or '://' in src):
         if src.startswith('./'):
@@ -22,7 +30,9 @@
     """
     
     compiler = open(compiler)
-    compiler_transform = etree.XSLT(etree.ElementTree(file=compiler))
+    compiler_tree = etree.ElementTree(file=compiler)
+    compiler_tree.parser.resolvers.add(WWWResolver())
+    compiler_transform = etree.XSLT(compiler_tree)
     compiler.close()
     
     try:
@@ -62,11 +72,12 @@
 def prepare_filename(filename):
     """Make file name string parameters compatible with xdv's compiler.xsl
     """
-    
-    filename = os.path.abspath(filename)
-    if sys.platform.startswith('win'):
-        # compiler.xsl on Windows wants c:/foo/bar instead of C:\foo\bar
-        filename = filename.replace('\\', '/')
+
+    if not re.match('(http|https|ftp)://', filename.lower()):
+        filename = os.path.abspath(filename)
+        if sys.platform.startswith('win'):
+            # compiler.xsl on Windows wants c:/foo/bar instead of C:\foo\bar
+            filename = filename.replace('\\', '/')
         
     return filename
 

From ldr at codespeak.net  Tue Feb  2 23:26:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  2 Feb 2010 23:26:12 +0100 (CET)
Subject: [z3-checkins] r71072 - z3/xdv/trunk/lib/xdv
Message-ID: <20100202222612.2B0D41683EE@codespeak.net>

Author: ldr
Date: Tue Feb  2 23:26:11 2010
New Revision: 71072

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
Seems nginx has trouble with concurrent SSI includes and proxying back on itself

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Tue Feb  2 23:26:11 2010
@@ -523,7 +523,7 @@
                 -->
                 <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
                     /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
-                    ><xsl:value-of select="$ssisuffix"/><xsl:value-of select="$content"/>" </xsl:element>
+                    ><xsl:value-of select="$ssisuffix"/><xsl:value-of select="$content"/>" wait="yes" </xsl:element>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">

From optilude at codespeak.net  Sun Feb  7 13:12:49 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Sun,  7 Feb 2010 13:12:49 +0100 (CET)
Subject: [z3-checkins] r71146 - in z3/xdv/trunk: . lib lib/xdv lib/xdv/tests
	lib/xdv/tests/absolute
Message-ID: <20100207121249.1A3E3282BD5@codespeak.net>

Author: optilude
Date: Sun Feb  7 13:12:48 2010
New Revision: 71146

Added:
   z3/xdv/trunk/lib/xdv/tests/absolute/
   z3/xdv/trunk/lib/xdv/tests/absolute/rules.xml
   z3/xdv/trunk/lib/xdv/tests/absolute/theme.html
Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/lib/   (props changed)
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
Add absolute_prefix option from dv.xdvserver

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Sun Feb  7 13:12:48 2010
@@ -11,7 +11,7 @@
 Usage
 ----------------
 
-1) Edit the ``theme.html``, ``rules.xml``, and ``content.html``.
+1) Create the files ``theme.html``, ``rules.xml``, and ``content.html``.
 
 2) xsltproc --html compiler.xsl theme.html > compiledtheme.xsl
 

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun Feb  7 13:12:48 2010
@@ -11,19 +11,22 @@
 """
 usage = __doc__
 
+import re
 import os.path
 import sys
 import logging
 from lxml import etree
 from optparse import OptionParser
 
-from utils import namespaces, localname, fullname
+from utils import namespaces
 from cssrules import convert_css_selectors
 
 logger = logging.getLogger('xdv')
 
 HERE = os.path.dirname(__file__)
 
+IMPORT_STYLESHEET_PATTERN = '@import url\\([\'"](.+)[\'"]\\);'
+
 COMPILER_PATH = os.path.join(HERE, 'compiler.xsl')
 
 UPDATE_PATH = os.path.join(HERE, 'update-namespace.xsl')
@@ -49,9 +52,48 @@
         if url == 'xdv:extra' and self.extra is not None:
             return self.resolve_string(self.extra, context)
 
+def to_absolute(src, prefix):
+    """Turn a url 
+    """
+    if src.startswith('/') or '://' in src:
+        return src
+        
+    if src.startswith('./'):
+        return "%s/%s" % (prefix, src[2:])
+    else:
+        return "%s/%s" % (prefix, src)
 
-def compile_theme(rules, theme, extra=None, css=True, xinclude=False, update=True, trace=False, includemode=None, parser=None, compiler_parser=None):
-    """Invoke the xdv compiler
+def apply_absolute_prefix(theme_doc, absolute_prefix):
+    for node in theme_doc.xpath('*//style | *//script | *//img | *//link'):
+        if node.tag == 'img' or node.tag == 'script':
+            src = node.get('src')
+            if src:
+                node.set('src', to_absolute(src, absolute_prefix))
+        elif node.tag == 'link':
+            href = node.get('href')
+            if href:
+                node.set('href', to_absolute(href, absolute_prefix))
+        elif node.tag == 'style':
+            node.text = re.sub(IMPORT_STYLESHEET_PATTERN, r'@import url("%s/\1");' % absolute_prefix, node.text, re.I)
+
+def compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None):
+    """Invoke the xdv compiler.
+    
+    * ``rules`` is the rules file
+    * ``theme`` is the theme file
+    * ``extra`` is an optional XSLT file with XDV extensions
+    * ``css``   can be set to False to disable CSS syntax support (providing a
+      moderate speed gain)
+    * ``xinclude`` can be set to True to enable XInclude support (at a
+      moderate speed cost)
+    * ``update`` can be set to False to disable the automatic update support for
+      the old Deliverance 0.2 namespace (for a moderate speed gain)
+    * ``trace`` can be set to True to enable compiler trace information
+    * ``includemode`` can be set to 'document' or 'ssi' to change the way in
+      which includes are processed
+    * ``parser`` can be set to an lxml parser class; the default is HTMLParser
+    * ``compiler_parser``` can be set to an lxml parser class; the default is
+      XMLParser
     """
     rules_doc = etree.parse(rules)
     if xinclude:
@@ -65,6 +107,9 @@
         parser = etree.HTMLParser()
     theme_doc = etree.parse(theme, parser=parser)
     
+    if absolute_prefix:
+        apply_absolute_prefix(theme_doc, absolute_prefix)
+    
     if compiler_parser is None:
         compiler_parser = etree.XMLParser()
     compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser))

Added: z3/xdv/trunk/lib/xdv/tests/absolute/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/absolute/rules.xml	Sun Feb  7 13:12:48 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/absolute/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/absolute/theme.html	Sun Feb  7 13:12:48 2010
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+        <title>Absolute prefix</title>
+        
+        <style type="text/css">
+            @import url('foo.css');
+            @import url('./foo.css');
+            @import url('../foo.css');
+            @import url('/foo.css');
+            @import url('http://site.com/foo.css');
+        </style>
+        
+        <link rel="stylesheet" href="foo.css" />
+        <link rel="stylesheet" href="./foo.css" />
+        <link rel="stylesheet" href="../foo.css" />
+        <link rel="stylesheet" href="/foo.css" />
+        <link rel="stylesheet" href="http://site.com/foo.css" />
+        
+        <script type="text/javascript" src="foo.js" />
+        <script type="text/javascript" src="./foo.js" />
+        <script type="text/javascript" src="../foo.js" />
+        <script type="text/javascript" src="/foo.js" />
+        <script type="text/javascript" src="http://site.com/foo.js" />
+        
+    </head>
+    <body>
+        <img src="foo.jpg" />
+        <img src="./foo.jpg" />
+        <img src="../foo.jpg" />
+        <img src="/foo.jpg" />
+        <img src="http://site.com/foo.jpg" />
+        
+        <a href="foo.html">Link</a>
+    </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Sun Feb  7 13:12:48 2010
@@ -32,7 +32,14 @@
         xpathsfn = os.path.join(self.testdir, "xpaths.txt")
         xslfn = os.path.join(self.testdir, "compiled.xsl")
         outputfn = os.path.join(self.testdir, "output.html")
-
+        
+        if (not os.path.exists(themefn) or
+            not os.path.exists(contentfn) or
+            not os.path.exists(rulesfn) or
+            not os.path.exists(outputfn)
+        ):
+            return
+        
         contentdoc = etree.parse(source=contentfn, base_url=contentfn,
                                        parser=etree.HTMLParser())
 
@@ -43,7 +50,7 @@
         # Serialize / parse the theme - this can catch problems with escaping.
         cts = etree.tostring(ct)
         parser = etree.XMLParser()
-        ct2 = etree.fromstring(cts, parser=parser)
+        etree.fromstring(cts, parser=parser)
 
         # Compare to previous version
         if os.path.exists(xslfn):
@@ -99,7 +106,102 @@
         # Write the compiled xsl out to catch unexpected changes
         if self.writefiles:
             open(outputfn, 'w').write(self.themed_string)
-
+    
+class TestAbsolutePrefix(unittest.TestCase):
+    
+    def testEnabled(self):
+        testdir = os.path.join(HERE, 'absolute')
+        
+        themefn = os.path.join(testdir, "theme.html")
+        rulesfn = os.path.join(testdir, "rules.xml")
+        
+        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, absolute_prefix="/abs")
+        
+        styleTag = compiled.xpath('//style')[0]
+        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
+        
+        self.assertEquals([
+            '@import url("/abs/foo.css");',
+            '@import url("/abs/./foo.css");',
+            "@import url('../foo.css');",
+            "@import url('/foo.css');",
+            "@import url('http://site.com/foo.css');"
+        ], styleLines)
+        
+        linkTags = compiled.xpath('//link')
+        self.assertEquals([
+            '/abs/foo.css',
+            '/abs/foo.css',
+            '/abs/../foo.css',
+            '/foo.css',
+            'http://site.com/foo.css'
+        ], [x.get('href') for x in linkTags])
+        
+        scriptTags = compiled.xpath('//script')
+        self.assertEquals([
+            '/abs/foo.js',
+            '/abs/foo.js',
+            '/abs/../foo.js',
+            '/foo.js',
+            'http://site.com/foo.js'
+        ], [x.get('src') for x in scriptTags])
+        
+        imgTags = compiled.xpath('//img')
+        self.assertEquals([
+            '/abs/foo.jpg',
+            '/abs/foo.jpg',
+            '/abs/../foo.jpg',
+            '/foo.jpg',
+            'http://site.com/foo.jpg'
+        ], [x.get('src') for x in imgTags])
+    
+    def testDisabled(self):
+        testdir = os.path.join(HERE, 'absolute')
+        
+        themefn = os.path.join(testdir, "theme.html")
+        rulesfn = os.path.join(testdir, "rules.xml")
+        
+        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn)
+        
+        styleTag = compiled.xpath('//style')[0]
+        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
+        
+        self.assertEquals([
+            "@import url('foo.css');",
+            "@import url('./foo.css');",
+            "@import url('../foo.css');",
+            "@import url('/foo.css');",
+            "@import url('http://site.com/foo.css');"
+        ], styleLines)
+        
+        linkTags = compiled.xpath('//link')
+        self.assertEquals([
+            'foo.css',
+            './foo.css',
+            '../foo.css',
+            '/foo.css',
+            'http://site.com/foo.css'
+        ], [x.get('href') for x in linkTags])
+        
+        scriptTags = compiled.xpath('//script')
+        self.assertEquals([
+            'foo.js',
+            './foo.js',
+            '../foo.js',
+            '/foo.js',
+            'http://site.com/foo.js'
+        ], [x.get('src') for x in scriptTags])
+        
+        imgTags = compiled.xpath('//img')
+        self.assertEquals([
+            'foo.jpg',
+            './foo.jpg',
+            '../foo.jpg',
+            '/foo.jpg',
+            'http://site.com/foo.jpg'
+        ], [x.get('src') for x in imgTags])
+        
+    
 def main(*args, **kwargs):
     try:
         test_num = sys.argv[1]
@@ -138,9 +240,9 @@
             continue
         cls = type('Test%s'%name, (XDVTestCase,), dict(testdir=path))
         suite.addTest(unittest.makeSuite(cls))
+    suite.addTest(unittest.makeSuite(TestAbsolutePrefix))
     return suite
 
-
 if __name__ == "__main__":
     debug = '--debug' in sys.argv
     if debug:

From ldr at codespeak.net  Sun Feb  7 22:39:16 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun,  7 Feb 2010 22:39:16 +0100 (CET)
Subject: [z3-checkins] r71153 - in z3/xdv/trunk: . lib/xdv
Message-ID: <20100207213916.E8C25282BDC@codespeak.net>

Author: ldr
Date: Sun Feb  7 22:39:12 2010
New Revision: 71153

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/nginx.cfg
Log:
you pass in a compiler instance, not a class

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun Feb  7 22:39:12 2010
@@ -91,8 +91,8 @@
     * ``trace`` can be set to True to enable compiler trace information
     * ``includemode`` can be set to 'document' or 'ssi' to change the way in
       which includes are processed
-    * ``parser`` can be set to an lxml parser class; the default is HTMLParser
-    * ``compiler_parser``` can be set to an lxml parser class; the default is
+    * ``parser`` can be set to an lxml parser instance; the default is an HTMLParser
+    * ``compiler_parser``` can be set to an lxml parser instance; the default is a
       XMLParser
     """
     rules_doc = etree.parse(rules)

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Sun Feb  7 22:39:12 2010
@@ -20,7 +20,7 @@
     --with-http_xslt_module
     --with-libxml2=${buildout:directory}/parts/lxml/libxml2
     --with-libxslt=${buildout:directory}/parts/lxml/libxslt
-    --with-debug --with-cc-opt="-O0" # helps debugging with gdb
+#    --with-debug --with-cc-opt="-O0" # helps debugging with gdb
 
 [nginx-conf]
 recipe = collective.recipe.template

From ldr at codespeak.net  Mon Feb  8 15:24:49 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 15:24:49 +0100 (CET)
Subject: [z3-checkins] r71166 - in z3/xdv/trunk/lib/xdv: . tests
	tests/absolute
Message-ID: <20100208142449.C5F7F282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 15:24:46 2010
New Revision: 71166

Added:
   z3/xdv/trunk/lib/xdv/tests/absolute_rules.xml
      - copied unchanged from r71165, z3/xdv/trunk/lib/xdv/tests/absolute/rules.xml
   z3/xdv/trunk/lib/xdv/tests/absolute_theme.html
      - copied, changed from r71165, z3/xdv/trunk/lib/xdv/tests/absolute/theme.html
Removed:
   z3/xdv/trunk/lib/xdv/tests/absolute/
Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/run.py
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
improve the absolute path machinary

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Mon Feb  8 15:24:46 2010
@@ -25,7 +25,7 @@
 
 HERE = os.path.dirname(__file__)
 
-IMPORT_STYLESHEET_PATTERN = '@import url\\([\'"](.+)[\'"]\\);'
+IMPORT_STYLESHEET = re.compile(r'''(@import\s+(?:url\(['"]?|['"]))(.+)(['"]?\)|['"])''', re.IGNORECASE)
 
 COMPILER_PATH = os.path.join(HERE, 'compiler.xsl')
 
@@ -57,14 +57,15 @@
     """
     if src.startswith('/') or '://' in src:
         return src
-        
     if src.startswith('./'):
         return "%s/%s" % (prefix, src[2:])
     else:
         return "%s/%s" % (prefix, src)
 
 def apply_absolute_prefix(theme_doc, absolute_prefix):
-    for node in theme_doc.xpath('*//style | *//script | *//img | *//link'):
+    if absolute_prefix.endswith('/'):
+        absolute_prefix = absolute_prefix[:-1]
+    for node in theme_doc.xpath('*//style | *//script | *//img | *//link | *//comment()'):
         if node.tag == 'img' or node.tag == 'script':
             src = node.get('src')
             if src:
@@ -73,8 +74,8 @@
             href = node.get('href')
             if href:
                 node.set('href', to_absolute(href, absolute_prefix))
-        elif node.tag == 'style':
-            node.text = re.sub(IMPORT_STYLESHEET_PATTERN, r'@import url("%s/\1");' % absolute_prefix, node.text, re.I)
+        elif node.tag == 'style' or node.tag == etree.Comment and node.text.startswith("[if IE"):
+            node.text = IMPORT_STYLESHEET.sub(lambda match: match.group(1) + to_absolute(match.group(2), absolute_prefix) + match.group(3), node.text)
 
 def compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None):
     """Invoke the xdv compiler.
@@ -95,7 +96,8 @@
     * ``compiler_parser``` can be set to an lxml parser instance; the default is a
       XMLParser
     """
-    rules_doc = etree.parse(rules)
+    rules_parser = etree.XMLParser(recover=False)
+    rules_doc = etree.parse(rules, parser=rules_parser)
     if xinclude:
         rules_doc.xinclude()
     if update:
@@ -145,13 +147,13 @@
     """
     parser = OptionParser(usage=usage)
     parser.add_option("-e", "--extra", metavar="extra.xsl",
-                      help="XDV extraurl XSLT file",
+                      help="Extra XSL to be included in the transform",
                       dest="extra", default=None)
     parser.add_option("-o", "--output", metavar="output.xsl",
                       help="Output filename (instead of stdout)",
                       dest="output", default=sys.stdout)
     parser.add_option("-p", "--pretty-print", action="store_true",
-                      help="Pretty print output (can alter rendering on the browser)",
+                      help="Pretty print output (may alter rendering in browser)",
                       dest="pretty_print", default=False)
     parser.add_option("--trace", action="store_true",
                       help="Compiler trace logging",
@@ -159,6 +161,9 @@
     parser.add_option("--xinclude", action="store_true",
                       help="Run XInclude on rules.xml",
                       dest="xinclude", default=False)
+    parser.add_option("-a", "--absolute-prefix", metavar="/",
+                      help="relative urls in the theme file will be made into absolute links with this prefix.",
+                      dest="absolute_prefix", default=None)
     parser.add_option("-i", "--includemode", metavar="INC",
                       help="include mode (document or ssi)",
                       dest="includemode", default=None)
@@ -171,7 +176,7 @@
     if options.trace:
         logger.setLevel(logging.DEBUG)
 
-    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, includemode=options.includemode)
+    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Mon Feb  8 15:24:46 2010
@@ -69,6 +69,7 @@
     parser.resolvers.add(RunResolver(os.path.dirname(content)))
     transform = etree.XSLT(output_xslt)
     content_doc = etree.parse(content, parser=etree.HTMLParser())
+    import pdb; pdb.set_trace()
     output_html = transform(content_doc)
     output_html.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:

Copied: z3/xdv/trunk/lib/xdv/tests/absolute_theme.html (from r71165, z3/xdv/trunk/lib/xdv/tests/absolute/theme.html)
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/absolute/theme.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/absolute_theme.html	Mon Feb  8 15:24:46 2010
@@ -4,7 +4,8 @@
         <title>Absolute prefix</title>
         
         <style type="text/css">
-            @import url('foo.css');
+            @import "foo.css";        
+            @import url("foo.css");
             @import url('./foo.css');
             @import url('../foo.css');
             @import url('/foo.css');

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Mon Feb  8 15:24:46 2010
@@ -110,23 +110,23 @@
 class TestAbsolutePrefix(unittest.TestCase):
     
     def testEnabled(self):
-        testdir = os.path.join(HERE, 'absolute')
-        
-        themefn = os.path.join(testdir, "theme.html")
-        rulesfn = os.path.join(testdir, "rules.xml")
+        themefn = os.path.join(HERE, "absolute_theme.html")
+        rulesfn = os.path.join(HERE, "absolute_rules.xml")
         
         compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, absolute_prefix="/abs")
         
         styleTag = compiled.xpath('//style')[0]
         styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        
-        self.assertEquals([
+        expectedLines = [
+            '@import "/abs/foo.css";',
             '@import url("/abs/foo.css");',
-            '@import url("/abs/./foo.css");',
-            "@import url('../foo.css');",
+            "@import url('/abs/foo.css');",
+            "@import url('/abs/../foo.css');",
             "@import url('/foo.css');",
             "@import url('http://site.com/foo.css');"
-        ], styleLines)
+            ]
+        for line, expected in zip(styleLines, expectedLines):
+            self.assertEquals(line, expected)
         
         linkTags = compiled.xpath('//link')
         self.assertEquals([
@@ -165,14 +165,16 @@
         
         styleTag = compiled.xpath('//style')[0]
         styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        
-        self.assertEquals([
-            "@import url('foo.css');",
+        expectedLines = [
+            '@import "foo.css";',
+            '@import url("foo.css");',
             "@import url('./foo.css');",
             "@import url('../foo.css');",
             "@import url('/foo.css');",
             "@import url('http://site.com/foo.css');"
-        ], styleLines)
+            ]
+        for line, expected in zip(styleLines, expectedLines):
+            self.assertEquals(line, expected)
         
         linkTags = compiled.xpath('//link')
         self.assertEquals([

From ldr at codespeak.net  Mon Feb  8 15:25:40 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 15:25:40 +0100 (CET)
Subject: [z3-checkins] r71167 - z3/xdv/trunk/lib/xdv/tests
Message-ID: <20100208142540.8144F282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 15:25:38 2010
New Revision: 71167

Modified:
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
fix test

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Mon Feb  8 15:25:38 2010
@@ -156,10 +156,8 @@
         ], [x.get('src') for x in imgTags])
     
     def testDisabled(self):
-        testdir = os.path.join(HERE, 'absolute')
-        
-        themefn = os.path.join(testdir, "theme.html")
-        rulesfn = os.path.join(testdir, "rules.xml")
+        themefn = os.path.join(HERE, "absolute_theme.html")
+        rulesfn = os.path.join(HERE, "absolute_rules.xml")
         
         compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn)
         

From ldr at codespeak.net  Mon Feb  8 15:29:44 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 15:29:44 +0100 (CET)
Subject: [z3-checkins] r71168 - z3/xdv/trunk/lib/xdv
Message-ID: <20100208142944.C1448282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 15:29:42 2010
New Revision: 71168

Modified:
   z3/xdv/trunk/lib/xdv/run.py
Log:
whoops, pdb

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Mon Feb  8 15:29:42 2010
@@ -69,7 +69,6 @@
     parser.resolvers.add(RunResolver(os.path.dirname(content)))
     transform = etree.XSLT(output_xslt)
     content_doc = etree.parse(content, parser=etree.HTMLParser())
-    import pdb; pdb.set_trace()
     output_html = transform(content_doc)
     output_html.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:

From ldr at codespeak.net  Mon Feb  8 16:14:59 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 16:14:59 +0100 (CET)
Subject: [z3-checkins] r71169 - z3/xdv/trunk/lib/xdv
Message-ID: <20100208151459.3BEAF282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 16:14:55 2010
New Revision: 71169

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/update-namespace.xsl
Log:
remove nocontent, but allow upgrade to set an equivalent if-condition

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Mon Feb  8 16:14:55 2010
@@ -285,31 +285,14 @@
                     ERROR: Multiple replace rules may not match a single theme node.
                 </xsl:message>
             </xsl:when>
-            <xsl:when test="$matching-this/@nocontent='drop'">
-                <!-- <replace nocontent="drop" ...
-                Toss out the theme node.  Simply 
-                include the @content. -->
-                <xsl:call-template name="include">
-                    <xsl:with-param name="href" select="$matching-this/@href"/>
-                    <xsl:with-param name="content" select="$matching-this/@content"/>
-                </xsl:call-template>
-                <!-- jump to after rules -->
-                <xsl:call-template name="after">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$matching-this">
-                <!-- <replace nocontent="theme" ...
+            <xsl:when test="$matching-this/@if-content">
+                <!-- conditional <replace ...
                 When the rule matches, toss out the theme node and
-                <xsl:copy-of the @content. Otherwise keep theme node. -->
+                include the @content. Otherwise keep theme node. -->
                 <xsl:element name="xsl:choose">
                     <xsl:element name="xsl:when">
-                        <xsl:attribute name="test"> <!-- XXX -->
-                            <xsl:if test="$matching-this/@href">document('<xsl:value-of select="$matching-this/@href"/>', .)</xsl:if><xsl:choose>
-                                <xsl:when test="$matching-this/@if-condition"><xsl:value-of select="$matching-this/@if-condition"/></xsl:when>
-                                <xsl:otherwise><xsl:value-of select="$matching-this/@content"/></xsl:otherwise>
-                            </xsl:choose>
+                        <xsl:attribute name="test">
+                            <xsl:value-of select="$matching-this/@if-content"/>
                         </xsl:attribute>
                         <xsl:call-template name="include">
                             <xsl:with-param name="href" select="$matching-this/@href"/>
@@ -329,6 +312,19 @@
                     </xsl:element>
                 </xsl:element>
             </xsl:when>
+            <xsl:when test="$matching-this">
+                <!-- unconditional <replace.
+                Toss out the theme node.  Simply include the @content. -->
+                <xsl:call-template name="include">
+                    <xsl:with-param name="href" select="$matching-this/@href"/>
+                    <xsl:with-param name="content" select="$matching-this/@content"/>
+                </xsl:call-template>
+                <!-- jump to after rules -->
+                <xsl:call-template name="after">
+                    <xsl:with-param name="matching-rules" select="$matching-other"/>
+                    <xsl:with-param name="rules" select="$rules"/>
+                </xsl:call-template>
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:call-template name="prepend-copy-append">
                     <xsl:with-param name="matching-rules" select="$matching-other"/>
@@ -380,25 +376,14 @@
                         <xsl:when test="$matching-this[name()='copy']">
                             <xsl:variable name="this" select="$matching-this[name()='copy']"/>
                             <xsl:choose>
-                                <xsl:when test="$this/@nocontent='empty'">
-                                    <!-- Copy the node and its attributes, but clear 
-                                    the children and content.  Just invclude the @content -->
-                                    <xsl:call-template name="include">
-                                        <xsl:with-param name="href" select="$this/@href"/>
-                                        <xsl:with-param name="content" select="$this/@content"/>
-                                    </xsl:call-template>
-                                </xsl:when>
-                                <xsl:otherwise>
+                                <xsl:when test="$this/@if-content">
                                     <!-- When the rule matches, copy the node and its attributes,
-                                    but clear the children and text, just have an <xsl:copy-of> 
-                                    for the @content. Otherwise keep theme node. -->
+                                    but clear the children and text, just include the @content.
+                                    Otherwise keep theme node. -->
                                     <xsl:element name="xsl:choose">
                                         <xsl:element name="xsl:when">
-                                            <xsl:attribute name="test"> <!-- XXX -->
-                                                <xsl:if test="$this/@href">document('<xsl:value-of select="$this/@href"/>', .)</xsl:if><xsl:choose>
-                                                    <xsl:when test="$this/@if-condition"><xsl:value-of select="$this/@if-condition"/></xsl:when>
-                                                    <xsl:otherwise><xsl:value-of select="$this/@content"/></xsl:otherwise>
-                                                </xsl:choose>
+                                            <xsl:attribute name="test">
+                                                <xsl:value-of select="$this/@if-content"/>
                                             </xsl:attribute>
                                             <xsl:call-template name="include">
                                                 <xsl:with-param name="href" select="$this/@href"/>
@@ -411,6 +396,14 @@
                                             </xsl:apply-templates>
                                         </xsl:element>
                                     </xsl:element>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <!-- Copy the node and its attributes, but clear 
+                                    the children and content.  Just include the @content -->
+                                    <xsl:call-template name="include">
+                                        <xsl:with-param name="href" select="$this/@href"/>
+                                        <xsl:with-param name="content" select="$this/@content"/>
+                                    </xsl:call-template>
                                 </xsl:otherwise>
                             </xsl:choose>
                         </xsl:when>

Modified: z3/xdv/trunk/lib/xdv/update-namespace.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/update-namespace.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/update-namespace.xsl	Mon Feb  8 16:14:55 2010
@@ -8,10 +8,17 @@
     <!-- Update from old to new namespace -->
 
     <xsl:template match="*[namespace-uri() = 'http://openplans.org/deliverance']">
-        <xsl:element name="{name()}" namespace="http://namespaces.plone.org/xdv">
+        <xsl:element name="{local-name()}" namespace="http://namespaces.plone.org/xdv">
+            <xsl:if test="not(@nocontent) or @nocontent='theme'">
+                <xsl:attribute name="if-content"><xsl:value-of select="@content"/></xsl:attribute>
+            </xsl:if>
             <xsl:apply-templates select="@* | node()" />
         </xsl:element>
     </xsl:template>
+    
+    <xsl:template match="@nocontent">
+        <!-- remove this -->
+    </xsl:template>
 
     <xsl:template match="node() | @*">
         <xsl:copy>

From ldr at codespeak.net  Mon Feb  8 16:33:36 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 16:33:36 +0100 (CET)
Subject: [z3-checkins] r71170 - z3/xdv/trunk/lib/xdv
Message-ID: <20100208153336.0FAAC282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 16:33:33 2010
New Revision: 71170

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
factor out conditional-include template

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Mon Feb  8 16:33:33 2010
@@ -122,9 +122,11 @@
             </xsl:for-each>
         </xsl:copy>
     </xsl:template>
+
     <xsl:template match="comment()" mode="annotate-html">
-    <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
+        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
     </xsl:template>
+
     <xsl:template match="node()|@*" mode="annotate-html">
         <xsl:copy>
             <xsl:attribute name="xml:id">
@@ -159,9 +161,11 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+
     <xsl:template match="@xml:id" mode="apply-rules" priority="5">
         <!-- Filter this out -->
     </xsl:template>
+
     <xsl:template mode="apply-rules" priority="5"
         match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
         <!-- Emit xsl that avoids escaping -->
@@ -174,6 +178,7 @@
             <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
         </xsl:element>        
     </xsl:template>
+
     <xsl:template match="/html/@xmlns" mode="apply-rules" priority="5">
         <!-- Filter this out (causes problems when xsl is not serialized) -->
     </xsl:template>
@@ -187,35 +192,15 @@
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-        <!--
-            Always copy all content matching before rules
-        -->
-        <xsl:for-each select="$matching-this">
-            <xsl:choose>
-                <xsl:when test="@if-content">
-                    <xsl:element name="xsl:if">
-                        <xsl:attribute name="test">
-                            <xsl:value-of select="@if-content"/>
-                        </xsl:attribute>
-                        <xsl:call-template name="include">
-                            <xsl:with-param name="href" select="@href"/>
-                            <xsl:with-param name="content" select="@content"/>
-                        </xsl:call-template>
-                    </xsl:element>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:call-template name="include">
-                        <xsl:with-param name="href" select="@href"/>
-                        <xsl:with-param name="content" select="@content"/>
-                    </xsl:call-template>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
+
+        <xsl:apply-templates select="$matching-this" mode="conditional-include"/>
+
         <xsl:call-template name="drop">
             <xsl:with-param name="matching-rules" select="$matching-other"/>
             <xsl:with-param name="rules" select="$rules"/>
         </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="drop">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -272,6 +257,7 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+
     <xsl:template name="replace">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -279,12 +265,14 @@
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
+
+        <xsl:if test="count($matching-this) > 1">
+            <xsl:message terminate="yes">
+                ERROR: Multiple replace rules may not match a single theme node.
+            </xsl:message>
+        </xsl:if>
+
         <xsl:choose>
-            <xsl:when test="count($matching-this) > 1">
-                <xsl:message terminate="yes">
-                    ERROR: Multiple replace rules may not match a single theme node.
-                </xsl:message>
-            </xsl:when>
             <xsl:when test="$matching-this/@if-content">
                 <!-- conditional <replace ...
                 When the rule matches, toss out the theme node and
@@ -333,6 +321,7 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+
     <xsl:template name="prepend-copy-append">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -343,36 +332,21 @@
         <xsl:choose>
             <xsl:when test="$matching-this">
                 <xsl:copy>
+                    <!-- Theme attributes -->
                     <xsl:apply-templates select="@*" mode="apply-rules">
                         <xsl:with-param name="rules" select="$rules"/>
                     </xsl:apply-templates>
-                    <xsl:for-each select="$matching-this[name()='prepend']">
-                        <xsl:choose>
-                            <xsl:when test="@if-content">
-                                <xsl:element name="xsl:if">
-                                    <xsl:attribute name="test">
-                                        <xsl:value-of select="@if-content"/>
-                                    </xsl:attribute>
-                                    <xsl:call-template name="include">
-                                        <xsl:with-param name="href" select="@href"/>
-                                        <xsl:with-param name="content" select="@content"/>
-                                    </xsl:call-template>
-                                </xsl:element>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:call-template name="include">
-                                    <xsl:with-param name="href" select="@href"/>
-                                    <xsl:with-param name="content" select="@content"/>
-                                </xsl:call-template>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:for-each>
+
+                    <!-- Prepend -->
+                    <xsl:apply-templates select="$matching-this[name()='prepend']" mode="conditional-include"/>
+
+                    <!-- Copy -->
+                    <xsl:if test="count($matching-this[name()='copy']) > 1">
+                        <xsl:message terminate="yes">
+                            ERROR: Multiple copy rules may not match a single theme node.
+                        </xsl:message>
+                    </xsl:if>
                     <xsl:choose>
-                        <xsl:when test="count($matching-this[name()='copy']) > 1">
-                            <xsl:message terminate="yes">
-                                ERROR: Multiple copy rules may not match a single theme node.
-                            </xsl:message>
-                        </xsl:when>
                         <xsl:when test="$matching-this[name()='copy']">
                             <xsl:variable name="this" select="$matching-this[name()='copy']"/>
                             <xsl:choose>
@@ -413,27 +387,10 @@
                             </xsl:apply-templates>
                         </xsl:otherwise>
                     </xsl:choose>
-                    <xsl:for-each select="$matching-rules[name()='append']">
-                        <xsl:choose>
-                            <xsl:when test="@if-content">
-                                <xsl:element name="xsl:if">
-                                    <xsl:attribute name="test">
-                                        <xsl:value-of select="@if-content"/>
-                                    </xsl:attribute>
-                                    <xsl:call-template name="include">
-                                        <xsl:with-param name="href" select="@href"/>
-                                        <xsl:with-param name="content" select="@content"/>
-                                    </xsl:call-template>
-                                </xsl:element>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:call-template name="include">
-                                    <xsl:with-param name="href" select="@href"/>
-                                    <xsl:with-param name="content" select="@content"/>
-                                </xsl:call-template>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:for-each>
+
+                    <!-- Append -->
+                    <xsl:apply-templates select="$matching-rules[name()='append']" mode="conditional-include"/>
+
                 </xsl:copy>
             </xsl:when>
             <xsl:otherwise>
@@ -447,6 +404,7 @@
             <xsl:with-param name="rules" select="$rules"/>
         </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="after">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -454,34 +412,12 @@
         <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-        <!--
-            Always copy all content matching after rules
-        -->
-        <xsl:for-each select="$matching-this">
-            <xsl:choose>
-                <xsl:when test="@if-content">
-                    <xsl:element name="xsl:if">
-                        <xsl:attribute name="test">
-                            <xsl:value-of select="@if-content"/>
-                        </xsl:attribute>
-                        <xsl:call-template name="include">
-                            <xsl:with-param name="href" select="@href"/>
-                            <xsl:with-param name="content" select="@content"/>
-                        </xsl:call-template>
-                    </xsl:element>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:call-template name="include">
-                        <xsl:with-param name="href" select="@href"/>
-                        <xsl:with-param name="content" select="@content"/>
-                    </xsl:call-template>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-        <!--
-            Last rule template
-        -->
+
+        <xsl:apply-templates select="$matching-this" mode="conditional-include"/>
+        
+        <!-- Last rule template -->
     </xsl:template>
+
     <xsl:template name="pass">
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">pass</xsl:variable>
@@ -492,6 +428,29 @@
             </xsl:apply-templates>
         </xsl:copy>
     </xsl:template>
+
+    <xsl:template match="@*|node()" mode="conditional-include">
+        <xsl:choose>
+            <xsl:when test="@if-content">
+                <xsl:element name="xsl:if">
+                    <xsl:attribute name="test">
+                        <xsl:value-of select="@if-content"/>
+                    </xsl:attribute>
+                    <xsl:call-template name="include">
+                        <xsl:with-param name="href" select="@href"/>
+                        <xsl:with-param name="content" select="@content"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="include">
+                    <xsl:with-param name="href" select="@href"/>
+                    <xsl:with-param name="content" select="@content"/>
+                </xsl:call-template>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
     <xsl:template name="include">
         <xsl:param name="href"/>
         <xsl:param name="content"/>
@@ -525,6 +484,7 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>
         <xsl:param name="matching" select="/.."/>
@@ -536,7 +496,9 @@
             </xsl:for-each>
         </xsl:if>
     </xsl:template>
+
     <xsl:template name="printpath"
         ><xsl:for-each select="ancestor::*">/<xsl:value-of select="name()"/>[<xsl:number/>]</xsl:for-each
         >/<xsl:value-of select="name()"/>[<xsl:number/>]</xsl:template>
+
 </xsl:stylesheet>

From ldr at codespeak.net  Mon Feb  8 18:01:08 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 18:01:08 +0100 (CET)
Subject: [z3-checkins] r71171 - z3/xdv/trunk/lib/xdv
Message-ID: <20100208170108.226B7282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 18:00:55 2010
New Revision: 71171

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
make sure document include does not have lots of whitespace

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Mon Feb  8 18:00:55 2010
@@ -464,9 +464,7 @@
             </xsl:when>
             <xsl:when test="$includemode = 'document'">
                 <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">
-                        document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/>
-                    </xsl:attribute>
+                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
                 </xsl:element>
             </xsl:when>
             <xsl:when test="$includemode = 'ssi'">

From ldr at codespeak.net  Mon Feb  8 18:06:51 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 18:06:51 +0100 (CET)
Subject: [z3-checkins] r71172 - in z3/xdv/trunk/lib/xdv/tests: . 001 002 003
	004 005 006 007 008 009 010 011 012 013 014
Message-ID: <20100208170651.761DB282BD8@codespeak.net>

Author: ldr
Date: Mon Feb  8 18:06:46 2010
New Revision: 71172

Added:
   z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
Modified:
   z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/001/output.html
   z3/xdv/trunk/lib/xdv/tests/001/rules.xml
   z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/002/output.html
   z3/xdv/trunk/lib/xdv/tests/002/rules.xml
   z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/003/output.html
   z3/xdv/trunk/lib/xdv/tests/003/rules.xml
   z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/004/output.html
   z3/xdv/trunk/lib/xdv/tests/004/rules.xml
   z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/005/output.html
   z3/xdv/trunk/lib/xdv/tests/005/rules.xml
   z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/006/output.html
   z3/xdv/trunk/lib/xdv/tests/006/rules.xml
   z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/007/output.html
   z3/xdv/trunk/lib/xdv/tests/007/rules.xml
   z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/008/output.html
   z3/xdv/trunk/lib/xdv/tests/008/rules.xml
   z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/009/output.html
   z3/xdv/trunk/lib/xdv/tests/009/rules.xml
   z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/010/output.html
   z3/xdv/trunk/lib/xdv/tests/010/rules.xml
   z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/011/output.html
   z3/xdv/trunk/lib/xdv/tests/011/rules.xml
   z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/012/output.html
   z3/xdv/trunk/lib/xdv/tests/012/rules.xml
   z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/013/output.html
   z3/xdv/trunk/lib/xdv/tests/013/rules.xml
   z3/xdv/trunk/lib/xdv/tests/014/output.html
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
update tests to use new namespace and pretty print, so there is some hope of understanding what's gone wrong when output changes

Modified: z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -32,7 +32,7 @@
         </xsl:copy>
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
-        <html><head><xsl:choose><xsl:when test="/html/head/title"><xsl:copy-of select="/html/head/title"/></xsl:when><xsl:otherwise><title id="nothing">Second Theme Page Title</title></xsl:otherwise></xsl:choose></head><body/></html>
+        <html><head><xsl:copy-of select="/html/head/title"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
         <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">

Modified: z3/xdv/trunk/lib/xdv/tests/001/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/001/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/001/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>A Deeper Look At xdv</title></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>A Deeper Look At xdv</title>
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/001/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/001/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/001/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <replace theme="/html/head/title" content="/html/head/title"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -32,7 +32,7 @@
         </xsl:copy>
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
-        <html><head><title id="something"><xsl:choose><xsl:when test="/html/head/title"><xsl:copy-of select="/html/head/title"/></xsl:when><xsl:otherwise>Second Theme Page Title</xsl:otherwise></xsl:choose></title></head><body/></html>
+        <html><head><title id="something"><xsl:copy-of select="/html/head/title"/></title></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
         <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">

Modified: z3/xdv/trunk/lib/xdv/tests/002/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/002/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/002/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title id="something"><title>A Deeper Look At xdv</title></title></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title id="something">
+      <title>A Deeper Look At xdv</title>
+    </title>
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/002/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/002/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/002/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <copy theme="/html/head/title" content="/html/head/title"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">

Modified: z3/xdv/trunk/lib/xdv/tests/003/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/003/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/003/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"></script><link id="third" rel="stylesheet" href="third.css" /><link id="fourth" rel="stylesheet" href="fourth.css" /></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title id="first">Second Theme Page Title</title>
+    <script id="second" src="second.js" type="text/javascript"></script>
+    <link id="third" rel="stylesheet" href="third.css" />
+    <link id="fourth" rel="stylesheet" href="fourth.css" />
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/003/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/003/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/003/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <append theme="/html/head" content="/html/head/link"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">

Modified: z3/xdv/trunk/lib/xdv/tests/004/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/004/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/004/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><link id="fourth" rel="stylesheet" href="fourth.css" /><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"></script><link id="third" rel="stylesheet" href="third.css" /></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <link id="fourth" rel="stylesheet" href="fourth.css" />
+    <title id="first">Second Theme Page Title</title>
+    <script id="second" src="second.js" type="text/javascript"></script>
+    <link id="third" rel="stylesheet" href="third.css" />
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/004/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/004/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/004/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <prepend theme="/html/head" content="/html/head/link"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -33,7 +33,7 @@
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
         <html><head><title>Second Theme Page Title</title></head><body>
-        <div id="pagecontent"><xsl:choose><xsl:when test="/html/body/div[@id='pagecontent']/*"><xsl:copy-of select="/html/body/div[@id='pagecontent']/*"/></xsl:when><xsl:otherwise>Some stuff</xsl:otherwise></xsl:choose></div>
+        <div id="pagecontent"><xsl:copy-of select="/html/body/div[@id='pagecontent']/*"/></div>
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">

Modified: z3/xdv/trunk/lib/xdv/tests/005/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/005/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/005/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>Second Theme Page Title</title></head><body><div id="pagecontent"><h1>A Deeper Look....at...xdv</h1><p>And some content.</p></div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Second Theme Page Title</title>
+  </head>
+  <body>
+    <div id="pagecontent">
+      <h1>A Deeper Look....at...xdv</h1>
+      <p>And some content.</p>
+    </div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/005/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/005/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/005/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <copy theme="/html/body/div[@id='pagecontent']" content="/html/body/div[@id='pagecontent']/*"/>
     <drop content="/html/body/div/div[@id='contentdrop']"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">

Modified: z3/xdv/trunk/lib/xdv/tests/006/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/006/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/006/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><link id="veryfirst" rel="stylesheet" href="veryfirst.css" /><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"></script><link id="third" rel="stylesheet" href="third.css" /><link id="last" rel="stylesheet" href="last.css" /></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <link id="veryfirst" rel="stylesheet" href="veryfirst.css" />
+    <title id="first">Second Theme Page Title</title>
+    <script id="second" src="second.js" type="text/javascript"></script>
+    <link id="third" rel="stylesheet" href="third.css" />
+    <link id="last" rel="stylesheet" href="last.css" />
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/006/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/006/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/006/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <prepend theme="/html/head" content="/html/head/link[@id='veryfirst']"/>
     <append theme="/html/head" content="/html/head/link[@id='last']"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">

Modified: z3/xdv/trunk/lib/xdv/tests/007/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/007/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/007/output.html	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title id="first">Ninth Theme Page Title</title><script id="second" src="second.js" type="text/javascript"></script><link id="third" rel="stylesheet" href="third.css" /><!--[if lte IE 6]>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title id="first">Ninth Theme Page Title</title>
+    <script id="second" src="second.js" type="text/javascript"></script>
+    <link id="third" rel="stylesheet" href="third.css" />
+<!--[if lte IE 6]>
 	    <script type="text/javascript" src="ie-only.js"></script>
-	<![endif]--><link id="fourth" rel="stylesheet" href="fourth.css" /></head><body></body></html>
\ No newline at end of file
+	<![endif]-->
+    <link id="fourth" rel="stylesheet" href="fourth.css" />
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/007/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/007/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/007/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <append theme="/html/head" content="/html/head/link"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -32,9 +32,7 @@
         </xsl:copy>
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
-        <html><head><xsl:choose><xsl:when test="/html/head/title"><xsl:copy-of select="/html/head/title"/></xsl:when><xsl:otherwise><title id="first">Second Theme Page Title</title></xsl:otherwise></xsl:choose></head><body><xsl:choose><xsl:when test="//div[@id='wrapper']"><xsl:copy-of select="//div[@id='wrapper']"/></xsl:when><xsl:otherwise>
-        <p>blah</p>
-    </xsl:otherwise></xsl:choose></body></html>
+        <html><head><xsl:copy-of select="/html/head/title"/></head><body><xsl:copy-of select="//div[@id='wrapper']"/></body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
         <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">

Modified: z3/xdv/trunk/lib/xdv/tests/008/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/008/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/008/output.html	Mon Feb  8 18:06:46 2010
@@ -1,6 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>A Deeper Look At xdv</title></head><body><div id="wrapper" class="foo">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>A Deeper Look At xdv</title>
+  </head>
+  <body>
+    <div id="wrapper" class="foo">
             <div id="content">
                 <p>boo bar baz</p>
             </div>
-        </div></body></html>
\ No newline at end of file
+        </div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/008/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/008/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/008/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <replace theme="/html/head/title" content="/html/head/title"/>
     <copy theme="/html/body" content="//div[@id='wrapper']"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -39,7 +39,7 @@
             var x = '&lt;div&gt;';
         </xsl:variable><xsl:value-of select="$tag_text" disable-output-escaping="yes"/></script><xsl:copy-of select="/html/head/style"/></head><body>
         <h1>Title</h1>
-        <div id="content"><xsl:choose><xsl:when test="//*[@id='content']/*"><xsl:copy-of select="//*[@id='content']/*"/></xsl:when><xsl:otherwise/></xsl:choose></div>
+        <div id="content"><xsl:copy-of select="//*[@id='content']/*"/></div>
         <script type="text/javascript"><xsl:variable name="tag_text">
             var y = '&lt;span&gt;';
         </xsl:variable><xsl:value-of select="$tag_text" disable-output-escaping="yes"/></script></body></html>

Modified: z3/xdv/trunk/lib/xdv/tests/009/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/009/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/009/output.html	Mon Feb  8 18:06:46 2010
@@ -1,12 +1,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>Theme Title</title><style type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Theme Title</title>
+    <style type="text/css">
             /* From the theme */
             body > h1 { color: red; }
-        </style><script type="text/javascript">
+        </style>
+    <script type="text/javascript">
             var x = '<div>';
-        </script><style type="text/css">
+        </script>
+    <style type="text/css">
         /* From the content */
         div > p { color: blue; } 
-    </style></head><body><h1>Title</h1><div id="content"><p>Some text</p></div><script type="text/javascript">
+    </style>
+  </head>
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>Some text</p>
+    </div>
+    <script type="text/javascript">
             var y = '<span>';
-        </script></body></html>
\ No newline at end of file
+        </script>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/009/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/009/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/009/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <append theme="/html/head" content="/html/head/style"/>
     <copy theme="//*[@id='content']" content="//*[@id='content']/*"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -34,11 +34,11 @@
     <xsl:template match="/" mode="apply-theme">
         <html><head><title>Theming with portlets</title></head><body>
         <xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='aaa']"/></xsl:if><xsl:choose><xsl:when test="(not(//*[@class='portlet']))"/><xsl:otherwise><div id="portlet-wrapper"><xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='portlets-title']"/></xsl:if>
-            <div id="portlets"><xsl:choose><xsl:when test="//*[@class='portlet']"><xsl:copy-of select="//*[@class='portlet']"/></xsl:when><xsl:otherwise>
+            <div id="portlets"><xsl:choose><xsl:when test="//*[@id='aaa']"><xsl:copy-of select="//*[@class='portlet']"/></xsl:when><xsl:otherwise>
                 <div class="portlet" id="portlet1">Portlet</div>
             </xsl:otherwise></xsl:choose></div>
         <xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='manage-portlets-link']"/></xsl:if></div><xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='bbb']"/></xsl:if></xsl:otherwise></xsl:choose>
-        <xsl:choose><xsl:when test="//*[@id='footer']"><xsl:copy-of select="//*[@id='footer']"/></xsl:when><xsl:otherwise><div id="footer">Footer</div></xsl:otherwise></xsl:choose>
+        <xsl:choose><xsl:when test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='footer']"/></xsl:when><xsl:otherwise><div id="footer">Footer</div></xsl:otherwise></xsl:choose>
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">

Modified: z3/xdv/trunk/lib/xdv/tests/010/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/010/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/010/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>Theming with portlets</title></head><body><div id="aaa">AAA</div><div id="portlet-wrapper"><h2 id="portlets-title">Portlets</h2><div id="portlets"><div class="portlet" id="portletA">Portlet A</div><div class="portlet" id="portletB">Portlet A</div></div><a id="manage-portlets-link" href="manage-portlets">Manage Portlets</a></div><div id="bbb">BBB</div><div id="footer" class="footer-with-portlets">Footer with portlets</div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Theming with portlets</title>
+  </head>
+  <body>
+    <div id="aaa">AAA</div>
+    <div id="portlet-wrapper">
+      <h2 id="portlets-title">Portlets</h2>
+      <div id="portlets">
+        <div class="portlet" id="portletA">Portlet A</div>
+        <div class="portlet" id="portletB">Portlet A</div>
+      </div>
+      <a id="manage-portlets-link" href="manage-portlets">Manage Portlets</a>
+    </div>
+    <div id="bbb">BBB</div>
+    <div id="footer" class="footer-with-portlets">Footer with portlets</div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/010/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/010/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/010/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <copy theme="//*[@id='portlets']" content="//*[@class='portlet']" if-content="//*[@id='aaa']"/>
     <drop theme="//*[@id='portlet-wrapper']" if-content="not(//*[@class='portlet'])"/>
     <before theme="//*[@id='portlet-wrapper']" content="//*[@id='aaa']" if-content="//*[@class='portlet']"/>

Modified: z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -34,9 +34,7 @@
     <xsl:template match="/" mode="apply-theme">
         <html><head><title>Theming with portlets</title></head><body>
         <xsl:choose><xsl:when test="(not(//*[@class='portlet']))"/><xsl:otherwise><div id="portlet-wrapper">
-            <div id="portlets"><xsl:choose><xsl:when test="//*[@class='portlet']"><xsl:copy-of select="//*[@class='portlet']"/></xsl:when><xsl:otherwise>
-                <div class="portlet" id="portlet1">Portlet</div>
-            </xsl:otherwise></xsl:choose></div>
+            <div id="portlets"><xsl:copy-of select="//*[@class='portlet']"/></div>
         </div></xsl:otherwise></xsl:choose>
     </body></html>
     </xsl:template>

Modified: z3/xdv/trunk/lib/xdv/tests/011/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/011/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/011/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>Theming with portlets</title></head><body></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Theming with portlets</title>
+  </head>
+  <body></body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/011/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/011/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/011/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <copy theme="//*[@id='portlets']" content="//*[@class='portlet']"/>
     <drop theme="//*[@id='portlet-wrapper']" if-content="not(//*[@class='portlet'])"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -33,7 +33,7 @@
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
         <html><head><title>Replace and after</title></head><body>
-        <xsl:choose><xsl:when test="//h2"><xsl:copy-of select="//h2"/><xsl:copy-of select="/html/body/p"/></xsl:when><xsl:otherwise><h1>Title</h1><xsl:copy-of select="/html/body/p"/></xsl:otherwise></xsl:choose>
+        <xsl:copy-of select="//h2"/><xsl:copy-of select="/html/body/p"/>
         <xsl:copy-of select="//*[@id='missing']"/><xsl:copy-of select="//*[@id='footer']"/>
     </body></html>
     </xsl:template>

Modified: z3/xdv/trunk/lib/xdv/tests/012/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>Replace and after</title></head><body><h2>Smaller Title</h2><p> content </p><div id="footer">Footer</div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Replace and after</title>
+  </head>
+  <body>
+    <h2>Smaller Title</h2>
+    <p> content </p>
+    <div id="footer">Footer</div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/012/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <replace theme="//h1" content="//h2"/>
     <after theme="//h1" content="/html/body/p"/>
     <replace theme="//*[@id='marker']" content="//*[@id='missing']" nocontent="drop"/>

Modified: z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://openplans.org/deliverance" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -33,8 +33,8 @@
     </xsl:template>
     <xsl:template match="/" mode="apply-theme">
         <html><head><title>External includes</title></head><body>
-        <xsl:copy-of select="document('extra.html', .)//*[@id='external1']"/><xsl:choose><xsl:when test="document('extra.html', .)//*[@id='external2']"><xsl:copy-of select="document('extra.html', .)//*[@id='external2']"/><xsl:copy-of select="document('extra.html', .)//*[@id='external3']"/></xsl:when><xsl:otherwise><div id="marker1">Marker</div><xsl:copy-of select="document('extra.html', .)//*[@id='external3']"/></xsl:otherwise></xsl:choose>
-        <div id="marker2"><xsl:copy-of select="document('extra.html', .)//*[@id='external4']"/><xsl:choose><xsl:when test="document('extra.html', .)//*[@id='external5']"><xsl:copy-of select="document('extra.html', .)//*[@id='external5']"/></xsl:when><xsl:otherwise>Marker</xsl:otherwise></xsl:choose><xsl:copy-of select="document('extra.html', .)//*[@id='external6']"/></div><xsl:copy-of select="/html/body/*"/>
+        <xsl:copy-of select="document('extra.html', .)//*[@id='external1']"/><xsl:copy-of select="document('extra.html', .)//*[@id='external2']"/><xsl:copy-of select="document('extra.html', .)//*[@id='external3']"/>
+        <div id="marker2"><xsl:copy-of select="document('extra.html', .)//*[@id='external4']"/><xsl:copy-of select="document('extra.html', .)//*[@id='external5']"/><xsl:copy-of select="document('extra.html', .)//*[@id='external6']"/></div><xsl:copy-of select="/html/body/*"/>
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">

Modified: z3/xdv/trunk/lib/xdv/tests/013/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/013/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/013/output.html	Mon Feb  8 18:06:46 2010
@@ -1,14 +1,32 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title>External includes</title></head><body><div id="external1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>External includes</title>
+  </head>
+  <body>
+    <div id="external1">
             ONE
-        </div><div id="external2">
+        </div>
+    <div id="external2">
             TWO
-        </div><div id="external3">
+        </div>
+    <div id="external3">
             THREE
-        </div><div id="marker2"><div id="external4">
+        </div>
+    <div id="marker2">
+      <div id="external4">
             FOUR
-        </div><div id="external5">
+        </div>
+      <div id="external5">
             FIVE
-        </div><div id="external6">
+        </div>
+      <div id="external6">
             SIX
-        </div></div><h2>Smaller Title</h2><p> content </p><div id="footer">Footer</div></body></html>
\ No newline at end of file
+        </div>
+    </div>
+    <h2>Smaller Title</h2>
+    <p> content </p>
+    <div id="footer">Footer</div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/013/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/013/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/013/rules.xml	Mon Feb  8 18:06:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://openplans.org/deliverance">
+<rules xmlns="http://namespaces.plone.org/xdv">
     <before theme="//*[@id='marker1']" content="//*[@id='external1']" href="extra.html"/>
     <replace theme="//*[@id='marker1']" content="//*[@id='external2']" href="extra.html"/>
     <after theme="//*[@id='marker1']" content="//*[@id='external3']" href="extra.html"/>

Added: z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl	Mon Feb  8 18:06:46 2010
@@ -0,0 +1,81 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+  <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
+    <xsl:template match="/">
+
+        <!-- Pass incoming content through initial-stage filter. -->
+        <xsl:variable name="initial-stage-rtf">
+            <xsl:apply-templates select="/" mode="initial-stage"/>
+        </xsl:variable>
+        <xsl:variable name="initial-stage" select="exsl:node-set($initial-stage-rtf)"/>
+
+        <!-- Now apply the theme to the initial-stage content -->
+        <xsl:variable name="themedcontent-rtf">
+            <xsl:apply-templates select="$initial-stage" mode="apply-theme"/>
+        </xsl:variable>
+        <xsl:variable name="content" select="exsl:node-set($themedcontent-rtf)"/>
+
+        <!-- We're done, so generate some output by passing 
+            through a final stage. -->
+        <xsl:apply-templates select="$content" mode="final-stage"/>
+
+    </xsl:template>
+
+    <!-- 
+    
+        Utility templates
+    -->
+    
+    <xsl:template match="node()|@*" mode="initial-stage">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*" mode="initial-stage"/>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="/" mode="apply-theme">
+        <html><head><xsl:copy-of select="/html/head/title"/></head><body>
+        <div><xsl:copy-of select="//body/descendant::*[name() = 'div' and (position() = last())]"/></div>
+        <div>
+            <span>Third Marker</span>
+            <ul><li>first</li>
+                <li>second</li>
+                <li><xsl:copy-of select="//body/descendant::*[name() = 'div' and (position() = 2)]/h2/following-sibling::span[@class = 'replace']"/></li>
+                <li>fourth</li>
+            </ul></div>
+        <div>Third Marker</div>
+        <div>Fourth marker</div>
+    </body></html>
+    </xsl:template>
+    <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
+        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+            <xsl:apply-templates select="@*" mode="final-stage"/>
+            <xsl:value-of select="text()" disable-output-escaping="yes"/>
+        </xsl:element>
+    </xsl:template>
+    <xsl:template match="*" priority="3" mode="final-stage">
+        <!-- Move elements without a namespace into 
+        the xhtml namespace. -->
+        <xsl:choose>
+            <xsl:when test="namespace-uri(.)">
+                <xsl:copy>
+                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
+                </xsl:copy>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
+                </xsl:element>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template match="node()|@*" priority="1" mode="final-stage">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*" mode="final-stage"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <!-- 
+    
+        Extra templates
+    -->
+    
+</xsl:stylesheet>
\ No newline at end of file

Modified: z3/xdv/trunk/lib/xdv/tests/014/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/014/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/014/output.html	Mon Feb  8 18:06:46 2010
@@ -1,2 +1,25 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Pseudo classes and complex selectors</title></head><body><div><div class="replace">Someting very great from last content's DIV</div></div><div><span>Third Marker</span><ul><li>first</li><li>second</li><li><span class="replace">new item from content</span></li><li>fourth</li></ul></div><div>Third Marker</div><div>Fourth marker</div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Pseudo classes and complex selectors</title>
+  </head>
+  <body>
+    <div>
+      <div class="replace">Someting very great from last content's DIV</div>
+    </div>
+    <div>
+      <span>Third Marker</span>
+      <ul>
+        <li>first</li>
+        <li>second</li>
+        <li>
+          <span class="replace">new item from content</span>
+        </li>
+        <li>fourth</li>
+      </ul>
+    </div>
+    <div>Third Marker</div>
+    <div>Fourth marker</div>
+  </body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Mon Feb  8 18:06:46 2010
@@ -20,7 +20,8 @@
 HERE = os.path.abspath(os.path.dirname(__file__))
 
 class XDVTestCase(unittest.TestCase):
-    writefiles = False
+    
+    writefiles = os.environ.get('XDVTESTS_WRITE_FILES', False)
 
     testdir = None # override
     
@@ -33,13 +34,6 @@
         xslfn = os.path.join(self.testdir, "compiled.xsl")
         outputfn = os.path.join(self.testdir, "output.html")
         
-        if (not os.path.exists(themefn) or
-            not os.path.exists(contentfn) or
-            not os.path.exists(rulesfn) or
-            not os.path.exists(outputfn)
-        ):
-            return
-        
         contentdoc = etree.parse(source=contentfn, base_url=contentfn,
                                        parser=etree.HTMLParser())
 
@@ -57,11 +51,11 @@
             old = open(xslfn).read()
             new = cts
             if old != new:
-                print >>self.errors, "WARNING:", "compiled.xsl has CHANGED"
-                for line in difflib.unified_diff(old.split('\n'), new.split('\n'), xslfn, 'now'):
-                    print >>self.errors, line
                 if self.writefiles:
                     open(xslfn + '.old', 'w').write(old)
+                print "WARNING:", "compiled.xsl has CHANGED"
+                for line in difflib.unified_diff(old.split('\n'), new.split('\n'), xslfn, 'now'):
+                    print line
 
         # Write the compiled xsl out to catch unexpected changes
         if self.writefiles:
@@ -73,37 +67,38 @@
         result = processor(contentdoc)
         # Read the whole thing to strip off xhtml namespace.
         # If we had xslt 2.0 then we could use xpath-default-namespace.
-        self.themed_string = etree.tostring(result)
+        self.themed_string = etree.tostring(result, pretty_print=True)
         self.themed_content = etree.ElementTree(file=StringIO(self.themed_string), 
                                                 parser=etree.HTMLParser())
 
         # remove the extra meta content type
+
         meta = self.themed_content.xpath("/html/head/meta[@http-equiv='Content-Type']")[0]
         meta.getparent().remove(meta)
 
         if os.path.exists(xpathsfn):
-            # xp = "/html/head/*[position()='1']/@id"
             for xpath in open(xpathsfn).readlines():
                 # Read the XPaths from the file, skipping blank lines and
                 # comments
                 this_xpath = xpath.strip()
                 if not this_xpath or this_xpath[0] == '#':
                     continue
-                if not self.themed_content.xpath(this_xpath):
-                    print >>self.errors, "FAIL:", this_xpath, "is FALSE"
+                assert self.themed_content.xpath(this_xpath), "%s: %s" % (xpathsfn, this_xpath)
 
         # Compare to previous version
         if os.path.exists(outputfn):
             old = open(outputfn).read()
             new = self.themed_string
             if old != new:
-                print >>self.errors, "FAIL:", "output.html has CHANGED"
-                for line in difflib.unified_diff(old.split('\n'), new.split('\n'), outputfn, 'now'):
-                    print >>self.errors, line
+                import pdb; pdb.set_trace()
                 if self.writefiles:
                     open(outputfn + '.old', 'w').write(old)
+                print "ERROR:", "output.html has CHANGED"
+                for line in difflib.unified_diff(old.split('\n'), new.split('\n'), outputfn, 'now'):
+                    print  line
+                self.assertEquals(old, new)
 
-        # Write the compiled xsl out to catch unexpected changes
+        # Write out the result to catch unexpected changes
         if self.writefiles:
             open(outputfn, 'w').write(self.themed_string)
     
@@ -200,35 +195,7 @@
             '/foo.jpg',
             'http://site.com/foo.jpg'
         ], [x.get('src') for x in imgTags])
-        
-    
-def main(*args, **kwargs):
-    try:
-        test_num = sys.argv[1]
-    except IndexError:
-        test_num = 1
-        errors = 0
-        while True:
-            directory = os.path.join(HERE, '%03d' % test_num)
-            if not os.path.isdir(directory):
-                test_num -= 1
-                break
-            xdv = XDV(directory, *args, **kwargs)
-            result = xdv.errors.getvalue()
-            if result:
-                print 'Error running test %s...' % directory 
-                print result
-                errors += 1
-            test_num += 1
-        print "Ran %s tests with %s errors." % (test_num, errors)
-    else:
-        test_dir = os.path.abspath(test_num)
-        xdv = XDV(test_dir, *args, **kwargs)
-        print xdv.themed_string
-        errors = xdv.errors.getvalue()
-        if errors:
-            print
-            print xdv.errors.getvalue()
+
 
 def test_suite():
     suite = unittest.TestSuite()
@@ -242,18 +209,3 @@
         suite.addTest(unittest.makeSuite(cls))
     suite.addTest(unittest.makeSuite(TestAbsolutePrefix))
     return suite
-
-if __name__ == "__main__":
-    debug = '--debug' in sys.argv
-    if debug:
-        sys.argv.remove('--debug')
-    writefiles = '--writefiles' in sys.argv
-    if writefiles:
-        sys.argv.remove('--writefiles')
-    try:
-        main(debug=debug, writefiles=writefiles)
-    except:
-        type, value, tb = sys.exc_info()
-        traceback.print_exc()
-        if debug:
-            pdb.post_mortem(tb)

From ldr at codespeak.net  Mon Feb  8 18:39:48 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  8 Feb 2010 18:39:48 +0100 (CET)
Subject: [z3-checkins] r71174 - in z3/xdv/trunk/lib/xdv: . tests
	tests/update-namespace
Message-ID: <20100208173948.EEA34282BDA@codespeak.net>

Author: ldr
Date: Mon Feb  8 18:39:41 2010
New Revision: 71174

Added:
   z3/xdv/trunk/lib/xdv/tests/update-namespace/
   z3/xdv/trunk/lib/xdv/tests/update-namespace/content.html
   z3/xdv/trunk/lib/xdv/tests/update-namespace/rules.xml
   z3/xdv/trunk/lib/xdv/tests/update-namespace/theme.html
   z3/xdv/trunk/lib/xdv/tests/update-namespace/xpaths.txt
Modified:
   z3/xdv/trunk/lib/xdv/tests/tests.py
   z3/xdv/trunk/lib/xdv/update-namespace.xsl
Log:
add a test for the updating of namespace and nocontent

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Mon Feb  8 18:39:41 2010
@@ -73,8 +73,10 @@
 
         # remove the extra meta content type
 
-        meta = self.themed_content.xpath("/html/head/meta[@http-equiv='Content-Type']")[0]
-        meta.getparent().remove(meta)
+        metas = self.themed_content.xpath("/html/head/meta[@http-equiv='Content-Type']")
+        if metas:
+            meta = metas[0]
+            meta.getparent().remove(meta)
 
         if os.path.exists(xpathsfn):
             for xpath in open(xpathsfn).readlines():

Added: z3/xdv/trunk/lib/xdv/tests/update-namespace/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/update-namespace/content.html	Mon Feb  8 18:39:41 2010
@@ -0,0 +1,6 @@
+<html>
+    <body>
+        <div id="core" class="content">content</div>
+        <div id="portlet" class="content">portlet</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/update-namespace/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/update-namespace/rules.xml	Mon Feb  8 18:39:41 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://openplans.org/deliverance">
+    <replace theme="/html/body/h1" content="//*[@class='missing']"/>
+    <replace theme="//*[@id='main']" content="//*[@class='missing']"/>
+    <replace theme="//*[@id='core']" content="//*[@id='core']"/>
+    <copy theme="/html/body/h2" content="//*[@class='missing']"/>
+    <copy theme="//*[@id='portlets']" content="//*[@class='missing']"/>
+    <copy theme="//*[@id='portlet-wrapper']" content="//*[@id='portlet']"/>    
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/update-namespace/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/update-namespace/theme.html	Mon Feb  8 18:39:41 2010
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="main"> Blah
+            <div id="core"> core </div>
+        </div>
+        <h2>theme</h2>
+        <div id="portlets">
+            <div id="portlet-wrapper"> wrapper </div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/update-namespace/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/update-namespace/xpaths.txt	Mon Feb  8 18:39:41 2010
@@ -0,0 +1,7 @@
+# In this test we check that rule files using the old namespace
+# get behaviour equivalent to nocontent="theme"
+
+/html/body/h1[contains(., 'theme')]
+/html/body/div/div[@class="content"]
+/html/body/h2[contains(., 'theme')]
+/html/body/div/div/div[@class="content"]

Modified: z3/xdv/trunk/lib/xdv/update-namespace.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/update-namespace.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/update-namespace.xsl	Mon Feb  8 18:39:41 2010
@@ -9,7 +9,7 @@
 
     <xsl:template match="*[namespace-uri() = 'http://openplans.org/deliverance']">
         <xsl:element name="{local-name()}" namespace="http://namespaces.plone.org/xdv">
-            <xsl:if test="not(@nocontent) or @nocontent='theme'">
+            <xsl:if test="not(@if-content) and (not(@nocontent) or @nocontent='theme')">
                 <xsl:attribute name="if-content"><xsl:value-of select="@content"/></xsl:attribute>
             </xsl:if>
             <xsl:apply-templates select="@* | node()" />

From ejucovy at codespeak.net  Mon Feb  8 20:11:23 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon,  8 Feb 2010 20:11:23 +0100 (CET)
Subject: [z3-checkins] r71175 - in z3/deliverance/trunk/deliverance: . tests
Message-ID: <20100208191123.E5755282BD9@codespeak.net>

Author: ejucovy
Date: Mon Feb  8 20:11:20 2010
New Revision: 71175

Modified:
   z3/deliverance/trunk/deliverance/rules.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
wip #6 <rule> request/response matching broken:

 * return RuleMatch instance in RuleMatch factory, not rule (now rule matches fail silenty instead of 'not callable' error)
 * add failing test



Modified: z3/deliverance/trunk/deliverance/rules.py
==============================================================================
--- z3/deliverance/trunk/deliverance/rules.py	(original)
+++ z3/deliverance/trunk/deliverance/rules.py	Mon Feb  8 20:11:20 2010
@@ -93,7 +93,7 @@
         """
         inst = cls(**cls.parse_match_xml(el, source_location))
         inst.rule = rule
-        return rule
+        return inst
 
     def debug_description(self):
         """Used by AbstractMatch for logging"""

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	Mon Feb  8 20:11:20 2010
@@ -66,6 +66,9 @@
     ...     <drop content="#cc" nocontent="ignore" />
     ...     <replace content="children:#content" theme="children:#content" nocontent="abort" />
     ...   </rule>
+    ...   <rule path="/foo">
+    ...     <drop content="#badstuff" />
+    ...   </rule>
     ... </ruleset>'''
 
 Rule files can be published and fetched with a subrequest:
@@ -106,6 +109,10 @@
     >>> app['/magic'].headers['x-no-deliverate'] = '1'
     >>> app['/magic2'] = Response('''\
     ... <html><head><meta http-equiv="x-no-deliverate" content="1" /></head><body>something</body></html>''')
+    >>> app['/foo'] = Response('''\
+    ... <html><body>
+    ...     <div id="goodstuff">Good!</div>
+    ...     <div id="badstuff">Bad.</div></body></html>''')
 
 We'll set up one DeliveranceMiddleware using the published rules, and
 another using the rule file:
@@ -467,3 +474,33 @@
    '<html><head></head></html>'
    >>> tostring(fromstring(x), include_meta_content_type=True)
    '<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></head></html>'
+
+Test that rule matches work:
+
+   >>> print compare_request('/foo', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <html><body>
+       <div id="goodstuff">Good!</div>
+       <div id="badstuff">Bad.</div></body></html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+   <html><head><title>This is a theme title</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css">
+       @import "http://localhost/style2.css";
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top"></a>
+       <div id="content">
+       <div id="goodstuff">Good!</div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       <span id="copyright">Copyright (C)</span> 2000 Some Corporation
+     </div>
+   <BLANKLINE>
+    </body></html>

From optilude at codespeak.net  Tue Feb  9 10:06:28 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Tue,  9 Feb 2010 10:06:28 +0100 (CET)
Subject: [z3-checkins] r71177 - in z3/xdv/trunk/lib/xdv: . tests
Message-ID: <20100209090628.102CC282BDE@codespeak.net>

Author: optilude
Date: Tue Feb  9 10:06:27 2010
New Revision: 71177

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/tests/absolute_theme.html
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
Add support for absolute prefix for <input src="..." />

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Tue Feb  9 10:06:27 2010
@@ -65,8 +65,8 @@
 def apply_absolute_prefix(theme_doc, absolute_prefix):
     if absolute_prefix.endswith('/'):
         absolute_prefix = absolute_prefix[:-1]
-    for node in theme_doc.xpath('*//style | *//script | *//img | *//link | *//comment()'):
-        if node.tag == 'img' or node.tag == 'script':
+    for node in theme_doc.xpath('*//style | *//script | *//img | *//link | *//input | *//comment() '):
+        if node.tag in ('img', 'script', 'input',):
             src = node.get('src')
             if src:
                 node.set('src', to_absolute(src, absolute_prefix))

Modified: z3/xdv/trunk/lib/xdv/tests/absolute_theme.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/absolute_theme.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/absolute_theme.html	Tue Feb  9 10:06:27 2010
@@ -32,6 +32,13 @@
         <img src="/foo.jpg" />
         <img src="http://site.com/foo.jpg" />
         
+        <input type="submit" src="foo.jpg" />
+        <input type="submit" src="./foo.jpg" />
+        <input type="submit" src="../foo.jpg" />
+        <input type="submit" src="/foo.jpg" />
+        <input type="submit" src="http://site.com/foo.jpg" />
+        
         <a href="foo.html">Link</a>
+        
     </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Tue Feb  9 10:06:27 2010
@@ -6,7 +6,6 @@
 import os
 import sys
 import traceback
-import pdb
 import difflib
 from StringIO import StringIO
 import unittest
@@ -92,7 +91,6 @@
             old = open(outputfn).read()
             new = self.themed_string
             if old != new:
-                import pdb; pdb.set_trace()
                 if self.writefiles:
                     open(outputfn + '.old', 'w').write(old)
                 print "ERROR:", "output.html has CHANGED"
@@ -151,6 +149,15 @@
             '/foo.jpg',
             'http://site.com/foo.jpg'
         ], [x.get('src') for x in imgTags])
+        
+        inputTags = compiled.xpath('//input')
+        self.assertEquals([
+            '/abs/foo.jpg',
+            '/abs/foo.jpg',
+            '/abs/../foo.jpg',
+            '/foo.jpg',
+            'http://site.com/foo.jpg'
+        ], [x.get('src') for x in inputTags])
     
     def testDisabled(self):
         themefn = os.path.join(HERE, "absolute_theme.html")
@@ -197,6 +204,15 @@
             '/foo.jpg',
             'http://site.com/foo.jpg'
         ], [x.get('src') for x in imgTags])
+        
+        inputTags = compiled.xpath('//input')
+        self.assertEquals([
+            'foo.jpg',
+            './foo.jpg',
+            '../foo.jpg',
+            '/foo.jpg',
+            'http://site.com/foo.jpg'
+        ], [x.get('src') for x in inputTags])
 
 
 def test_suite():

From ldr at codespeak.net  Tue Feb  9 14:48:53 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  9 Feb 2010 14:48:53 +0100 (CET)
Subject: [z3-checkins] r71178 - in z3/xdv/trunk/lib/xdv: .
	tests/multi-copy-1 tests/multi-copy-2 tests/multi-copy-3
	tests/multi-copy-4 tests/multi-replace-1
	tests/multi-replace-2 tests/multi-replace-3 tests/multi-replace-4
Message-ID: <20100209134853.46F3B282BE3@codespeak.net>

Author: ldr
Date: Tue Feb  9 14:48:51 2010
New Revision: 71178

Added:
   z3/xdv/trunk/lib/xdv/tests/multi-copy-1/
   z3/xdv/trunk/lib/xdv/tests/multi-copy-1/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-copy-1/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-1/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-copy-2/
   z3/xdv/trunk/lib/xdv/tests/multi-copy-2/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-copy-2/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-2/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-copy-3/
   z3/xdv/trunk/lib/xdv/tests/multi-copy-3/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-3/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-copy-3/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-3/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-copy-4/
   z3/xdv/trunk/lib/xdv/tests/multi-copy-4/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-4/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-copy-4/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-copy-4/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-replace-1/
   z3/xdv/trunk/lib/xdv/tests/multi-replace-1/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-replace-1/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-1/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-replace-2/
   z3/xdv/trunk/lib/xdv/tests/multi-replace-2/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-replace-2/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-2/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-replace-3/
   z3/xdv/trunk/lib/xdv/tests/multi-replace-3/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-3/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-replace-3/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-3/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/multi-replace-4/
   z3/xdv/trunk/lib/xdv/tests/multi-replace-4/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-4/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-replace-4/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-replace-4/xpaths.txt
Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
multiple copy and replace support

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Tue Feb  9 14:48:51 2010
@@ -266,46 +266,69 @@
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 
-        <xsl:if test="count($matching-this) > 1">
+        <xsl:variable name="unconditional" select="$matching-this[not(@if-content)]"/>
+        <xsl:variable name="conditional" select="$matching-this[@if-content]"/>
+        <xsl:if test="count($unconditional) > 1">
             <xsl:message terminate="yes">
-                ERROR: Multiple replace rules may not match a single theme node.
+                ERROR: Multiple unconditional replace rules may not match a single theme node.
             </xsl:message>
         </xsl:if>
 
         <xsl:choose>
-            <xsl:when test="$matching-this/@if-content">
+            <xsl:when test="$conditional">
                 <!-- conditional <replace ...
                 When the rule matches, toss out the theme node and
                 include the @content. Otherwise keep theme node. -->
                 <xsl:element name="xsl:choose">
-                    <xsl:element name="xsl:when">
-                        <xsl:attribute name="test">
-                            <xsl:value-of select="$matching-this/@if-content"/>
-                        </xsl:attribute>
-                        <xsl:call-template name="include">
-                            <xsl:with-param name="href" select="$matching-this/@href"/>
-                            <xsl:with-param name="content" select="$matching-this/@content"/>
-                        </xsl:call-template>
-                        <!-- jump to after rules -->
-                        <xsl:call-template name="after">
-                            <xsl:with-param name="matching-rules" select="$matching-other"/>
-                            <xsl:with-param name="rules" select="$rules"/>
-                        </xsl:call-template>
-                    </xsl:element>
-                    <xsl:element name="xsl:otherwise">
-                        <xsl:call-template name="prepend-copy-append">
-                            <xsl:with-param name="matching-rules" select="$matching-other"/>
-                            <xsl:with-param name="rules" select="$rules"/>
-                        </xsl:call-template>
-                    </xsl:element>
+                    <xsl:for-each select="$conditional">
+                        <xsl:element name="xsl:when">
+                            <xsl:attribute name="test">
+                                <xsl:value-of select="@if-content"/>
+                            </xsl:attribute>
+                            <xsl:call-template name="include">
+                                <xsl:with-param name="href" select="@href"/>
+                                <xsl:with-param name="content" select="@content"/>
+                            </xsl:call-template>
+                            <!-- jump to after rules -->
+                            <xsl:call-template name="after">
+                                <xsl:with-param name="matching-rules" select="$matching-other"/>
+                                <xsl:with-param name="rules" select="$rules"/>
+                            </xsl:call-template>
+                        </xsl:element>
+                    </xsl:for-each>
+                    <xsl:choose>
+                        <xsl:when test="$unconditional">
+                            <xsl:element name="xsl:otherwise">
+                                <!-- unconditional <replace.
+                                Toss out the theme node.  Simply include the @content. -->
+                                <xsl:call-template name="include">
+                                    <xsl:with-param name="href" select="$unconditional/@href"/>
+                                    <xsl:with-param name="content" select="$unconditional/@content"/>
+                                </xsl:call-template>
+                                <!-- jump to after rules -->
+                                <xsl:call-template name="after">
+                                    <xsl:with-param name="matching-rules" select="$matching-other"/>
+                                    <xsl:with-param name="rules" select="$rules"/>
+                                </xsl:call-template>
+                            </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:element name="xsl:otherwise">
+                                <xsl:call-template name="prepend-copy-append">
+                                    <xsl:with-param name="matching-rules" select="$matching-other"/>
+                                    <xsl:with-param name="rules" select="$rules"/>
+                                </xsl:call-template>
+                            </xsl:element>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:element>
             </xsl:when>
-            <xsl:when test="$matching-this">
+            <xsl:when test="$unconditional">
                 <!-- unconditional <replace.
                 Toss out the theme node.  Simply include the @content. -->
                 <xsl:call-template name="include">
-                    <xsl:with-param name="href" select="$matching-this/@href"/>
-                    <xsl:with-param name="content" select="$matching-this/@content"/>
+                    <xsl:with-param name="href" select="$unconditional/@href"/>
+                    <xsl:with-param name="content" select="$unconditional/@content"/>
                 </xsl:call-template>
                 <!-- jump to after rules -->
                 <xsl:call-template name="after">
@@ -341,45 +364,58 @@
                     <xsl:apply-templates select="$matching-this[name()='prepend']" mode="conditional-include"/>
 
                     <!-- Copy -->
-                    <xsl:if test="count($matching-this[name()='copy']) > 1">
+                    <xsl:variable name="unconditional" select="$matching-this[name()='copy' and not(@if-content)]"/>
+                    <xsl:variable name="conditional" select="$matching-this[name()='copy' and @if-content]"/>
+                    <xsl:if test="count($unconditional) > 1">
                         <xsl:message terminate="yes">
-                            ERROR: Multiple copy rules may not match a single theme node.
+                            ERROR: Multiple unconditional copy rules may not match a single theme node.
                         </xsl:message>
                     </xsl:if>
+
                     <xsl:choose>
-                        <xsl:when test="$matching-this[name()='copy']">
-                            <xsl:variable name="this" select="$matching-this[name()='copy']"/>
-                            <xsl:choose>
-                                <xsl:when test="$this/@if-content">
-                                    <!-- When the rule matches, copy the node and its attributes,
-                                    but clear the children and text, just include the @content.
-                                    Otherwise keep theme node. -->
-                                    <xsl:element name="xsl:choose">
-                                        <xsl:element name="xsl:when">
-                                            <xsl:attribute name="test">
-                                                <xsl:value-of select="$this/@if-content"/>
-                                            </xsl:attribute>
+                        <xsl:when test="$conditional">
+                            <!-- conditional <copy ...
+                            When the rule matches, copy the node and its attributes,
+                            but clear the children and text, just include the @content.
+                            Otherwise keep theme node. -->
+                            <xsl:element name="xsl:choose">
+                                <xsl:for-each select="$conditional">
+                                    <xsl:element name="xsl:when">
+                                        <xsl:attribute name="test">
+                                            <xsl:value-of select="@if-content"/>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="include">
+                                            <xsl:with-param name="href" select="@href"/>
+                                            <xsl:with-param name="content" select="@content"/>
+                                        </xsl:call-template>
+                                    </xsl:element>
+                                </xsl:for-each>
+                                <xsl:choose>
+                                    <xsl:when test="$unconditional">
+                                        <xsl:element name="xsl:otherwise">
+                                            <!-- unconditional <copy. Simply include the @content. -->
                                             <xsl:call-template name="include">
-                                                <xsl:with-param name="href" select="$this/@href"/>
-                                                <xsl:with-param name="content" select="$this/@content"/>
+                                                <xsl:with-param name="href" select="$unconditional/@href"/>
+                                                <xsl:with-param name="content" select="$unconditional/@content"/>
                                             </xsl:call-template>
                                         </xsl:element>
+                                    </xsl:when>
+                                    <xsl:otherwise>
                                         <xsl:element name="xsl:otherwise">
                                             <xsl:apply-templates select="node()" mode="apply-rules">
                                                 <xsl:with-param name="rules" select="$rules"/>
                                             </xsl:apply-templates>
                                         </xsl:element>
-                                    </xsl:element>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <!-- Copy the node and its attributes, but clear 
-                                    the children and content.  Just include the @content -->
-                                    <xsl:call-template name="include">
-                                        <xsl:with-param name="href" select="$this/@href"/>
-                                        <xsl:with-param name="content" select="$this/@content"/>
-                                    </xsl:call-template>
-                                </xsl:otherwise>
-                            </xsl:choose>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:element>
+                        </xsl:when>
+                        <xsl:when test="$unconditional">
+                            <!-- unconditional <copy. Simply include the @content. -->
+                            <xsl:call-template name="include">
+                                <xsl:with-param name="href" select="$unconditional/@href"/>
+                                <xsl:with-param name="content" select="$unconditional/@content"/>
+                            </xsl:call-template>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:apply-templates select="node()" mode="apply-rules">

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-1/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,14 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <h1 class="content">content title</div>
+        <div id="description" class="content">content description</div>
+        <div id="content">
+            <h1 id="first-heading" class="content">first heading</h1>
+            <div id="description2" class="content">content description2</div>
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-1/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. -->
+    <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
+    <copy theme="/html/body/h1" content="//h1[@id='first-heading']/text()" if-content="//h1[@id='first-heading']"/>
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. else... -->
+    <copy theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']/node()" if-content="/html/body/div[@id='description']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description2']/node()" if-content="//div[@id='description2']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description3']/node()"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-1/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-1/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-1/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-1/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the first branches
+
+/html/body/h1[contains(., 'content title')]
+/html/body/div[contains(., 'content description')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-2/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <div id="content">
+            <h1 id="first-heading" class="content">first heading</h1>
+            <div id="description2" class="content">content description2</div>
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-2/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. -->
+    <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
+    <copy theme="/html/body/h1" content="//h1[@id='first-heading']/text()" if-content="//h1[@id='first-heading']"/>
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. else... -->
+    <copy theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']/node()" if-content="/html/body/div[@id='description']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description2']/node()" if-content="//div[@id='description2']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description3']/node()"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-2/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-2/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-2/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the second branches
+
+/html/body/h1[contains(., 'first heading')]
+/html/body/div[contains(., 'content description2')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-3/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-3/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <div id="content">
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-3/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-3/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. -->
+    <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
+    <copy theme="/html/body/h1" content="//h1[@id='first-heading']/text()" if-content="//h1[@id='first-heading']"/>
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. else... -->
+    <copy theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']/node()" if-content="/html/body/div[@id='description']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description2']/node()" if-content="//div[@id='description2']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description3']/node()"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-3/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-3/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-3/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-3/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the third branches
+
+/html/body/h1[contains(., 'Page title')]
+/html/body/div[contains(., 'content description3')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-4/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-4/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,8 @@
+<html>
+    <head>
+    </head>
+    <body>
+        <div id="content">
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-4/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-4/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. -->
+    <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
+    <copy theme="/html/body/h1" content="//h1[@id='first-heading']/text()" if-content="//h1[@id='first-heading']"/>
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple copy rules matching it, they become if.. elif.. else... -->
+    <copy theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']/node()" if-content="/html/body/div[@id='description']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description2']/node()" if-content="//div[@id='description2']"/>
+    <copy theme="/html/body/div[@id='description']" content="//div[@id='description3']/node()"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-4/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-4/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-copy-4/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-copy-4/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,5 @@
+# Check when nothing matches
+
+/html/body/h1[contains(., 'theme')]
+/html/body/div
+not(/html/body/div/text())

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-1/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,14 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <h1 class="content">content title</div>
+        <div id="description" class="content">content description</div>
+        <div id="content">
+            <h1 id="first-heading" class="content">first heading</h1>
+            <div id="description2" class="content">content description2</div>
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-1/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. -->
+    <replace theme="/html/body/h1" content="/html/body/h1" if-content="/html/body/h1"/>
+    <replace theme="/html/body/h1" content="//h1[@id='first-heading']" if-content="//h1[@id='first-heading']"/>
+    <!-- As there is no unconditional replace, it can end up in this copy -->
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. else... -->
+    <replace theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']" if-content="/html/body/div[@id='description']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description2']" if-content="//div[@id='description2']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description3']"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-1/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-1/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-1/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-1/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the first branches
+
+/html/body/h1[contains(., 'content title')]
+/html/body/div[contains(., 'content description')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-2/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <div id="content">
+            <h1 id="first-heading" class="content">first heading</h1>
+            <div id="description2" class="content">content description2</div>
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-2/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. -->
+    <replace theme="/html/body/h1" content="/html/body/h1" if-content="/html/body/h1"/>
+    <replace theme="/html/body/h1" content="//h1[@id='first-heading']" if-content="//h1[@id='first-heading']"/>
+    <!-- As there is no unconditional replace, it can end up in this copy -->
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. else... -->
+    <replace theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']" if-content="/html/body/div[@id='description']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description2']" if-content="//div[@id='description2']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description3']"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-2/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-2/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-2/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the second branches
+
+/html/body/h1[contains(., 'first heading')]
+/html/body/div[contains(., 'content description2')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-3/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-3/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>Page title</title>
+    </head>
+    <body>
+        <div id="content">
+            <div id="description3" class="content">content description3</div>
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-3/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-3/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. -->
+    <replace theme="/html/body/h1" content="/html/body/h1" if-content="/html/body/h1"/>
+    <replace theme="/html/body/h1" content="//h1[@id='first-heading']" if-content="//h1[@id='first-heading']"/>
+    <!-- As there is no unconditional replace, it can end up in this copy -->
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. else... -->
+    <replace theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']" if-content="/html/body/div[@id='description']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description2']" if-content="//div[@id='description2']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description3']"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-3/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-3/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-3/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-3/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check the third branches
+
+/html/body/h1[contains(., 'Page title')]
+/html/body/div[contains(., 'content description3')]

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-4/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-4/content.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,8 @@
+<html>
+    <head>
+    </head>
+    <body>
+        <div id="content">
+        </div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-4/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-4/rules.xml	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. -->
+    <replace theme="/html/body/h1" content="/html/body/h1" if-content="/html/body/h1"/>
+    <replace theme="/html/body/h1" content="//h1[@id='first-heading']" if-content="//h1[@id='first-heading']"/>
+    <!-- As there is no unconditional replace, it can end up in this copy -->
+    <copy theme="/html/body/h1" content="/html/head/title/text()" if-content="/html/head/title"/>
+    
+    <!-- This theme node has multiple replace rules matching it, they become if.. elif.. else... -->
+    <replace theme="/html/body/div[@id='description']" content="/html/body/div[@id='description']" if-content="/html/body/div[@id='description']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description2']" if-content="//div[@id='description2']"/>
+    <replace theme="/html/body/div[@id='description']" content="//div[@id='description3']"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-4/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-4/theme.html	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="description">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-replace-4/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-replace-4/xpaths.txt	Tue Feb  9 14:48:51 2010
@@ -0,0 +1,4 @@
+# Check when nothing matches
+
+/html/body/h1[contains(., 'theme')]
+not(/html/body/div)

From ldr at codespeak.net  Tue Feb  9 17:34:48 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  9 Feb 2010 17:34:48 +0100 (CET)
Subject: [z3-checkins] r71179 - in z3/xdv/trunk/lib/xdv: . tests/012
	tests/null-if-content
Message-ID: <20100209163448.8EC7E282BDF@codespeak.net>

Author: ldr
Date: Tue Feb  9 17:34:46 2010
New Revision: 71179

Added:
   z3/xdv/trunk/lib/xdv/tests/null-if-content/
   z3/xdv/trunk/lib/xdv/tests/null-if-content/content.html
   z3/xdv/trunk/lib/xdv/tests/null-if-content/rules.xml
   z3/xdv/trunk/lib/xdv/tests/null-if-content/theme.html
   z3/xdv/trunk/lib/xdv/tests/null-if-content/xpaths.txt
Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/cssrules.py
   z3/xdv/trunk/lib/xdv/tests/012/rules.xml
   z3/xdv/trunk/lib/xdv/tests/012/xpaths.txt
Log:
add if-content='' as a shortcut

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Tue Feb  9 17:34:46 2010
@@ -107,7 +107,15 @@
             <xsl:for-each select="*">
                 <xsl:copy>
                     <xsl:attribute name="xml:id">r<xsl:value-of select="position()"/></xsl:attribute>
-                    <xsl:copy-of select="@*"/>
+                    <xsl:copy-of select="@*[local-name() != 'if-content']"/>
+                    <xsl:choose>
+                        <xsl:when test="@if-content = ''">
+                            <xsl:attribute name="if-content"><xsl:value-of select="@content"/></xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:copy-of select="@if-content"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                     <dv:matches>
                         <xsl:variable name="themexpath" select="@theme"/>
                         <xsl:for-each select="$themehtml">

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Tue Feb  9 17:34:46 2010
@@ -29,7 +29,7 @@
                 if name.startswith('{%s}' % utils.namespaces['css']):
                     element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = css_to_xpath(value, prefix=prefix)
             else:
-                logger.error("Missing value for attribute %s" %name)
+                element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
 
 def main():
     """Called from console script

Modified: z3/xdv/trunk/lib/xdv/tests/012/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/rules.xml	Tue Feb  9 17:34:46 2010
@@ -2,6 +2,6 @@
 <rules xmlns="http://namespaces.plone.org/xdv">
     <replace theme="//h1" content="//h2"/>
     <after theme="//h1" content="/html/body/p"/>
-    <replace theme="//*[@id='marker']" content="//*[@id='missing']" nocontent="drop"/>
+    <replace theme="//*[@id='marker']" content="//*[@id='missing']"/>
     <after theme="//*[@id='marker']" content="//*[@id='footer']"/>
 </rules>

Modified: z3/xdv/trunk/lib/xdv/tests/012/xpaths.txt
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/xpaths.txt	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/xpaths.txt	Tue Feb  9 17:34:46 2010
@@ -1,5 +1,5 @@
 # 
-# Conditional <drop>. The entire portlet-wrapper should be dropped when the
+# unconditional <replace>. The entire portlet-wrapper should be dropped when the
 # content is empty. This time there are no portlets.
 #
 /html/body/h2

Added: z3/xdv/trunk/lib/xdv/tests/null-if-content/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/null-if-content/content.html	Tue Feb  9 17:34:46 2010
@@ -0,0 +1,3 @@
+<div id="marker">
+    <p>Some text</p>
+</div>

Added: z3/xdv/trunk/lib/xdv/tests/null-if-content/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/null-if-content/rules.xml	Tue Feb  9 17:34:46 2010
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
+    <copy css:theme="#marker1" css:content="#marker > *" css:if-content="#marker > *"/>
+    <!-- A null if-content means use the content selector -->
+    <copy css:theme="#marker2" css:content="#marker > *" css:if-content=""/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/null-if-content/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/null-if-content/theme.html	Tue Feb  9 17:34:46 2010
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="marker1">theme description</div>
+        <div id="marker2">theme description</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/null-if-content/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/null-if-content/xpaths.txt	Tue Feb  9 17:34:46 2010
@@ -0,0 +1,4 @@
+# Check that content="xpath " if-content="" works the same as content="xpath " if-content="xpath"
+
+//div[@id = "marker1"]/p
+//div[@id = "marker2"]/p

From ejucovy at codespeak.net  Tue Feb  9 23:21:13 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Tue,  9 Feb 2010 23:21:13 +0100 (CET)
Subject: [z3-checkins] r71182 - z3/deliverance/trunk/deliverance/tests
Message-ID: <20100209222113.03CA8282BDF@codespeak.net>

Author: ejucovy
Date: Tue Feb  9 23:21:10 2010
New Revision: 71182

Modified:
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
turns out the test was broken -- the drop has to be before the replace, since it's removed from the content doc (to be put in the theme) in the replace. fixes #6

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	Tue Feb  9 23:21:10 2010
@@ -52,6 +52,9 @@
     ...   <rule class="magic">
     ...     
     ...   </rule>
+    ...   <rule path="/foo">
+    ...     <drop content="#badstuff" />
+    ...   </rule>
     ...   <rule class="default">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
     ...     <replace content="children:body" theme="children:#content" nocontent="abort" />
@@ -66,9 +69,6 @@
     ...     <drop content="#cc" nocontent="ignore" />
     ...     <replace content="children:#content" theme="children:#content" nocontent="abort" />
     ...   </rule>
-    ...   <rule path="/foo">
-    ...     <drop content="#badstuff" />
-    ...   </rule>
     ... </ruleset>'''
 
 Rule files can be published and fetched with a subrequest:
@@ -275,6 +275,9 @@
     ...   <match response-header="X-No-Deliverate: boolean:true" abort="1" />
     ...   <match environ="wsgi.url_scheme: https" class="via-https" />
     ...   <theme href="/theme.html" />
+    ...   <rule path="/foo">
+    ...     <drop content="#badstuff" />
+    ...   </rule>
     ...   <rule class="default">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
     ...     <replace content="children:body" theme="children:#content" nocontent="abort" />
@@ -496,6 +499,7 @@
        <a name="top"></a>
        <div id="content">
        <div id="goodstuff">Good!</div>
+       </div>
        <a href="#top">Back to top</a>
      </div>
    <BLANKLINE>

From ldr at codespeak.net  Tue Feb  9 23:25:49 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  9 Feb 2010 23:25:49 +0100 (CET)
Subject: [z3-checkins] r71183 - z3/xdv/trunk/lib/xdv
Message-ID: <20100209222549.97971282BDF@codespeak.net>

Author: ldr
Date: Tue Feb  9 23:25:48 2010
New Revision: 71183

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
Allow xdv rules to be in a prefixed namespace

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Tue Feb  9 23:25:48 2010
@@ -197,7 +197,7 @@
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">before</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
+        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 
@@ -213,7 +213,7 @@
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">drop</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
+        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
@@ -270,7 +270,7 @@
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">replace</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
+        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 
@@ -357,7 +357,7 @@
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">prepend-copy-append</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[name()='prepend' or name()='copy' or name()='append']"/>
+        <xsl:variable name="matching-this" select="$matching-rules[local-name()='prepend' or local-name()='copy' or local-name()='append']"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
@@ -369,11 +369,11 @@
                     </xsl:apply-templates>
 
                     <!-- Prepend -->
-                    <xsl:apply-templates select="$matching-this[name()='prepend']" mode="conditional-include"/>
+                    <xsl:apply-templates select="$matching-this[local-name()='prepend']" mode="conditional-include"/>
 
                     <!-- Copy -->
-                    <xsl:variable name="unconditional" select="$matching-this[name()='copy' and not(@if-content)]"/>
-                    <xsl:variable name="conditional" select="$matching-this[name()='copy' and @if-content]"/>
+                    <xsl:variable name="unconditional" select="$matching-this[local-name()='copy' and not(@if-content)]"/>
+                    <xsl:variable name="conditional" select="$matching-this[local-name()='copy' and @if-content]"/>
                     <xsl:if test="count($unconditional) > 1">
                         <xsl:message terminate="yes">
                             ERROR: Multiple unconditional copy rules may not match a single theme node.
@@ -433,7 +433,7 @@
                     </xsl:choose>
 
                     <!-- Append -->
-                    <xsl:apply-templates select="$matching-rules[name()='append']" mode="conditional-include"/>
+                    <xsl:apply-templates select="$matching-rules[local-name()='append']" mode="conditional-include"/>
 
                 </xsl:copy>
             </xsl:when>
@@ -453,7 +453,7 @@
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
         <xsl:variable name="rule-name">after</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[name()=$rule-name]"/>
+        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 

From ldr at codespeak.net  Wed Feb 10 00:19:53 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 10 Feb 2010 00:19:53 +0100 (CET)
Subject: [z3-checkins] r71184 - z3/xdv/trunk/lib/xdv
Message-ID: <20100209231953.3D7D2282BDF@codespeak.net>

Author: ldr
Date: Wed Feb 10 00:19:51 2010
New Revision: 71184

Modified:
   z3/xdv/trunk/lib/xdv/cssrules.py
Log:
attributes should be put in the default namespace

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Wed Feb 10 00:19:51 2010
@@ -27,7 +27,7 @@
         for name, value in element.attrib.items():
             if value: 
                 if name.startswith('{%s}' % utils.namespaces['css']):
-                    element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = css_to_xpath(value, prefix=prefix)
+                    element.attrib[utils.localname(name)] = css_to_xpath(value, prefix=prefix)
             else:
                 element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
 

From ldr at codespeak.net  Wed Feb 10 00:20:54 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 10 Feb 2010 00:20:54 +0100 (CET)
Subject: [z3-checkins] r71185 - in z3/xdv/trunk/lib/xdv: . tests/modify-theme
Message-ID: <20100209232054.57288282BDF@codespeak.net>

Author: ldr
Date: Wed Feb 10 00:20:52 2010
New Revision: 71185

Added:
   z3/xdv/trunk/lib/xdv/tests/modify-theme/
   z3/xdv/trunk/lib/xdv/tests/modify-theme/content.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
   z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/xpaths.txt
Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
Synthetic content. A better way of including xsl.

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Feb 10 00:20:52 2010
@@ -116,6 +116,9 @@
                             <xsl:copy-of select="@if-content"/>
                         </xsl:otherwise>
                     </xsl:choose>
+                    <xsl:if test="node()">
+                        <dv:synthetic><xsl:copy-of select="node()"/></dv:synthetic>
+                    </xsl:if>
                     <dv:matches>
                         <xsl:variable name="themexpath" select="@theme"/>
                         <xsl:for-each select="$themehtml">
@@ -294,8 +297,7 @@
                                 <xsl:value-of select="@if-content"/>
                             </xsl:attribute>
                             <xsl:call-template name="include">
-                                <xsl:with-param name="href" select="@href"/>
-                                <xsl:with-param name="content" select="@content"/>
+                                <xsl:with-param name="rule" select="."/>
                             </xsl:call-template>
                             <!-- jump to after rules -->
                             <xsl:call-template name="after">
@@ -310,8 +312,7 @@
                                 <!-- unconditional <replace.
                                 Toss out the theme node.  Simply include the @content. -->
                                 <xsl:call-template name="include">
-                                    <xsl:with-param name="href" select="$unconditional/@href"/>
-                                    <xsl:with-param name="content" select="$unconditional/@content"/>
+                                    <xsl:with-param name="rule" select="$unconditional"/>
                                 </xsl:call-template>
                                 <!-- jump to after rules -->
                                 <xsl:call-template name="after">
@@ -335,8 +336,7 @@
                 <!-- unconditional <replace.
                 Toss out the theme node.  Simply include the @content. -->
                 <xsl:call-template name="include">
-                    <xsl:with-param name="href" select="$unconditional/@href"/>
-                    <xsl:with-param name="content" select="$unconditional/@content"/>
+                    <xsl:with-param name="rule" select="$unconditional"/>
                 </xsl:call-template>
                 <!-- jump to after rules -->
                 <xsl:call-template name="after">
@@ -393,8 +393,7 @@
                                             <xsl:value-of select="@if-content"/>
                                         </xsl:attribute>
                                         <xsl:call-template name="include">
-                                            <xsl:with-param name="href" select="@href"/>
-                                            <xsl:with-param name="content" select="@content"/>
+                                            <xsl:with-param name="rule" select="."/>
                                         </xsl:call-template>
                                     </xsl:element>
                                 </xsl:for-each>
@@ -403,8 +402,7 @@
                                         <xsl:element name="xsl:otherwise">
                                             <!-- unconditional <copy. Simply include the @content. -->
                                             <xsl:call-template name="include">
-                                                <xsl:with-param name="href" select="$unconditional/@href"/>
-                                                <xsl:with-param name="content" select="$unconditional/@content"/>
+                                                <xsl:with-param name="rule" select="$unconditional"/>
                                             </xsl:call-template>
                                         </xsl:element>
                                     </xsl:when>
@@ -421,8 +419,7 @@
                         <xsl:when test="$unconditional">
                             <!-- unconditional <copy. Simply include the @content. -->
                             <xsl:call-template name="include">
-                                <xsl:with-param name="href" select="$unconditional/@href"/>
-                                <xsl:with-param name="content" select="$unconditional/@content"/>
+                                <xsl:with-param name="rule" select="$unconditional"/>
                             </xsl:call-template>
                         </xsl:when>
                         <xsl:otherwise>
@@ -481,24 +478,31 @@
                         <xsl:value-of select="@if-content"/>
                     </xsl:attribute>
                     <xsl:call-template name="include">
-                        <xsl:with-param name="href" select="@href"/>
-                        <xsl:with-param name="content" select="@content"/>
+                        <xsl:with-param name="rule" select="."/>
                     </xsl:call-template>
                 </xsl:element>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:call-template name="include">
-                    <xsl:with-param name="href" select="@href"/>
-                    <xsl:with-param name="content" select="@content"/>
+                    <xsl:with-param name="rule" select="."/>
                 </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
 
     <xsl:template name="include">
-        <xsl:param name="href"/>
-        <xsl:param name="content"/>
+        <xsl:param name="rule"/>
+        <xsl:variable name="href" select="$rule/@href"/>
+        <xsl:variable name="content" select="$rule/@content"/>
         <xsl:choose>
+            <xsl:when test="$rule/dv:synthetic">
+                <xsl:if test="$content">
+                    <xsl:message terminate="yes">
+                        ERROR: @content and synthetic
+                    </xsl:message>
+                </xsl:if>
+                <xsl:copy-of select="$rule/dv:synthetic/node()"/>
+            </xsl:when>
             <xsl:when test="not($href)">
                 <xsl:element name="xsl:copy-of">
                     <xsl:attribute name="select">

Added: z3/xdv/trunk/lib/xdv/tests/modify-theme/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/content.html	Wed Feb 10 00:20:52 2010
@@ -0,0 +1,14 @@
+<html>
+<body>
+    <table id="details">
+        <tr>
+            <td>One</td>
+            <td>1</td>
+        </tr>
+        <tr>
+            <td>Two</td>
+            <td>2</td>
+        </tr>
+    </table>
+</body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html	Wed Feb 10 00:20:52 2010
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <div id="from-rules">From the rules</div>
+    <h1>theme</h1>
+    <dl id="details">
+      <dt>One</dt>
+      <dd>1</dd>
+      <dt>Two</dt>
+      <dd>2</dd>
+    </dl>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	Wed Feb 10 00:20:52 2010
@@ -0,0 +1,20 @@
+<xdv:rules
+    xmlns:xdv="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    >
+
+    <xdv:before theme="/html/body/h1">
+        <div id="from-rules">From the rules</div>
+    </xdv:before>
+    
+    <xdv:replace css:theme="#details">
+        <dl id="details">
+            <xsl:for-each select='//table[@id="details"]/tr'>
+                <dt><xsl:copy-of select="td[1]/text()"/></dt>
+                <dd><xsl:copy-of select="td[2]/node()"/></dd>
+            </xsl:for-each>
+        </dl>
+    </xdv:replace>
+
+</xdv:rules>

Added: z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html	Wed Feb 10 00:20:52 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <body>
+        <h1>theme</h1>
+        <div id="details">Details</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/modify-theme/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/xpaths.txt	Wed Feb 10 00:20:52 2010
@@ -0,0 +1,4 @@
+# This div is added in the rules file
+/html/body/div[@id="from-rules"]
+/html/body/dl/dt
+/html/body/dl/dd

From ldr at codespeak.net  Wed Feb 10 00:25:26 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 10 Feb 2010 00:25:26 +0100 (CET)
Subject: [z3-checkins] r71186 - z3/xdv/trunk/lib/xdv/tests/modify-theme
Message-ID: <20100209232526.CA3B1282BDF@codespeak.net>

Author: ldr
Date: Wed Feb 10 00:25:25 2010
New Revision: 71186

Modified:
   z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
Log:
the css to xpath transform works on other namespaces too

Modified: z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	Wed Feb 10 00:25:25 2010
@@ -10,7 +10,7 @@
     
     <xdv:replace css:theme="#details">
         <dl id="details">
-            <xsl:for-each select='//table[@id="details"]/tr'>
+            <xsl:for-each css:select="table#details > tr">
                 <dt><xsl:copy-of select="td[1]/text()"/></dt>
                 <dd><xsl:copy-of select="td[2]/node()"/></dd>
             </xsl:for-each>

From ldr at codespeak.net  Wed Feb 10 00:55:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 10 Feb 2010 00:55:58 +0100 (CET)
Subject: [z3-checkins] r71187 - in z3/xdv/trunk/lib/xdv: . tests/modify-theme
Message-ID: <20100209235558.A7F8E282BDF@codespeak.net>

Author: ldr
Date: Wed Feb 10 00:55:56 2010
New Revision: 71187

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
   z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html
Log:
tweaks to synthetic content inclusion

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Feb 10 00:55:56 2010
@@ -501,7 +501,7 @@
                         ERROR: @content and synthetic
                     </xsl:message>
                 </xsl:if>
-                <xsl:copy-of select="$rule/dv:synthetic/node()"/>
+                <xsl:apply-templates mode="include-synthetic" select="$rule/dv:synthetic/node()"/>
             </xsl:when>
             <xsl:when test="not($href)">
                 <xsl:element name="xsl:copy-of">
@@ -531,6 +531,29 @@
         </xsl:choose>
     </xsl:template>
 
+    <xsl:template match="comment()" mode="include-synthetic">
+        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
+    </xsl:template>
+
+    <xsl:template mode="include-synthetic"
+        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
+        <!-- Emit xsl that avoids escaping -->
+        <xsl:element name="xsl:variable">
+            <xsl:attribute name="name">tag_text</xsl:attribute>
+            <xsl:value-of select="."/>
+        </xsl:element>
+        <xsl:element name="xsl:value-of">
+            <xsl:attribute name="select">$tag_text</xsl:attribute>
+            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
+        </xsl:element>        
+    </xsl:template>
+
+    <xsl:template match="@*|node()" mode="include-synthetic">
+        <xsl:copy>
+          <xsl:apply-templates select="@*|node()" mode="include-synthetic"/>
+        </xsl:copy>
+    </xsl:template>
+
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>
         <xsl:param name="matching" select="/.."/>

Modified: z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html	Wed Feb 10 00:55:56 2010
@@ -1,7 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+    <title>Theme title</title>
+    <style type="text/css">
+            /* From the rules */
+            body > h1 { color: red; }
+        </style>
+  </head>
   <body>
     <div id="from-rules">From the rules</div>
+<!-- A comment from the rules -->
+    <p>
+            Check that a stray xmlns does not end up in the output
+        </p>
     <h1>theme</h1>
     <dl id="details">
       <dt>One</dt>

Modified: z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	Wed Feb 10 00:55:56 2010
@@ -6,8 +6,19 @@
 
     <xdv:before theme="/html/body/h1">
         <div id="from-rules">From the rules</div>
+        <!-- A comment from the rules -->
+        <p xmlns="http://www.w3.org/1999/xhtml">
+            Check that a stray xmlns does not end up in the output
+        </p>
     </xdv:before>
     
+    <xdv:append theme="/html/head">
+        <style type="text/css">
+            /* From the rules */
+            body > h1 { color: red; }
+        </style>
+    </xdv:append>
+    
     <xdv:replace css:theme="#details">
         <dl id="details">
             <xsl:for-each css:select="table#details > tr">
@@ -16,5 +27,11 @@
             </xsl:for-each>
         </dl>
     </xdv:replace>
-
+    <!--
+        Note that css expressions are converted to `placeless` xpath expressions,
+        so css:select="table#details > tr" converts to select="//table[@id='details]/tr".
+        
+        This means it would not be possible to use css:select="td:first-child > *" as
+        you want a relative selector here.
+    -->
 </xdv:rules>

Modified: z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/theme.html	Wed Feb 10 00:55:56 2010
@@ -1,5 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
+    <head>
+        <title>Theme title</title>
+    </head>
     <body>
         <h1>theme</h1>
         <div id="details">Details</div>

From ldr at codespeak.net  Wed Feb 10 19:13:41 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 10 Feb 2010 19:13:41 +0100 (CET)
Subject: [z3-checkins] r71188 - in z3/xdv/trunk/lib/xdv: . tests tests/esi
	tests/ssi
Message-ID: <20100210181341.EF294282BDF@codespeak.net>

Author: ldr
Date: Wed Feb 10 19:13:36 2010
New Revision: 71188

Added:
   z3/xdv/trunk/lib/xdv/tests/esi/
   z3/xdv/trunk/lib/xdv/tests/esi/content.html
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
   z3/xdv/trunk/lib/xdv/tests/esi/rules.xml
   z3/xdv/trunk/lib/xdv/tests/esi/theme.html
   z3/xdv/trunk/lib/xdv/tests/esi/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/ssi/
   z3/xdv/trunk/lib/xdv/tests/ssi/content.html
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml
   z3/xdv/trunk/lib/xdv/tests/ssi/theme.html
   z3/xdv/trunk/lib/xdv/tests/ssi/xpaths.txt
Modified:
   z3/xdv/trunk/lib/xdv/boilerplate.xsl
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/cssrules.py
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
Add esi include support, necessatating a general namespace cleanup - the approach now is to remove xhtml namespace on the way in and let the serializer add it back automatically.

Modified: z3/xdv/trunk/lib/xdv/boilerplate.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/boilerplate.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/boilerplate.xsl	Wed Feb 10 19:13:36 2010
@@ -2,6 +2,7 @@
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:dv="http://namespaces.plone.org/xdv"
+    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
     xmlns:exsl="http://exslt.org/common"
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
     exclude-result-prefixes="exsl dv xhtml" >
@@ -47,27 +48,11 @@
         <dv:insert/>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Feb 10 19:13:36 2010
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common"
-    xmlns:set="http://exslt.org/sets" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    xmlns:dyn="http://exslt.org/dynamic" xmlns:xml="http://www.w3.org/XML/1998/namespace"
-    exclude-result-prefixes="dv dyn exsl xml" version="1.0">
+<xsl:stylesheet version="1.0"
+    xmlns:dv="http://namespaces.plone.org/xdv"
+    xmlns:dyn="http://exslt.org/dynamic"
+    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
+    xmlns:exsl="http://exslt.org/common"
+    xmlns:set="http://exslt.org/sets"
+    xmlns:xhtml="http://www.w3.org/1999/xhtml"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    exclude-result-prefixes="dv dyn exsl xml">
     <xsl:output indent="yes" media-type="text/xml"/>
+
     <xsl:param name="rulesuri">rules.xml</xsl:param>
     <xsl:param name="boilerplateurl">boilerplate.xsl</xsl:param>
     <xsl:param name="extraurl"/>
@@ -12,8 +18,14 @@
     <xsl:param name="includemode">document</xsl:param>
     <xsl:param name="ssiprefix"></xsl:param>
     <xsl:param name="ssisuffix">;filter_xpath=</xsl:param>
+    <xsl:param name="esiprefix"></xsl:param>
+    <xsl:param name="esisuffix">;filter_xpath=</xsl:param>
     <xsl:variable name="theme" select="/"/>
-    <!-- Multi-stage theme compiler -->
+
+    <!--
+        Multi-stage theme compiler
+    -->
+
     <xsl:template match="/">
 
         <!-- Put unique xml:id values on all the theme html -->
@@ -53,11 +65,11 @@
         <xsl:copy-of select="$stage2"/>
 
     </xsl:template>
-    <!-- 
-        
-        All the utility rules
 
+    <!--
+        Boilerplate
     -->
+
     <xsl:template match="node()|@*" mode="include-boilerplate">
         <xsl:param name="stage1"/>
         <xsl:param name="rules"/>
@@ -98,9 +110,29 @@
         </xsl:choose>
 
     </xsl:template>
-    <!-- 
+
+    <xsl:template match="/xsl:stylesheet/@exclude-result-prefixes" mode="include-boilerplate">
+        <xsl:param name="stage1"/>
+        <xsl:param name="rules"/>
+        <xsl:choose>
+            <xsl:when test="not($rules//*/@method='esi' or $includemode='esi')">
+                <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy>
+                    <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
+                        <xsl:with-param name="stage1" select="$stage1"/>
+                        <xsl:with-param name="rules" select="$rules"/>
+                    </xsl:apply-templates>
+                </xsl:copy>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!--
         Annotate the rules for stage1
     -->
+
     <xsl:template match="dv:rules" mode="annotate-rules">
         <xsl:param name="themehtml"/>
         <xsl:copy>
@@ -117,7 +149,7 @@
                         </xsl:otherwise>
                     </xsl:choose>
                     <xsl:if test="node()">
-                        <dv:synthetic><xsl:copy-of select="node()"/></dv:synthetic>
+                        <dv:synthetic><xsl:apply-templates select="node()" mode="filter-synthetic"/></dv:synthetic>
                     </xsl:if>
                     <dv:matches>
                         <xsl:variable name="themexpath" select="@theme"/>
@@ -134,6 +166,23 @@
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="node()|@*" mode="filter-synthetic">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*" mode="filter-synthetic"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match='//*[namespace-uri() = "http://www.w3.org/1999/xhtml"]' mode="filter-synthetic">
+        <xsl:element name="{local-name()}">
+            <xsl:apply-templates select="@*|node()" mode="filter-synthetic"/>
+        </xsl:element>
+    </xsl:template>
+
+
+    <!--
+        Annotate the theme html
+    -->
+
     <xsl:template match="comment()" mode="annotate-html">
         <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
     </xsl:template>
@@ -146,9 +195,22 @@
             <xsl:apply-templates select="node()|@*" mode="annotate-html"/>
         </xsl:copy>
     </xsl:template>
+
+    <xsl:template match="/html/@xmlns" mode="annotate-html" priority="5">
+        <!-- setting the namespace to xhtml mucks up the included namespaces, so cheat -->
+        <xsl:if test="document($rulesuri, $theme)//*/@method='esi' or $includemode='esi'">
+            <!-- when we have another namespace defined, libxml2/xmlsave.c will not magically add the xhtml ns for us -->
+            <xsl:element name="xsl:attribute">
+                <xsl:attribute name="name">xmlns</xsl:attribute>
+                <xsl:value-of select="."/>
+            </xsl:element>
+        </xsl:if>
+    </xsl:template>
+
     <!--
         Apply the rules
     -->
+
     <xsl:template match="node()|@*" mode="apply-rules">
         <xsl:param name="rules"/>
         <xsl:variable name="thisxmlid" select="@xml:id"/>
@@ -187,15 +249,13 @@
         <xsl:element name="xsl:value-of">
             <xsl:attribute name="select">$tag_text</xsl:attribute>
             <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>        
+        </xsl:element>
     </xsl:template>
 
-    <xsl:template match="/html/@xmlns" mode="apply-rules" priority="5">
-        <!-- Filter this out (causes problems when xsl is not serialized) -->
-    </xsl:template>
     <!--
         Rule templates
     -->
+
     <xsl:template name="before">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -470,6 +530,10 @@
         </xsl:copy>
     </xsl:template>
 
+    <!--
+        Content inclusion
+    -->
+
     <xsl:template match="@*|node()" mode="conditional-include">
         <xsl:choose>
             <xsl:when test="@if-content">
@@ -494,11 +558,17 @@
         <xsl:param name="rule"/>
         <xsl:variable name="href" select="$rule/@href"/>
         <xsl:variable name="content" select="$rule/@content"/>
+        <xsl:variable name="method" select="$rule/@method"/>
         <xsl:choose>
             <xsl:when test="$rule/dv:synthetic">
                 <xsl:if test="$content">
                     <xsl:message terminate="yes">
-                        ERROR: @content and synthetic
+                        ERROR: @content and synthetic not allowed in same rule
+                    </xsl:message>
+                </xsl:if>
+                <xsl:if test="$href">
+                    <xsl:message terminate="yes">
+                        ERROR: @href and synthetic not allowed in same rule
                     </xsl:message>
                 </xsl:if>
                 <xsl:apply-templates mode="include-synthetic" select="$rule/dv:synthetic/node()"/>
@@ -510,23 +580,31 @@
                     </xsl:attribute>
                 </xsl:element>
             </xsl:when>
-            <xsl:when test="$includemode = 'document'">
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$includemode = 'ssi'">
+            <xsl:when test="$method = 'ssi'">
                 <!-- Assumptions:
-                    * $href is an absolute local path (e.g.  /foo/bar)
+                    * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
                     /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
                     ><xsl:value-of select="$ssisuffix"/><xsl:value-of select="$content"/>" wait="yes" </xsl:element>
             </xsl:when>
+            <xsl:when test="$method = 'esi'">
+                <!-- Assumptions:
+                    * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
+                -->
+                <esi:include><xsl:attribute name="src"><xsl:value-of select="$esiprefix"
+                    /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
+                    ><xsl:value-of select="$esisuffix"/><xsl:value-of select="$content"/></xsl:attribute></esi:include>
+            </xsl:when>
             <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    ERROR: Unknown includemode.
-                </xsl:message>
+                <xsl:if test="$method and $method != 'document' or $includemode != 'document'">
+                    <xsl:message terminate="yes">
+                        ERROR: Unknown includemode.
+                    </xsl:message>
+                </xsl:if>
+                <xsl:element name="xsl:copy-of">
+                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
+                </xsl:element>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -554,6 +632,10 @@
         </xsl:copy>
     </xsl:template>
 
+    <!--
+        Debugging support
+    -->
+
     <xsl:template name="trace">
         <xsl:param name="rule-name"/>
         <xsl:param name="matching" select="/.."/>

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Wed Feb 10 19:13:36 2010
@@ -23,6 +23,8 @@
 def convert_css_selectors(rules, prefix='//'):
     """Convert css rules to xpath rules element tree in place
     """
+    #XXX: There is a :root pseudo-class - http://www.w3.org/TR/css3-selectors/#root-pseudo
+    # We may wish to add support to lxml.cssselect for it some day.
     for element in rules.xpath("//@*[namespace-uri()='%s']/.." % utils.namespaces['css']):
         for name, value in element.attrib.items():
             if value: 

Added: z3/xdv/trunk/lib/xdv/tests/esi/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/esi/content.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,5 @@
+<html>
+    <body>
+        not used
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/esi/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/esi/output.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>theme</h1>
+    <esi:include src="extra.html?;filter_xpath=//*[@id = 'something']"></esi:include>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/esi/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/esi/rules.xml	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,8 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+
+    <replace css:theme="#include" css:content="#something" href="extra.html" method="esi"/>
+
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/esi/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/esi/theme.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <body>
+        <h1>theme</h1>
+        <div id="include">theme content</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/esi/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/esi/xpaths.txt	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,2 @@
+# The xpath testing mucks about with namespaces...
+/html/body/include

Added: z3/xdv/trunk/lib/xdv/tests/ssi/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/content.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,5 @@
+<html>
+    <body>
+        not used
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/ssi/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/output.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>theme</h1>
+<!--# include  virtual="extra.html?;filter_xpath=//*[@id = 'something']" wait="yes" -->
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,8 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+
+    <replace css:theme="#include" css:content="#something" href="extra.html" method="ssi"/>
+
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/ssi/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/theme.html	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <body>
+        <h1>theme</h1>
+        <div id="include">theme content</div>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/ssi/xpaths.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/xpaths.txt	Wed Feb 10 19:13:36 2010
@@ -0,0 +1,2 @@
+# SSI includes are rendered as comments
+/html/body/comment()[contains(., 'include')]

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Wed Feb 10 19:13:36 2010
@@ -21,6 +21,7 @@
 class XDVTestCase(unittest.TestCase):
     
     writefiles = os.environ.get('XDVTESTS_WRITE_FILES', False)
+    warnings = os.environ.get('XDVTESTS_WARN', "1").lower() not in ('0', 'false', 'off') 
 
     testdir = None # override
     
@@ -52,9 +53,10 @@
             if old != new:
                 if self.writefiles:
                     open(xslfn + '.old', 'w').write(old)
-                print "WARNING:", "compiled.xsl has CHANGED"
-                for line in difflib.unified_diff(old.split('\n'), new.split('\n'), xslfn, 'now'):
-                    print line
+                if self.warnings:
+                    print "WARNING:", "compiled.xsl has CHANGED"
+                    for line in difflib.unified_diff(old.split('\n'), new.split('\n'), xslfn, 'now'):
+                        print line
 
         # Write the compiled xsl out to catch unexpected changes
         if self.writefiles:
@@ -91,8 +93,8 @@
             old = open(outputfn).read()
             new = self.themed_string
             if old != new:
-                if self.writefiles:
-                    open(outputfn + '.old', 'w').write(old)
+                #if self.writefiles:
+                #    open(outputfn + '.old', 'w').write(old)
                 print "ERROR:", "output.html has CHANGED"
                 for line in difflib.unified_diff(old.split('\n'), new.split('\n'), outputfn, 'now'):
                     print  line

From ldr at codespeak.net  Thu Feb 11 10:48:36 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 10:48:36 +0100 (CET)
Subject: [z3-checkins] r71192 - in z3/xdv/trunk/lib/xdv/tests: 001 002 003
	004 005 006 007 008 009 010 011 012 013 014
Message-ID: <20100211094836.B592E282BD4@codespeak.net>

Author: ldr
Date: Thu Feb 11 10:48:28 2010
New Revision: 71192

Modified:
   z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
Log:
update compiled.xsl. These may not be very useful really for the tests. I'll consider removing them next time they break.

Modified: z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><xsl:copy-of select="/html/head/title"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><title id="something"><xsl:copy-of select="/html/head/title"/></title></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"/><link id="third" rel="stylesheet" href="third.css"/><xsl:copy-of select="/html/head/link"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><xsl:copy-of select="/html/head/link"/><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"/><link id="third" rel="stylesheet" href="third.css"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -37,27 +37,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><xsl:copy-of select="/html/head/link[@id='veryfirst']"/><title id="first">Second Theme Page Title</title><script id="second" src="second.js" type="text/javascript"/><link id="third" rel="stylesheet" href="third.css"/><xsl:copy-of select="/html/head/link[@id='last']"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -37,27 +37,11 @@
 	&lt;![endif]</xsl:comment><xsl:copy-of select="/html/head/link"/></head><body/></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -35,27 +35,11 @@
         <html><head><xsl:copy-of select="/html/head/title"/></head><body><xsl:copy-of select="//div[@id='wrapper']"/></body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -45,27 +45,11 @@
         </xsl:variable><xsl:value-of select="$tag_text" disable-output-escaping="yes"/></script></body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -42,27 +42,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -39,27 +39,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -38,27 +38,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -38,27 +38,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

Modified: z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl	Thu Feb 11 10:48:28 2010
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml esi">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
     <xsl:template match="/">
@@ -46,27 +46,11 @@
     </body></html>
     </xsl:template>
     <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+        <xsl:element name="{local-name()}">
             <xsl:apply-templates select="@*" mode="final-stage"/>
             <xsl:value-of select="text()" disable-output-escaping="yes"/>
         </xsl:element>
     </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
     <xsl:template match="node()|@*" priority="1" mode="final-stage">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*" mode="final-stage"/>

From ldr at codespeak.net  Thu Feb 11 12:11:48 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 12:11:48 +0100 (CET)
Subject: [z3-checkins] r71196 - z3/xdv/trunk/lib/xdv
Message-ID: <20100211111148.F03E8282BD4@codespeak.net>

Author: ldr
Date: Thu Feb 11 12:11:43 2010
New Revision: 71196

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
fix includemode default

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Thu Feb 11 12:11:43 2010
@@ -148,6 +148,9 @@
                             <xsl:copy-of select="@if-content"/>
                         </xsl:otherwise>
                     </xsl:choose>
+                    <xsl:if test="@href and not(@method)">
+                        <xsl:attribute name="method"><xsl:value-of select="$includemode"/></xsl:attribute>
+                    </xsl:if>
                     <xsl:if test="node()">
                         <dv:synthetic><xsl:apply-templates select="node()" mode="filter-synthetic"/></dv:synthetic>
                     </xsl:if>
@@ -580,6 +583,11 @@
                     </xsl:attribute>
                 </xsl:element>
             </xsl:when>
+            <xsl:when test="$method = 'document'">
+                <xsl:element name="xsl:copy-of">
+                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
+                </xsl:element>
+            </xsl:when>
             <xsl:when test="$method = 'ssi'">
                 <!-- Assumptions:
                     * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
@@ -597,14 +605,9 @@
                     ><xsl:value-of select="$esisuffix"/><xsl:value-of select="$content"/></xsl:attribute></esi:include>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:if test="$method and $method != 'document' or $includemode != 'document'">
-                    <xsl:message terminate="yes">
-                        ERROR: Unknown includemode.
-                    </xsl:message>
-                </xsl:if>
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
-                </xsl:element>
+                <xsl:message terminate="yes">
+                    ERROR: Unknown includemode.
+                </xsl:message>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>

From ldr at codespeak.net  Thu Feb 11 21:48:04 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 21:48:04 +0100 (CET)
Subject: [z3-checkins] r71199 - in z3/xdv/trunk/lib/xdv: . tests/esi
Message-ID: <20100211204804.8309D282BE4@codespeak.net>

Author: ldr
Date: Thu Feb 11 21:48:01 2010
New Revision: 71199

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
Log:
varnish needs the esi src escaping

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Thu Feb 11 21:48:01 2010
@@ -5,6 +5,7 @@
     xmlns:esi="http://www.edge-delivery.org/esi/1.0"
     xmlns:exsl="http://exslt.org/common"
     xmlns:set="http://exslt.org/sets"
+    xmlns:str="http://exslt.org/strings"
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -115,7 +116,7 @@
         <xsl:param name="stage1"/>
         <xsl:param name="rules"/>
         <xsl:choose>
-            <xsl:when test="not($rules//*/@method='esi' or $includemode='esi')">
+            <xsl:when test="not($rules//*[@method='esi'] or ($includemode='esi' and $rules//*[not(@method)]))">
                 <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
@@ -566,12 +567,12 @@
             <xsl:when test="$rule/dv:synthetic">
                 <xsl:if test="$content">
                     <xsl:message terminate="yes">
-                        ERROR: @content and synthetic not allowed in same rule
+                        ERROR: @content attribute and inline content not allowed in same rule
                     </xsl:message>
                 </xsl:if>
                 <xsl:if test="$href">
                     <xsl:message terminate="yes">
-                        ERROR: @href and synthetic not allowed in same rule
+                        ERROR: @href attribute and inline content not allowed in same rule
                     </xsl:message>
                 </xsl:if>
                 <xsl:apply-templates mode="include-synthetic" select="$rule/dv:synthetic/node()"/>
@@ -600,13 +601,13 @@
                 <!-- Assumptions:
                     * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
-                <esi:include><xsl:attribute name="src"><xsl:value-of select="$esiprefix"
-                    /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
-                    ><xsl:value-of select="$esisuffix"/><xsl:value-of select="$content"/></xsl:attribute></esi:include>
+                <esi:include><xsl:attribute name="src"><xsl:value-of select="str:encode-uri($esiprefix, false())"
+                    /><xsl:value-of select="str:encode-uri($href, false())"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
+                    ><xsl:value-of select="str:encode-uri($esisuffix, false())"/><xsl:value-of select="str:encode-uri($content, false())"/></xsl:attribute></esi:include>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">
-                    ERROR: Unknown includemode.
+                    ERROR: Unknown includemode or @method attribute
                 </xsl:message>
             </xsl:otherwise>
         </xsl:choose>

Modified: z3/xdv/trunk/lib/xdv/tests/esi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/output.html	Thu Feb 11 21:48:01 2010
@@ -2,6 +2,6 @@
 <html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-    <esi:include src="extra.html?;filter_xpath=//*[@id = 'something']"></esi:include>
+    <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>
   </body>
 </html>

From ldr at codespeak.net  Thu Feb 11 21:51:53 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 21:51:53 +0100 (CET)
Subject: [z3-checkins] r71200 - in z3/xdv/trunk: . examples
Message-ID: <20100211205153.45126282BEB@codespeak.net>

Author: ldr
Date: Thu Feb 11 21:51:51 2010
New Revision: 71200

Added:
   z3/xdv/trunk/examples/varnish.vcl
   z3/xdv/trunk/varnish.cfg
Log:
example varnish esi config

Added: z3/xdv/trunk/examples/varnish.vcl
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/examples/varnish.vcl	Thu Feb 11 21:51:51 2010
@@ -0,0 +1,14 @@
+backend default {
+    .host = "127.0.0.1";
+    .port = "8000";
+}
+
+sub vcl_recv {
+    set req.backend = default;
+}
+
+sub vcl_fetch {
+    if (obj.http.Content-Type == "text/html; charset=utf-8") {
+        esi;
+    }
+}

Added: z3/xdv/trunk/varnish.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/varnish.cfg	Thu Feb 11 21:51:51 2010
@@ -0,0 +1,15 @@
+[buildout]
+extends = nginx.cfg
+parts +=
+    varnish-build
+    varnish
+
+[varnish-build]
+recipe= zc.recipe.cmmi
+url = ${varnish:download-url}
+
+[varnish]
+recipe = plone.recipe.varnish
+daemon = ${buildout:parts-directory}/varnish-build/sbin/varnishd
+bind = 127.0.0.1:8001
+config = ${buildout:directory}/examples/varnish.vcl

From ldr at codespeak.net  Thu Feb 11 23:13:49 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 23:13:49 +0100 (CET)
Subject: [z3-checkins] r71201 - z3/xdv/trunk/lib/xdv
Message-ID: <20100211221349.40131282BD4@codespeak.net>

Author: ldr
Date: Thu Feb 11 23:13:47 2010
New Revision: 71201

Modified:
   z3/xdv/trunk/lib/xdv/cssrules.py
Log:
fix the css rules conversion for if-config=''

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Thu Feb 11 23:13:47 2010
@@ -27,11 +27,11 @@
     # We may wish to add support to lxml.cssselect for it some day.
     for element in rules.xpath("//@*[namespace-uri()='%s']/.." % utils.namespaces['css']):
         for name, value in element.attrib.items():
-            if value: 
-                if name.startswith('{%s}' % utils.namespaces['css']):
+            if name.startswith('{%s}' % utils.namespaces['css']):
+                if value:
                     element.attrib[utils.localname(name)] = css_to_xpath(value, prefix=prefix)
-            else:
-                element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
+                else:
+                    element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
 
 def main():
     """Called from console script

From ldr at codespeak.net  Thu Feb 11 23:14:21 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 11 Feb 2010 23:14:21 +0100 (CET)
Subject: [z3-checkins] r71202 - in z3/xdv/trunk: . examples examples/nginx
	examples/ploneorg templates
Message-ID: <20100211221421.6DD6A282BD4@codespeak.net>

Author: ldr
Date: Thu Feb 11 23:14:18 2010
New Revision: 71202

Added:
   z3/xdv/trunk/templates/
   z3/xdv/trunk/templates/command.sh.in   (contents, props changed)
   z3/xdv/trunk/templates/nginx.conf.in
      - copied, changed from r71152, z3/xdv/trunk/examples/nginx/nginx.conf.in
   z3/xdv/trunk/templates/varnish.vcl.in
      - copied, changed from r71200, z3/xdv/trunk/examples/varnish.vcl
Removed:
   z3/xdv/trunk/examples/nginx/
   z3/xdv/trunk/examples/ploneorg/plone.xsl
   z3/xdv/trunk/examples/varnish.vcl
Modified:
   z3/xdv/trunk/examples/rules.xml
   z3/xdv/trunk/examples/theme.html
   z3/xdv/trunk/nginx.cfg
   z3/xdv/trunk/varnish.cfg
Log:
A working nginx / varnish setup with esi includes

Deleted: /z3/xdv/trunk/examples/ploneorg/plone.xsl
==============================================================================
--- /z3/xdv/trunk/examples/ploneorg/plone.xsl	Thu Feb 11 23:14:18 2010
+++ (empty file)
@@ -1,192 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dv="http://namespaces.plone.org/xdv" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl dv xhtml">
-  <xsl:output method="xml" indent="no" omit-xml-declaration="yes" media-type="text/html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-    <xsl:template match="/">
-
-        <!-- Pass incoming content through initial-stage filter. -->
-        <xsl:variable name="initial-stage-rtf">
-            <xsl:apply-templates select="/" mode="initial-stage"/>
-        </xsl:variable>
-        <xsl:variable name="initial-stage" select="exsl:node-set($initial-stage-rtf)"/>
-
-        <!-- Now apply the theme to the initial-stage content -->
-        <xsl:variable name="themedcontent-rtf">
-            <xsl:apply-templates select="$initial-stage" mode="apply-theme"/>
-        </xsl:variable>
-        <xsl:variable name="content" select="exsl:node-set($themedcontent-rtf)"/>
-
-        <!-- We're done, so generate some output by passing 
-            through a final stage. -->
-        <xsl:apply-templates select="$content" mode="final-stage"/>
-
-    </xsl:template>
-
-    <!-- 
-    
-        Utility templates
-    -->
-    <xsl:template match="//*[@id=&quot;user-name&quot;]/img" mode="initial-stage"><!--Do nothing, skip these nodes--></xsl:template><xsl:template match="//*[@id=&quot;plone-contentmenu-factories&quot;]/dd/ul/li/a/img" mode="initial-stage"><!--Do nothing, skip these nodes--></xsl:template>
-    <xsl:template match="node()|@*" mode="initial-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="initial-stage"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="/" mode="apply-theme">
-        <html xml:lang="en" lang="en"><head><meta http-equiv="Content-type" content="text/html; charset=utf-8"/><xsl:choose><xsl:when test="/html/head/title"><xsl:copy-of select="/html/head/title"/></xsl:when><xsl:otherwise><title>plone.org</title></xsl:otherwise></xsl:choose><xsl:choose><xsl:when test="/html/head/base"><xsl:copy-of select="/html/head/base"/></xsl:when><xsl:otherwise><base href="http://plone.org/"/></xsl:otherwise></xsl:choose><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/plonenews" title="Plone News"/><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/plonereleases" title="Plone Releases"/><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/ploneevents" title="Upcoming Plone Events"/><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/ploneaddons" title="Latest Plone &amp; Add-on Releases"/><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/plonetraining" title="Upcoming Plone Training"/><link rel="alternate" type="application/rss+xml" href="http://feeds.plone.org/ploneblogs" title="Plone Blogs"/><link rel="stylesheet" href="/plone.css" type="text/css" media="screen"/><xsl:comment>[if IE]&gt;&lt;style type="text/css" media="all"&gt;@import url(/ie.css);&lt;/style&gt;&lt;![endif]</xsl:comment><xsl:comment>[if lte IE 6]&gt;&lt;script src="/ie6warn.js" type="text/javascript"&gt;&lt;/script&gt;&lt;![endif]</xsl:comment><xsl:copy-of select="/html/head/script"/><xsl:copy-of select="/html/head/style"/></head><body><xsl:copy-of select="/html/body/@class"/><xsl:copy-of select="/html/body/@id"/>
-
-<div id="outer-wrapper"><div id="inner-wrapper">
-
-<div id="nav">
-
-	<form id="search" name="searchform" action="http://plone.org/search"> 
-		<input id="search-site" name="SearchableText" type="search" title="Search this site&#x2026;" accesskey="4" class="inputLabel" size="15"/></form>
-	
-	<div id="user">
-		<xsl:choose><xsl:when test="//*[@id=&quot;user-name&quot;]"><xsl:copy-of select="//*[@id=&quot;user-name&quot;]"/></xsl:when><xsl:otherwise><a href="login">Log in</a></xsl:otherwise></xsl:choose>
-	</div>
-	
-	<ul id="main-nav" class="navigation"><xsl:choose><xsl:when test="//*[@id=&quot;portal-globalnav&quot;]/li"><xsl:copy-of select="//*[@id=&quot;portal-globalnav&quot;]/li"/></xsl:when><xsl:otherwise><li><a href=".">Home</a></li><li><a href="/products">Downloads</a></li><li><a href="/documentation">Documentation</a></li><li><a href="/contribute">Get Involved</a></li><li><a href="/foundation">Plone?Foundation</a></li><li><a href="/support">Support</a></li>
-	</xsl:otherwise></xsl:choose></ul></div>
-
-
-
-<div id="edit-bar">
-	<div id="action-menu"><xsl:choose><xsl:when test="//*[@id=&quot;contentActionMenus&quot;]"><xsl:copy-of select="//*[@id=&quot;contentActionMenus&quot;]"/></xsl:when><xsl:otherwise/></xsl:choose></div>
-	<div id="edit-menu"><xsl:choose><xsl:when test="//*[@id=&quot;content-views&quot;]"><xsl:copy-of select="//*[@id=&quot;content-views&quot;]"/></xsl:when><xsl:otherwise/></xsl:choose></div>
-</div>
-
-
-
-<div id="content-wrapper">
-	<div class="grid-row">
-		<div class="grid-cell position-leftmost width-two-thirds">
-			<xsl:choose><xsl:when test="//*[@id=&quot;region-content&quot;]"><xsl:copy-of select="//*[@id=&quot;region-content&quot;]"/></xsl:when><xsl:otherwise><div id="region-content">
-
-				<xsl:comment> Content goes here </xsl:comment>
-
-			</div></xsl:otherwise></xsl:choose>
-		</div> <xsl:comment> End cell </xsl:comment>
-
-		<div class="grid-cell position-two-thirds width-third">
-			<div id="sidebar">
-			<xsl:copy-of select="//*[@id=&quot;portal-column-one&quot;]/div"/><xsl:copy-of select="//*[@id=&quot;portal-column-two&quot;]/div"/></div>
-		</div>
-		
-	</div> <xsl:comment> End row </xsl:comment>
-</div>
-
-<div style="clear:both">?</div>
-
-</div><xsl:comment> end inner-wrapper </xsl:comment>
-<div id="push"/>
-</div> <xsl:comment> end outer-wrapper </xsl:comment>
-
-<div id="footer-wrapper">
-	<div id="footer-gradient"/>
-	<div id="footer">
-		<a id="footer-logo" href="http://plone.org" title="Plone CMS, the open source content management system"/>
-		<p>The Plone<sup>?</sup> Content Management System is copyright ? 2000?2009 the Plone Foundation and friends.</p>
-		<p>Plone<sup>?</sup> and the Plone logo are registered trademarks of the Plone Foundation. You?re looking good today.</p>
-	    <p>Hosting by <a href="http://www.sixfeetup.com">Six Feet Up</a>.</p> 
-		<div id="sitemap">
-			<xsl:comment> &lt;dl&gt;
-				&lt;dt&gt;&lt;a href=""&gt;Plone for?&lt;/a&gt;&lt;/dt&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Small/Medium Business &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Enterprise            &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Non-profits           &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Government            &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Education             &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Science               &lt;/a&gt;&lt;/dd&gt;
-				&lt;dd&gt;&lt;a href=""&gt;Media &amp;amp; Publishing&lt;/a&gt;&lt;/dd&gt;
-			&lt;/dl&gt; </xsl:comment>
-
-			<dl><dt><a href="/products">Downloads</a></dt>
-				<dd><a href="/download">Get Plone</a></dd>
-				<dd><a href="/products?getCategories=themes">Themes</a></dd>
-				<dd><a href="/products?getCategories=dev">Development tools</a></dd>
-				<dd><a href="/products?getCategories=auth">Authentication</a></dd>
-				<dd><a href="/products">?and more.</a></dd>
-			</dl><dl><dt><a href="/documentation">Documentation</a></dt>
-				<dd><a href="/documentation/faq/">FAQs</a></dd>
-				<dd><a href="/documentation/movies/">Tutorial videos</a></dd>
-				<dd><a href="/documentation/manual">Manuals</a></dd>
-				<dd><a href="/documentation/books">Books</a></dd>
-				<xsl:comment> &lt;dd&gt;&lt;a href=""&gt;Knowledge Base&lt;/a&gt;&lt;/dd&gt; </xsl:comment>
-				<dd><a href="/documentation/error">Error Reference</a></dd>
-				<xsl:comment> &lt;dd&gt;&lt;a href=""&gt;Module documentation&lt;/a&gt;&lt;/dd&gt; </xsl:comment>
-				<dd><a href="http://plone.net/sites">Sites using Plone</a></dd>
-			</dl><dl><dt><a href="http://dev.plone.org/plone">Developers</a></dt>
-				<dd><a href="http://dev.plone.org/plone/roadmap">Roadmap</a></dd>
-				<dd><a href="http://dev.plone.org/plone">Report bugs in Plone</a></dd>
-				<dd><a href="http://dev.plone.org/plone.org">Report website issues</a></dd>
-				<dd><a href="http://dev.plone.org/plone/timeline">Latest changes</a></dd>
-				<dd><a href="http://dev.plone.org/plone/browser">Browse source</a></dd>
-				<dd><a href="http://dev.plone.org/plone">Contribute to Plone</a></dd>
-				<dd><a href="http://planet.plone.org">Community blogs</a></dd>
-			</dl><dl><dt><a href="/foundation">Plone Foundation</a></dt>
-				<dd><a href="/foundation/foundation-donations">Donate</a></dd>
-				<dd><a href="/foundation/donors">Sponsors</a></dd>
-				<dd><a href="/foundation/meetings/minutes">Meeting minutes</a></dd>
-				<dd><a href="/team/FoundationBoard">Current board</a></dd>
-				<dd><a href="/foundation/members">Foundation members</a></dd>
-				<dd><a href="/foundation/membership">Apply for membership</a></dd>
-				<dd><a href="/foundation#contact">Contact</a></dd>
-			</dl><dl><dt><a href="/support">Support</a></dt>
-				<dd><a href="http://plone.net/providers">Commercial services</a></dd>
-				<dd><a href="/support/chat">Chat room</a></dd>
-				<dd><a href="/support/forums">Forums</a></dd>
-				<dd><a href="/support/for">Sector-specific forums</a></dd>
-				<dd><a href="/support/region">Region-specific forums</a></dd>
-				<dd><a href="/support/local-user-groups">Local user groups</a></dd>
-				<dd><a href="/events/training">Training</a></dd>
-			</dl></div>
-
-	</div>
-</div>
-
-
-<script type="text/javascript"><xsl:variable name="tag_text"> 
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</xsl:variable><xsl:value-of select="$tag_text" disable-output-escaping="yes"/></script><script type="text/javascript"><xsl:variable name="tag_text"> 
-var pageTracker = _gat._getTracker("UA-1907133-2");
-pageTracker._trackPageview();
-</xsl:variable><xsl:value-of select="$tag_text" disable-output-escaping="yes"/></script></body></html>
-    </xsl:template>
-    <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:apply-templates select="@*" mode="final-stage"/>
-            <xsl:value-of select="text()" disable-output-escaping="yes"/>
-        </xsl:element>
-    </xsl:template>
-    <xsl:template match="*" priority="3" mode="final-stage">
-        <!-- Move elements without a namespace into 
-        the xhtml namespace. -->
-        <xsl:choose>
-            <xsl:when test="namespace-uri(.)">
-                <xsl:copy>
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
-                    <xsl:apply-templates select="@*|node()" mode="final-stage"/>
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template match="node()|@*" priority="1" mode="final-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="final-stage"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- 
-    
-        Extra templates
-    -->
-    
-    <!-- extra xsl:templates go here -->
-    <xsl:strip-space elements="*"/>
-
-</xsl:stylesheet>
\ No newline at end of file

Modified: z3/xdv/trunk/examples/rules.xml
==============================================================================
--- z3/xdv/trunk/examples/rules.xml	(original)
+++ z3/xdv/trunk/examples/rules.xml	Thu Feb 11 23:14:18 2010
@@ -3,9 +3,7 @@
     <drop css:content="#byline"/>
     <replace theme="/html/head/title" content="/html/head/title"/>
     <copy css:theme="#pageheading" content="/html/head/title/text()"/>
-    <copy theme="/html/body/h1" content="/html/head/title/text()"/>
-    <copy css:theme="#pagecontent" content="/html/body/div[@id='content']/*"/>
-    <append css:theme="#nav" css:content="pre" href="/"/>
-    <!-- assume this is an index view -->
-    <append css:theme="#nav" css:content="pre" if-content="not(/html/body/div[@id='content'])"/>
+    <copy css:theme="#pagecontent" css:content="body > pre" if-content=""/>
+    <copy css:theme="#pagecontent" css:content="#content > *"/>
+    <append css:theme="#left-column" css:content="#portlet" href="/extra.html"/>
 </rules>

Modified: z3/xdv/trunk/examples/theme.html
==============================================================================
--- z3/xdv/trunk/examples/theme.html	(original)
+++ z3/xdv/trunk/examples/theme.html	Thu Feb 11 23:14:18 2010
@@ -3,11 +3,11 @@
         <title>Theme Page Title</title>
     </head>
     <body>
-        <h1 class="somethemeclass">Theme Page Heading</h1>
+        <h1 class="somethemeclass">My themed site</h1>
         <table border="0" height="300" cellpadding="20">
             <tr>
-                <td width="200" bgcolor="gray" valign="top" id="nav">
-                    <h2 align="center">Navigation</h2>
+                <td width="200" bgcolor="gray" valign="top" id="left-column">
+                    <h2 align="center">Portlets</h2>
                 </td>
                 <td valign="top">
                     <h1 id="pageheading">Theme Page Heading</h1>

Deleted: /z3/xdv/trunk/examples/varnish.vcl
==============================================================================
--- /z3/xdv/trunk/examples/varnish.vcl	Thu Feb 11 23:14:18 2010
+++ (empty file)
@@ -1,14 +0,0 @@
-backend default {
-    .host = "127.0.0.1";
-    .port = "8000";
-}
-
-sub vcl_recv {
-    set req.backend = default;
-}
-
-sub vcl_fetch {
-    if (obj.http.Content-Type == "text/html; charset=utf-8") {
-        esi;
-    }
-}

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Thu Feb 11 23:14:18 2010
@@ -2,13 +2,14 @@
 extends = lxml.cfg
 parts +=
     nginx
-    nginx-conf
-    compile-theme
+    nginx.conf
+    example-theme
+    ploneorg-theme
+    rebuild-themes
 
 [nginx]
 recipe = zc.recipe.cmmi
-url = http://html-xslt.googlecode.com/files/nginx-0.7.64-html-xslt2.tar.gz
-md5sum = 76a25c47d0aa01399102c477542a70b5
+url = http://html-xslt.googlecode.com/files/nginx-0.7.64-html-xslt3.tar.gz
 extra_options =
     --conf-path=${buildout:directory}/etc/nginx.conf
     --sbin-path=${buildout:directory}/bin
@@ -22,20 +23,42 @@
     --with-libxslt=${buildout:directory}/parts/lxml/libxslt
 #    --with-debug --with-cc-opt="-O0" # helps debugging with gdb
 
-[nginx-conf]
+[nginx.conf]
 recipe = collective.recipe.template
 port = 8000
 root = ${buildout:directory}/examples
 filter-xsl = ${buildout:directory}/lib/xdv/filter.xsl
-theme-xsl = ${buildout:directory}/etc/theme.xsl
-input = ${buildout:directory}/examples/nginx/nginx.conf.in
+example.xsl = ${buildout:directory}/etc/example.xsl
+ploneorg.xsl = ${buildout:directory}/etc/ploneorg.xsl
+input = ${buildout:directory}/templates/nginx.conf.in
 output = ${buildout:directory}/etc/nginx.conf
 
-[compile-theme]
+[example-theme]
 recipe = plone.recipe.command
+includemode = ssi
 command = 
     ${buildout:directory}/bin/xdvcompiler \
-        --includemode=ssi  --output=${nginx-conf:theme-xsl} \
-        ${nginx-conf:root}/rules.xml ${nginx-conf:root}/theme.html
+        --includemode=${:includemode}  --output=${nginx.conf:example.xsl} \
+        ${nginx.conf:root}/rules.xml ${nginx.conf:root}/theme.html
+update-command = ${:command}
 
-update-command = ${compile-theme:command}
\ No newline at end of file
+[ploneorg-theme]
+recipe = plone.recipe.command
+includemode = ssi
+command = 
+    ${buildout:directory}/bin/xdvcompiler \
+        --includemode=${:includemode}  --output=${nginx.conf:ploneorg.xsl} \
+        --extra=${nginx.conf:root}/ploneorg/default-extra.xsl \
+        ${nginx.conf:root}/ploneorg/default.xml ${nginx.conf:root}/ploneorg/plone.html
+update-command = ${:command}
+
+[rebuild-themes]
+recipe = collective.recipe.template
+input = ${buildout:directory}/templates/command.sh.in
+output = ${buildout:directory}/bin/rebuild-themes
+command =
+    export LD_LIBRARY_PATH=${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
+    export DYLD_LIBRARY_PATH=${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
+    ${example-theme:command} && echo example theme rebuilt
+    ${ploneorg-theme:command} && ploneorg theme rebuilt
+    ${buildout:directory}/bin/nginx -s reload && echo nginx reloaded.

Added: z3/xdv/trunk/templates/command.sh.in
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/templates/command.sh.in	Thu Feb 11 23:14:18 2010
@@ -0,0 +1,2 @@
+#!/bin/sh
+${command}

Copied: z3/xdv/trunk/templates/nginx.conf.in (from r71152, z3/xdv/trunk/examples/nginx/nginx.conf.in)
==============================================================================
--- z3/xdv/trunk/examples/nginx/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Thu Feb 11 23:14:18 2010
@@ -9,9 +9,9 @@
     include ${buildout:directory}/etc/mime.types;
 #    gzip on;
     server {
-        listen ${nginx-conf:port};
+        listen ${port};
         server_name localhost;
-        root ${nginx-conf:root};
+        root ${root};
         autoindex on;
 
         # Decide if we need to filter
@@ -30,9 +30,12 @@
             internal;
             error_page 404 = @include404;
             
+            # Cache in Varnish for 1h
+            expires 1h;
+            
             # Proxy
             rewrite    ^/_include(.*)$    $1    break;
-            proxy_pass http://127.0.0.1:${nginx-conf:port};
+            proxy_pass http://127.0.0.1:${port};
             
             # Our safety belt.
             proxy_set_header X-Loop 1$http_X_Loop; # unary count
@@ -42,7 +45,7 @@
             }
             
             # Filter by xpath
-            xslt_stylesheet ${nginx-conf:filter-xsl}
+            xslt_stylesheet ${filter-xsl}
                 xpath=$filter_xpath
                 ;
             xslt_html_parser on;
@@ -51,8 +54,8 @@
         
         # Our styled location.
         location /styled {
-            alias ${nginx-conf:root};
-            xslt_stylesheet ${nginx-conf:theme-xsl};
+            alias ${root};
+            xslt_stylesheet ${example.xsl};
             xslt_html_parser on;
             xslt_types text/html;
             # Switch on ssi here to enable external includes.
@@ -61,8 +64,8 @@
 
         # Another styled location.
         location /styled/ploneorg {
-            alias ${nginx-conf:root}/ploneorg;
-            xslt_stylesheet ${nginx-conf:root}/ploneorg/plone.xsl;
+            alias ${root}/ploneorg;
+            xslt_stylesheet ${ploneorg.xsl};
             xslt_html_parser on;
             xslt_types text/html;
         }

Copied: z3/xdv/trunk/templates/varnish.vcl.in (from r71200, z3/xdv/trunk/examples/varnish.vcl)
==============================================================================
--- z3/xdv/trunk/examples/varnish.vcl	(original)
+++ z3/xdv/trunk/templates/varnish.vcl.in	Thu Feb 11 23:14:18 2010
@@ -1,6 +1,6 @@
 backend default {
     .host = "127.0.0.1";
-    .port = "8000";
+    .port = "${nginx.conf:port}";
 }
 
 sub vcl_recv {

Modified: z3/xdv/trunk/varnish.cfg
==============================================================================
--- z3/xdv/trunk/varnish.cfg	(original)
+++ z3/xdv/trunk/varnish.cfg	Thu Feb 11 23:14:18 2010
@@ -3,6 +3,10 @@
 parts +=
     varnish-build
     varnish
+    varnish.vcl
+
+[example-theme]
+includemode = esi
 
 [varnish-build]
 recipe= zc.recipe.cmmi
@@ -12,4 +16,10 @@
 recipe = plone.recipe.varnish
 daemon = ${buildout:parts-directory}/varnish-build/sbin/varnishd
 bind = 127.0.0.1:8001
-config = ${buildout:directory}/examples/varnish.vcl
+config = ${buildout:directory}/etc/varnish.vcl
+cache-size = 10M
+
+[varnish.vcl]
+recipe = collective.recipe.template
+input = ${buildout:directory}/templates/varnish.vcl.in
+output = ${buildout:directory}/etc/varnish.vcl
\ No newline at end of file

From ldr at codespeak.net  Fri Feb 12 15:18:51 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri, 12 Feb 2010 15:18:51 +0100 (CET)
Subject: [z3-checkins] r71206 - z3/xdv/trunk/lib/xdv
Message-ID: <20100212141851.29DF8282BED@codespeak.net>

Author: ldr
Date: Fri Feb 12 15:18:49 2010
New Revision: 71206

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
simplify esi namespace check

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Fri Feb 12 15:18:49 2010
@@ -116,16 +116,16 @@
         <xsl:param name="stage1"/>
         <xsl:param name="rules"/>
         <xsl:choose>
-            <xsl:when test="not($rules//*[@method='esi'] or ($includemode='esi' and $rules//*[not(@method)]))">
-                <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
+            <xsl:when test="$includemode='esi' or $rules//*[@method='esi']">
                 <xsl:copy>
                     <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
                         <xsl:with-param name="stage1" select="$stage1"/>
                         <xsl:with-param name="rules" select="$rules"/>
                     </xsl:apply-templates>
                 </xsl:copy>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>

From ldr at codespeak.net  Fri Feb 12 18:36:02 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri, 12 Feb 2010 18:36:02 +0100 (CET)
Subject: [z3-checkins] r71211 - z3/xdv/trunk/lib/xdv
Message-ID: <20100212173602.4D38E282BD5@codespeak.net>

Author: ldr
Date: Fri Feb 12 18:36:00 2010
New Revision: 71211

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
It seems prudent to quote the url for SSI includemode too.

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Fri Feb 12 18:36:00 2010
@@ -594,8 +594,8 @@
                     * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
-                    /><xsl:value-of select="$href"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
-                    ><xsl:value-of select="$ssisuffix"/><xsl:value-of select="$content"/>" wait="yes" </xsl:element>
+                    /><xsl:value-of select="str:encode-uri($href, false())"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
+                    ><xsl:value-of select="str:encode-uri($ssisuffix, false())"/><xsl:value-of select="str:encode-uri($content, false())"/>" wait="yes" </xsl:element>
             </xsl:when>
             <xsl:when test="$method = 'esi'">
                 <!-- Assumptions:

From ldr at codespeak.net  Fri Feb 12 18:37:11 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri, 12 Feb 2010 18:37:11 +0100 (CET)
Subject: [z3-checkins] r71212 - z3/xdv/trunk/lib/xdv
Message-ID: <20100212173711.F30D0282BD5@codespeak.net>

Author: ldr
Date: Fri Feb 12 18:37:10 2010
New Revision: 71212

Modified:
   z3/xdv/trunk/lib/xdv/filter.xsl
Log:
Try to enfore html-safe output from filter.xsl

Modified: z3/xdv/trunk/lib/xdv/filter.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/filter.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/filter.xsl	Fri Feb 12 18:37:10 2010
@@ -4,10 +4,26 @@
     <!-- Filter document by xpath -->
     <xsl:param name="xpath">/</xsl:param>
     <xsl:template match="/">
-        <xsl:copy-of select="$xpath"/>
+        <xsl:apply-templates select="$xpath"/>
         <xsl:if test="not($xpath)">
             <!-- Make sure we at least return something to avoid errors -->
             <xsl:comment>WARNING: No content found</xsl:comment>
         </xsl:if>
     </xsl:template>
+    <xsl:template match="*[not(node())]">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <!--
+                Make this valid html.
+                We are unable to trigger xhtml output mode as we cannot set the doctype.
+                This does the trick but oddly does not render an actual comment.
+            -->
+            <xsl:comment> </xsl:comment>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
 </xsl:stylesheet>

From ldr at codespeak.net  Wed Feb 17 18:56:21 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 17 Feb 2010 18:56:21 +0100 (CET)
Subject: [z3-checkins] r71273 - in z3/xdv/trunk: lib/xdv lib/xdv/tests/esi
	lib/xdv/tests/ssi templates
Message-ID: <20100217175621.5E8CA282BD4@codespeak.net>

Author: ldr
Date: Wed Feb 17 18:56:19 2010
New Revision: 71273

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/templates/nginx.conf.in
Log:
nginx has some problems with complex query string rewriting in subrequests, so avoid them by changing the path instead.

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Feb 17 18:56:19 2010
@@ -18,9 +18,9 @@
     <xsl:param name="trace"/>
     <xsl:param name="includemode">document</xsl:param>
     <xsl:param name="ssiprefix"></xsl:param>
-    <xsl:param name="ssisuffix">;filter_xpath=</xsl:param>
+    <xsl:param name="ssisuffix">++filter_xpath++</xsl:param>
     <xsl:param name="esiprefix"></xsl:param>
-    <xsl:param name="esisuffix">;filter_xpath=</xsl:param>
+    <xsl:param name="esisuffix">++filter_xpath++</xsl:param>
     <xsl:variable name="theme" select="/"/>
 
     <!--
@@ -593,17 +593,19 @@
                 <!-- Assumptions:
                     * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
-                <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"
-                    /><xsl:value-of select="str:encode-uri($href, false())"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
-                    ><xsl:value-of select="str:encode-uri($ssisuffix, false())"/><xsl:value-of select="str:encode-uri($content, false())"/>" wait="yes" </xsl:element>
+                <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
+                    <xsl:when test="contains($href, '?')"><xsl:value-of select="str:encode-uri(str:replace($href, '?', concat($ssisuffix, $content, '?')), false())"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="str:encode-uri(concat($href, $ssisuffix, $content), false())"/></xsl:otherwise>
+                    </xsl:choose>" wait="yes" </xsl:element>
             </xsl:when>
             <xsl:when test="$method = 'esi'">
                 <!-- Assumptions:
                     * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
-                <esi:include><xsl:attribute name="src"><xsl:value-of select="str:encode-uri($esiprefix, false())"
-                    /><xsl:value-of select="str:encode-uri($href, false())"/><xsl:if test="not(contains($href, '?'))">?</xsl:if
-                    ><xsl:value-of select="str:encode-uri($esisuffix, false())"/><xsl:value-of select="str:encode-uri($content, false())"/></xsl:attribute></esi:include>
+                <esi:include><xsl:attribute name="src"><xsl:choose>
+                    <xsl:when test="contains($href, '?')"><xsl:value-of select="str:encode-uri(str:replace($href, '?', concat($ssisuffix, $content, '?')), false())"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="str:encode-uri(concat($href, $ssisuffix, $content), false())"/></xsl:otherwise>
+                    </xsl:choose></xsl:attribute></esi:include>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">

Modified: z3/xdv/trunk/lib/xdv/tests/esi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/output.html	Wed Feb 17 18:56:19 2010
@@ -2,6 +2,6 @@
 <html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-    <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>
+    <esi:include src="extra.html++filter_xpath++//*[@id%20=%20'something']"></esi:include>
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/output.html	Wed Feb 17 18:56:19 2010
@@ -2,6 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html?;filter_xpath=//*[@id = 'something']" wait="yes" -->
+<!--# include  virtual="extra.html++filter_xpath++//*[@id%20=%20'something']" wait="yes" -->
   </body>
 </html>

Modified: z3/xdv/trunk/templates/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/templates/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Wed Feb 17 18:56:19 2010
@@ -13,30 +13,27 @@
         server_name localhost;
         root ${root};
         autoindex on;
-
-        # Decide if we need to filter
-        if ($args ~ "^(.*);filter_xpath=(.*)$") {
-            set $newargs $1;
-            set $filter_xpath $2;
-            # rewrite args to avoid looping
-            rewrite    ^(.*)$    /_include$1?$newargs?;
-        }
         
         location @include500 { return 500; }
         location @include404 { return 404; }
         
-        location ^~ /_include {
-            # Restrict to subrequests
-            internal;
+        location ~ "^(.*)\+\+filter_xpath\+\+(.*)$" {
+            set $path $1; 
+            set $filter_xpath $2;
+            
             error_page 404 = @include404;
             
             # Cache in Varnish for 1h
             expires 1h;
             
-            # Proxy
-            rewrite    ^/_include(.*)$    $1    break;
+            # Proxy back to ourself
+            rewrite    ^    $path    break;
             proxy_pass http://127.0.0.1:${port};
             
+            # normalizing to an anonymous user
+            proxy_set_header        Cookie           "";
+            proxy_set_header        Authorization    "";
+            
             # Our safety belt.
             proxy_set_header X-Loop 1$http_X_Loop; # unary count
             error_page 500 = @include500;

From ejucovy at codespeak.net  Wed Feb 17 20:52:20 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 17 Feb 2010 20:52:20 +0100 (CET)
Subject: [z3-checkins] r71278 - z3/deliverance/trunk/deliverance/tests
Message-ID: <20100217195220.CFA94282BD4@codespeak.net>

Author: ejucovy
Date: Wed Feb 17 20:52:19 2010
New Revision: 71278

Modified:
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
fix typo in broken test

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	Wed Feb 17 20:52:19 2010
@@ -432,7 +432,7 @@
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     <html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
     <meta http-equiv="refresh" content="5" />
     </head><body> 
     <img src="foo.png" /> 
@@ -442,7 +442,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml"><head><title>This is a theme title</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css">
         @import "http://localhost/style2.css";
       </style>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
       <meta http-equiv="refresh" content="5" />
       </head><body>
     <BLANKLINE>

From ejucovy at codespeak.net  Wed Feb 17 21:42:06 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 17 Feb 2010 21:42:06 +0100 (CET)
Subject: [z3-checkins] r71279 - in z3/deliverance/trunk/deliverance: . tests
Message-ID: <20100217204206.7BC1B282BD4@codespeak.net>

Author: ejucovy
Date: Wed Feb 17 21:42:02 2010
New Revision: 71279

Modified:
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
fix #34 - meta content-type tags no longer removed

Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Wed Feb 17 21:42:02 2010
@@ -101,12 +101,12 @@
 
         ## FIXME: this seems like a terrible way to preserve the content's DOCTYPE
         if resp.body.strip().startswith("<!DOCTYPE"):
-            theme_str = tostring(theme_doc)
+            theme_str = tostring(theme_doc, method=method, include_meta_content_type=True)
             theme_str = content_tree.docinfo.doctype + theme_str
             theme_doc = document_fromstring(theme_str)
         tree = theme_doc.getroottree()
 
-        resp.body = tostring(tree, method=method)
+        resp.body = tostring(tree, method=method, include_meta_content_type=True)
         return resp
 
     def check_clientside(self, req, log):
@@ -147,7 +147,7 @@
     def parse_document(self, s, url):
         """
         Parses the given document as an HTML document.
-        """
+        """    
         return document_fromstring(s, base_url=url)
 
     def log_description(self, log=None):

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	Wed Feb 17 21:42:02 2010
@@ -58,6 +58,7 @@
     ...   <rule class="default">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
     ...     <replace content="children:body" theme="children:#content" nocontent="abort" />
+    ...     <prepend content="elements:/html/head/meta" theme="children:/html/head" nocontent="ignore" />  
     ...   </rule>
     ...   <rule class="breakout">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
@@ -281,6 +282,7 @@
     ...   <rule class="default">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
     ...     <replace content="children:body" theme="children:#content" nocontent="abort" />
+    ...     <prepend content="elements:/html/head/meta" theme="children:/html/head" nocontent="ignore" />  
     ...   </rule>
     ...   <rule class="breakout">
     ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
@@ -439,12 +441,9 @@
     A simple page</body></html>
     Themed content:
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml"><head><title>This is a theme title</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css">
+    <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><meta http-equiv="refresh" content="5" /><title>This is a theme title</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css">
         @import "http://localhost/style2.css";
-      </style>
-      <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-      <meta http-equiv="refresh" content="5" />
-      </head><body>
+      </style></head><body>
     <BLANKLINE>
       <div id="header" class="title-bar">
         <h1 id="title">This is the theme title</h1>
@@ -467,17 +466,6 @@
 It worked. There's a new id="top" attribute on the <a name="top"> tag;
 it's required for XHTML: http://www.w3.org/TR/xhtml1/#h-4.10
 
-In the above example note also that meta Content-Type tags are dropped
-even though we have a rule to preserve them -- I think that's related
-to the following lxml.html behavior:
-
-   >>> from lxml.html import tostring, fromstring
-   >>> x="""<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta></head></html>"""
-   >>> tostring(fromstring(x))
-   '<html><head></head></html>'
-   >>> tostring(fromstring(x), include_meta_content_type=True)
-   '<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></head></html>'
-
 Test that rule matches work:
 
    >>> print compare_request('/foo', deliv_filename) # doctest: +REPORT_UDIFF

From ldr at codespeak.net  Thu Feb 18 17:05:01 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 18 Feb 2010 17:05:01 +0100 (CET)
Subject: [z3-checkins] r71299 - in z3/xdv/trunk: lib/xdv lib/xdv/tests/esi
	lib/xdv/tests/ssi templates
Message-ID: <20100218160501.7E8C3282BE6@codespeak.net>

Author: ldr
Date: Thu Feb 18 17:04:59 2010
New Revision: 71299

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/templates/nginx.conf.in
Log:
Revert the previous include changes and tidy up a bit

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Thu Feb 18 17:04:59 2010
@@ -18,9 +18,11 @@
     <xsl:param name="trace"/>
     <xsl:param name="includemode">document</xsl:param>
     <xsl:param name="ssiprefix"></xsl:param>
-    <xsl:param name="ssisuffix">++filter_xpath++</xsl:param>
+    <xsl:param name="ssisuffix"></xsl:param>
+    <xsl:param name="ssiquerysuffix">;filter_xpath=</xsl:param>
     <xsl:param name="esiprefix"></xsl:param>
-    <xsl:param name="esisuffix">++filter_xpath++</xsl:param>
+    <xsl:param name="esisuffix"></xsl:param>
+    <xsl:param name="esiquerysuffix">;filter_xpath=</xsl:param>
     <xsl:variable name="theme" select="/"/>
 
     <!--
@@ -562,6 +564,7 @@
         <xsl:param name="rule"/>
         <xsl:variable name="href" select="$rule/@href"/>
         <xsl:variable name="content" select="$rule/@content"/>
+        <xsl:variable name="content_quoted" select="str:encode-uri($content, false())"/>
         <xsl:variable name="method" select="$rule/@method"/>
         <xsl:choose>
             <xsl:when test="$rule/dv:synthetic">
@@ -594,8 +597,8 @@
                     * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="str:encode-uri(str:replace($href, '?', concat($ssisuffix, $content, '?')), false())"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="str:encode-uri(concat($href, $ssisuffix, $content), false())"/></xsl:otherwise>
+                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($ssisuffix, '?')), $ssiquerysuffix, $content_quoted)"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="concat($href, $ssisuffix, '?', $ssiquerysuffix, $content_quoted)"/></xsl:otherwise>
                     </xsl:choose>" wait="yes" </xsl:element>
             </xsl:when>
             <xsl:when test="$method = 'esi'">
@@ -603,8 +606,8 @@
                     * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 <esi:include><xsl:attribute name="src"><xsl:choose>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="str:encode-uri(str:replace($href, '?', concat($ssisuffix, $content, '?')), false())"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="str:encode-uri(concat($href, $ssisuffix, $content), false())"/></xsl:otherwise>
+                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($esisuffix, '?')), $esiquerysuffix, $content_quoted)"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="concat($href, $esisuffix, '?', $esiquerysuffix, $content_quoted)"/></xsl:otherwise>
                     </xsl:choose></xsl:attribute></esi:include>
             </xsl:when>
             <xsl:otherwise>

Modified: z3/xdv/trunk/lib/xdv/tests/esi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/output.html	Thu Feb 18 17:04:59 2010
@@ -2,6 +2,6 @@
 <html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-    <esi:include src="extra.html++filter_xpath++//*[@id%20=%20'something']"></esi:include>
+    <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/output.html	Thu Feb 18 17:04:59 2010
@@ -2,6 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html++filter_xpath++//*[@id%20=%20'something']" wait="yes" -->
+<!--# include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']" wait="yes" -->
   </body>
 </html>

Modified: z3/xdv/trunk/templates/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/templates/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Thu Feb 18 17:04:59 2010
@@ -13,27 +13,30 @@
         server_name localhost;
         root ${root};
         autoindex on;
+
+        # Decide if we need to filter
+        if ($args ~ "^(.*);filter_xpath=(.*)$") {
+            set $newargs $1;
+            set $filter_xpath $2;
+            # rewrite args to avoid looping
+            rewrite    ^(.*)$    /_include$1?$newargs?;
+        }
         
         location @include500 { return 500; }
         location @include404 { return 404; }
         
-        location ~ "^(.*)\+\+filter_xpath\+\+(.*)$" {
-            set $path $1; 
-            set $filter_xpath $2;
-            
+        location ^~ /_include {
+            # Restrict to subrequests
+            internal;
             error_page 404 = @include404;
             
             # Cache in Varnish for 1h
             expires 1h;
             
-            # Proxy back to ourself
-            rewrite    ^    $path    break;
+            # Proxy
+            rewrite    ^/_include(.*)$    $1    break;
             proxy_pass http://127.0.0.1:${port};
             
-            # normalizing to an anonymous user
-            proxy_set_header        Cookie           "";
-            proxy_set_header        Authorization    "";
-            
             # Our safety belt.
             proxy_set_header X-Loop 1$http_X_Loop; # unary count
             error_page 500 = @include500;

From ldr at codespeak.net  Tue Feb 23 18:07:48 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 23 Feb 2010 18:07:48 +0100 (CET)
Subject: [z3-checkins] r71436 - in z3/xdv/trunk: . examples templates
Message-ID: <20100223170748.E1A1B282BE3@codespeak.net>

Author: ldr
Date: Tue Feb 23 18:07:47 2010
New Revision: 71436

Added:
   z3/xdv/trunk/examples/extra.html
Removed:
   z3/xdv/trunk/templates/command.sh.in
Modified:
   z3/xdv/trunk/nginx.cfg
   z3/xdv/trunk/templates/nginx.conf.in
Log:
notes on inclusion, update to examples (it helps when the file you are including gets checked into the repository...)

Added: z3/xdv/trunk/examples/extra.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/examples/extra.html	Tue Feb 23 18:07:47 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+    <div id="portlet">
+        A portlet included from extra.html
+    </div>
+</body>
+</html>
\ No newline at end of file

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Tue Feb 23 18:07:47 2010
@@ -1,3 +1,9 @@
+# Nginx 0.7.64 contains a bug that sometimes causes the query string of an SSI
+# to be lost when the parent request has no query string. This makes external
+# content inclusion unpredictable (the entire page referenced by @href gets
+# included, not just that matching @content when this bug bites.) ESI in
+# Varnish is recommended for external content inclusion (see varnish.cfg.)
+
 [buildout]
 extends = lxml.cfg
 parts +=
@@ -27,7 +33,7 @@
 recipe = collective.recipe.template
 port = 8000
 root = ${buildout:directory}/examples
-filter-xsl = ${buildout:directory}/lib/xdv/filter.xsl
+filter.xsl = ${buildout:directory}/lib/xdv/filter.xsl
 example.xsl = ${buildout:directory}/etc/example.xsl
 ploneorg.xsl = ${buildout:directory}/etc/ploneorg.xsl
 input = ${buildout:directory}/templates/nginx.conf.in
@@ -54,11 +60,13 @@
 
 [rebuild-themes]
 recipe = collective.recipe.template
-input = ${buildout:directory}/templates/command.sh.in
-output = ${buildout:directory}/bin/rebuild-themes
-command =
-    export LD_LIBRARY_PATH=${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
-    export DYLD_LIBRARY_PATH=${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
+library-path = ${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
+input = inline:
+    #!/bin/sh
+    export LD_LIBRARY_PATH=${:library-path}
+    export DYLD_LIBRARY_PATH=${:library-path}
     ${example-theme:command} && echo example theme rebuilt
     ${ploneorg-theme:command} && ploneorg theme rebuilt
     ${buildout:directory}/bin/nginx -s reload && echo nginx reloaded.
+output = ${buildout:directory}/bin/rebuild-themes
+mode = 755
\ No newline at end of file

Deleted: /z3/xdv/trunk/templates/command.sh.in
==============================================================================
--- /z3/xdv/trunk/templates/command.sh.in	Tue Feb 23 18:07:47 2010
+++ (empty file)
@@ -1,2 +0,0 @@
-#!/bin/sh
-${command}

Modified: z3/xdv/trunk/templates/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/templates/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Tue Feb 23 18:07:47 2010
@@ -45,7 +45,7 @@
             }
             
             # Filter by xpath
-            xslt_stylesheet ${filter-xsl}
+            xslt_stylesheet ${filter.xsl}
                 xpath=$filter_xpath
                 ;
             xslt_html_parser on;

From ldr at codespeak.net  Thu Feb 25 19:07:29 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 25 Feb 2010 19:07:29 +0100 (CET)
Subject: [z3-checkins] r71505 - z3/xdv/trunk
Message-ID: <20100225180729.A9BDE282BE5@codespeak.net>

Author: ldr
Date: Thu Feb 25 19:07:28 2010
New Revision: 71505

Modified:
   z3/xdv/trunk/nginx.cfg
Log:
update to nginx 0.7.65

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Thu Feb 25 19:07:28 2010
@@ -1,8 +1,8 @@
-# Nginx 0.7.64 contains a bug that sometimes causes the query string of an SSI
-# to be lost when the parent request has no query string. This makes external
-# content inclusion unpredictable (the entire page referenced by @href gets
-# included, not just that matching @content when this bug bites.) ESI in
-# Varnish is recommended for external content inclusion (see varnish.cfg.)
+# Nginx 0.7.65 contains a bug that causes the query string of an SSI to be
+# lost when the parent request has no query string. This breaks external
+# content inclusion (the entire page referenced by @href gets included, not
+# just that matching @content when this bug bites.) ESI in Varnish is
+# recommended for external content inclusion (see varnish.cfg.)
 
 [buildout]
 extends = lxml.cfg
@@ -15,7 +15,8 @@
 
 [nginx]
 recipe = zc.recipe.cmmi
-url = http://html-xslt.googlecode.com/files/nginx-0.7.64-html-xslt3.tar.gz
+url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-1.tar.gz
+md5sum = 5b25ead44b0eb4c1a37ef8de70b57e7d
 extra_options =
     --conf-path=${buildout:directory}/etc/nginx.conf
     --sbin-path=${buildout:directory}/bin
@@ -61,12 +62,12 @@
 [rebuild-themes]
 recipe = collective.recipe.template
 library-path = ${buildout:directory}/parts/lxml/libxml2/lib:${buildout:directory}/parts/lxml/libxslt/lib
-input = inline:
+inline =
     #!/bin/sh
     export LD_LIBRARY_PATH=${:library-path}
     export DYLD_LIBRARY_PATH=${:library-path}
     ${example-theme:command} && echo example theme rebuilt
-    ${ploneorg-theme:command} && ploneorg theme rebuilt
+    ${ploneorg-theme:command} && echo ploneorg theme rebuilt
     ${buildout:directory}/bin/nginx -s reload && echo nginx reloaded.
 output = ${buildout:directory}/bin/rebuild-themes
-mode = 755
\ No newline at end of file
+mode = 755

From ldr at codespeak.net  Thu Feb 25 19:40:35 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 25 Feb 2010 19:40:35 +0100 (CET)
Subject: [z3-checkins] r71508 - z3/xdv/trunk
Message-ID: <20100225184035.8469A282BDA@codespeak.net>

Author: ldr
Date: Thu Feb 25 19:40:34 2010
New Revision: 71508

Modified:
   z3/xdv/trunk/nginx.cfg
Log:
nginx ssi problem is now fixed

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Thu Feb 25 19:40:34 2010
@@ -1,9 +1,3 @@
-# Nginx 0.7.65 contains a bug that causes the query string of an SSI to be
-# lost when the parent request has no query string. This breaks external
-# content inclusion (the entire page referenced by @href gets included, not
-# just that matching @content when this bug bites.) ESI in Varnish is
-# recommended for external content inclusion (see varnish.cfg.)
-
 [buildout]
 extends = lxml.cfg
 parts +=
@@ -15,8 +9,9 @@
 
 [nginx]
 recipe = zc.recipe.cmmi
-url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-1.tar.gz
-md5sum = 5b25ead44b0eb4c1a37ef8de70b57e7d
+url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-2.tar.gz
+# The SSI bug was fixed in nginx-0.7.65-html-xslt-2.tar.gz
+md5sum = f863bdfdbeb01c11677d856c78716b35
 extra_options =
     --conf-path=${buildout:directory}/etc/nginx.conf
     --sbin-path=${buildout:directory}/bin

From ejucovy at codespeak.net  Sat Feb 27 16:10:33 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 27 Feb 2010 16:10:33 +0100 (CET)
Subject: [z3-checkins] r71529 - in z3/deliverance/trunk/deliverance: . tests
Message-ID: <20100227151033.CC9B0282BD6@codespeak.net>

Author: ejucovy
Date: Sat Feb 27 16:10:31 2010
New Revision: 71529

Modified:
   z3/deliverance/trunk/deliverance/rules.py
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
escape CDATA sections in theme, content and external content (ie everywhere) before parsing them with lxml,
and then unescape CDATA sections after all rules have been applied, just before returning the resulting response.
fixes #36. modified version of patch from Jordan Baker.



Modified: z3/deliverance/trunk/deliverance/rules.py
==============================================================================
--- z3/deliverance/trunk/deliverance/rules.py	(original)
+++ z3/deliverance/trunk/deliverance/rules.py	Sat Feb 27 16:10:31 2010
@@ -14,6 +14,7 @@
 from deliverance.selector import Selector
 from deliverance.pagematch import AbstractMatch
 from deliverance.themeref import Theme
+from deliverance.util.cdata import escape_cdata, unescape_cdata
 
 CONTENT_ATTRIB = 'x-a-marker-attribute-for-deliverance'
 
@@ -485,7 +486,7 @@
                     href, content_resp.status)
                 return
             content_doc = document_fromstring(
-                content_resp.body, base_url=self.content_href)
+                escape_cdata(content_resp.body), base_url=self.content_href)
         if not self.if_content_matches(content_doc, log):
             return
         content_type, content_els, content_attributes = self.select_elements(

Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Sat Feb 27 16:10:31 2010
@@ -8,6 +8,7 @@
 from deliverance.pagematch import run_matches, Match, ClientsideMatch
 from deliverance.rules import Rule, remove_content_attribs
 from deliverance.themeref import Theme
+from deliverance.util.cdata import escape_cdata, unescape_cdata
 from urlparse import urljoin
 
 class RuleSet(object):
@@ -71,8 +72,8 @@
 
         try:
             theme_href = theme.resolve_href(req, resp, log)
-            theme_doc = self.get_theme(theme_href, resource_fetcher, log)
-            content_doc = self.parse_document(resp.body, req.url)
+            theme_doc = self.get_theme(theme_href, resource_fetcher, log, should_escape_cdata=True)
+            content_doc = self.parse_document(escape_cdata(resp.body), req.url)
 
             run_standard = True
             for rule in rules:
@@ -99,6 +100,7 @@
         else:
             method = "html"
 
+
         ## FIXME: this seems like a terrible way to preserve the content's DOCTYPE
         if resp.body.strip().startswith("<!DOCTYPE"):
             theme_str = tostring(theme_doc, method=method, include_meta_content_type=True)
@@ -107,6 +109,8 @@
         tree = theme_doc.getroottree()
 
         resp.body = tostring(tree, method=method, include_meta_content_type=True)
+        resp.body = unescape_cdata(resp.body)
+
         return resp
 
     def check_clientside(self, req, log):
@@ -116,7 +120,7 @@
                 return True
         return False
 
-    def get_theme(self, url, resource_fetcher, log):
+    def get_theme(self, url, resource_fetcher, log, should_escape_cdata=False):
         """
         Retrieves the theme at the given URL.  Also stores it in the
         log for later use by the log.
@@ -131,7 +135,10 @@
                 self, "The resource %s was not 200 OK: %s" % (url, resp.status))
             raise AbortTheme(
                 "The resource %s returned an error: %s" % (url, resp.status))
-        doc = self.parse_document(resp.body, url)
+        body = resp.body
+        if should_escape_cdata:
+            body = escape_cdata(body)
+        doc = self.parse_document(body, url)
         self.make_links_absolute(doc)
         return doc
 
@@ -287,3 +294,4 @@
           theme="children:/html/head" nocontent="ignore" />
   <!-- FIXME: Any handling for overlapping/identical elements? -->
 </rule>'''), 'deliverance.ruleset.standard_rule')
+

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 Feb 27 16:10:31 2010
@@ -496,3 +496,183 @@
      </div>
    <BLANKLINE>
     </body></html>
+
+CDATA sections in XHTML documents should be preserved! lxml has a tendency to escape the angle brackets
+that start and end a CDATA section in XHTML documents (but not HTML) -- so Deliverance will munge the 
+markers that start and end CDATA sections before passing the documents to lxml, and then unmunge them
+after getting a merged string back from lxml. Let's make sure they're properly preserved in both theme
+and content documents:
+
+   >>> app['/cdata'] = Response('''
+   ... <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   ... <html xmlns="http://www.w3.org/1999/xhtml">
+   ...     <head>
+   ...         <title></title>
+   ...     </head>
+   ...     <body><script type="text/javascript">
+   ...         <![CDATA[
+   ...                 ... unescaped script content ...
+   ...                 ]]>
+   ...                 </script>
+   ...                 <img src="http://foo.jpg"/>
+   ...     </body>
+   ... </html>
+   ... ''')
+
+   >>> app['/theme.html'] = Response('''\
+   ... <html>
+   ...  <head>
+   ...   <title>This is a theme title</title>
+   ...   <link rel=Stylesheet type="text/css" href="style.css">
+   ...   <style type="text/css"><![CDATA[
+   ...     @import "style2.css";
+   ...     ]]>
+   ...   </style>
+   ...  </head>
+   ...  <body>
+   ... 
+   ...   <div id="header" class="title-bar">
+   ...     <h1 id="title">This is the theme title</h1>
+   ...     <div class="topnav"></div>
+   ...   </div>
+   ...   <div id="content-wrapper">
+   ...     <a name="top"></a>
+   ...     <div id="content">
+   ...       This content will be replaced.
+   ...     </div>
+   ...     <a href="#top">Back to top</a>
+   ...   </div>
+   ... 
+   ...   <div id="footer">
+   ...     <span id="copyright">Copyright (C)</span> 2000 Some Corporation
+   ...   </div>
+   ... 
+   ...  </body>
+   ... </html>''')
+
+   >>> print compare_request('/cdata', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml">
+       <head>
+           <title></title>
+       </head>
+       <body><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script>
+                   <img src="http://foo.jpg"/>
+       </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title></title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top" id="top"></a>
+       <div id="content"><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script><img src="http://foo.jpg" /></div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       <span id="copyright">Copyright (C)</span> 2000 Some Corporation
+     </div>
+   <BLANKLINE>
+    </body></html>
+
+We should also see what happens to CDATA sections merged in from external
+content documents, when the `href` attribute  is used in a rule action:
+
+    >>> new_rule_xml = '''\
+    ... <ruleset>
+    ...   <match path="exact:/about.html" class="breakout" />
+    ...   <match request-header="X-No-Deliverate: boolean:true" abort="1" />
+    ...   <match response-header="X-No-Deliverate: boolean:true" abort="1" />
+    ...   <match environ="wsgi.url_scheme: https" class="via-https" />
+    ...   <theme href="/theme.html" />
+    ...   <rule path="/foo">
+    ...     <drop content="#badstuff" />
+    ...   </rule>
+    ...   <rule class="default">
+    ...     <replace href="/newfooter" content="children:#footer" theme="children:#footer" nocontent="ignore" />
+    ...     <replace content="children:body" theme="children:#content" nocontent="abort" />
+    ...     <prepend content="elements:/html/head/meta" theme="children:/html/head" nocontent="ignore" />  
+    ...   </rule>
+    ...   <rule class="breakout">
+    ...     <replace content="children:#footer" theme="children:#footer" nocontent="ignore" />
+    ...     <replace content="children:body" theme="children:#content-wrapper" nocontent="abort" />
+    ...   </rule>
+    ... </ruleset>'''
+    >>> f = open(rule_filename, 'w+')
+    >>> f.write(new_rule_xml)
+    >>> f.close()
+
+   >>> app['/newfooter'] = Response('''\
+   ... <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   ... <html>
+   ...  <body>
+   ...   <div id="footer">
+   ...     foo
+   ...     <![CDATA[
+   ...             some unescaped script content in the footer
+   ...             ]]>
+   ...   </div>
+   ...  </body>
+   ... </html>''')
+    
+   >>> print compare_request('/cdata', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml">
+       <head>
+           <title></title>
+       </head>
+       <body><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script>
+                   <img src="http://foo.jpg"/>
+       </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title></title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top" id="top"></a>
+       <div id="content"><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script><img src="http://foo.jpg" /></div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>

From ejucovy at codespeak.net  Sat Feb 27 16:11:48 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 27 Feb 2010 16:11:48 +0100 (CET)
Subject: [z3-checkins] r71530 - z3/deliverance/trunk/deliverance/util
Message-ID: <20100227151148.59F46282BD6@codespeak.net>

Author: ejucovy
Date: Sat Feb 27 16:11:46 2010
New Revision: 71530

Added:
   z3/deliverance/trunk/deliverance/util/cdata.py
Log:
add missing util/cdata.py file containing the regexes

Added: z3/deliverance/trunk/deliverance/util/cdata.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/util/cdata.py	Sat Feb 27 16:11:46 2010
@@ -0,0 +1,11 @@
+# see ticket #36
+
+import re
+
+def escape_cdata(s):
+    cdata_re = re.compile(r'<!\[CDATA\[(.*?)\]\]>', re.DOTALL)
+    return cdata_re.sub(r'__START_CDATA__\1__END_CDATA__', s)
+
+def unescape_cdata(s):
+    cdata_re = re.compile(r'__START_CDATA__(.*?)__END_CDATA__', re.DOTALL)
+    return cdata_re.sub(r'<![CDATA[\1]]>', s)

From ejucovy at codespeak.net  Sat Feb 27 16:19:38 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 27 Feb 2010 16:19:38 +0100 (CET)
Subject: [z3-checkins] r71532 - z3/deliverance/trunk/deliverance/tests
Message-ID: <20100227151938.2E3C0282BD6@codespeak.net>

Author: ejucovy
Date: Sat Feb 27 16:19:36 2010
New Revision: 71532

Modified:
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
note edge case where cdata section would be in output that didn't belong there (if original content has __START_CDATA__ marker)

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 Feb 27 16:19:36 2010
@@ -676,3 +676,64 @@
      </div>
    <BLANKLINE>
     </body></html>
+
+Note that there's a small chance of false positives, if a document happens to
+contain the markers that we use internally for the CDATA start and end:
+
+   >>> app['/newfooter'] = Response('''\
+   ... <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   ... <html>
+   ...  <body>
+   ...   <div id="footer">
+   ...     foo
+   ...     __START_CDATA__
+   ...             some unescaped script content in the footer
+   ...             __END_CDATA__
+   ...   </div>
+   ...  </body>
+   ... </html>''')
+    
+   >>> print compare_request('/cdata', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml">
+       <head>
+           <title></title>
+       </head>
+       <body><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script>
+                   <img src="http://foo.jpg"/>
+       </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /><title></title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css" /><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top" id="top"></a>
+       <div id="content"><script type="text/javascript">
+           <![CDATA[
+                   ... unescaped script content ...
+                   ]]>
+                   </script><img src="http://foo.jpg" /></div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>

From ejucovy at codespeak.net  Sat Feb 27 16:59:14 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 27 Feb 2010 16:59:14 +0100 (CET)
Subject: [z3-checkins] r71536 - in z3/deliverance/trunk/deliverance: . tests
	util
Message-ID: <20100227155914.1D644282BD6@codespeak.net>

Author: ejucovy
Date: Sat Feb 27 16:59:12 2010
New Revision: 71536

Added:
   z3/deliverance/trunk/deliverance/util/charset.py
Modified:
   z3/deliverance/trunk/deliverance/rules.py
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
fix #12: make sure charset declaration is first child of HEAD to prevent lxml from mangling non-ascii characters in the document, if any occur before the charset declaration in the original content

Modified: z3/deliverance/trunk/deliverance/rules.py
==============================================================================
--- z3/deliverance/trunk/deliverance/rules.py	(original)
+++ z3/deliverance/trunk/deliverance/rules.py	Sat Feb 27 16:59:12 2010
@@ -15,6 +15,7 @@
 from deliverance.pagematch import AbstractMatch
 from deliverance.themeref import Theme
 from deliverance.util.cdata import escape_cdata, unescape_cdata
+from deliverance.util.charset import fix_meta_charset_position
 
 CONTENT_ATTRIB = 'x-a-marker-attribute-for-deliverance'
 
@@ -485,8 +486,11 @@
                     self, 'Resource %s returned the status %s; skipping rule',
                     href, content_resp.status)
                 return
+            body = content_resp.body
+            body = escape_cdata(body)
+            body = fix_meta_charset_position(body)
             content_doc = document_fromstring(
-                escape_cdata(content_resp.body), base_url=self.content_href)
+                body, base_url=self.content_href)
         if not self.if_content_matches(content_doc, log):
             return
         content_type, content_els, content_attributes = self.select_elements(

Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Sat Feb 27 16:59:12 2010
@@ -9,6 +9,7 @@
 from deliverance.rules import Rule, remove_content_attribs
 from deliverance.themeref import Theme
 from deliverance.util.cdata import escape_cdata, unescape_cdata
+from deliverance.util.charset import fix_meta_charset_position
 from urlparse import urljoin
 
 class RuleSet(object):
@@ -73,7 +74,10 @@
         try:
             theme_href = theme.resolve_href(req, resp, log)
             theme_doc = self.get_theme(theme_href, resource_fetcher, log, should_escape_cdata=True)
-            content_doc = self.parse_document(escape_cdata(resp.body), req.url)
+            body = resp.body
+            body = escape_cdata(body)
+            body = fix_meta_charset_position(body)
+            content_doc = self.parse_document(body, req.url)
 
             run_standard = True
             for rule in rules:

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 Feb 27 16:59:12 2010
@@ -737,3 +737,21 @@
      </div>
    <BLANKLINE>
     </body></html>
+
+lxml will properly parse html documents only if the meta tag with charset
+declaration occurs before any chars outside ASCII (per the HTML spec). To
+play nicely with content that breaks that assumption, Deliverance will move
+the charset declaration before passing the document to lxml, to make sure
+the resulting content isn't mangled.
+
+   >>> app['/reddot'] = Response('''\
+   ... <html><head>
+   ...  <title>\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e</title>
+   ...  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   ...  </head><body>
+   ...     \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e
+   ...  </body>
+   ... </html>''')
+
+   >>> compare_request('/reddot', deliv_filename)
+   'Original content:\n<html><head>\n <title>\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e</title>\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n </head><body>\n    \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e\n </body>\n</html>\nThemed content:\n<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">\n<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[\n    @import "http://localhost/style2.css";\n    ]]>\n  </style></head><body>\n\n  <div id="header" class="title-bar">\n    <h1 id="title">This is the theme title</h1>\n    <div class="topnav"></div>\n  </div>\n  <div id="content-wrapper">\n    <a name="top"></a>\n    <div id="content">\n    &#26085;&#26412;&#35486;\n </div>\n    <a href="#top">Back to top</a>\n  </div>\n\n  <div id="footer">\n    foo\n    <![CDATA[\n            some unescaped script content in the footer\n            ]]>\n  </div>\n\n </body></html>'

Added: z3/deliverance/trunk/deliverance/util/charset.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/util/charset.py	Sat Feb 27 16:59:12 2010
@@ -0,0 +1,18 @@
+# see ticket #12
+
+import re
+
+META_CHARSET_TAG = re.compile("""(<meta[^>]*charset=["']*[^"'>]*["']*[>])""", re.IGNORECASE|re.DOTALL)
+HEAD_TAG = re.compile('<head>', re.IGNORECASE)
+
+def fix_meta_charset_position(s):
+    """
+    Move tag with charset definition to be first child of head tag.
+    """
+    data = META_CHARSET_TAG.search(s)
+    if data:
+        tag = data.group()
+        s = META_CHARSET_TAG.sub('',s)
+        s = HEAD_TAG.sub('<head>'+tag, s)
+
+    return s

From ejucovy at codespeak.net  Mon Mar  1 17:58:07 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon,  1 Mar 2010 17:58:07 +0100 (CET)
Subject: [z3-checkins] r71592 - in z3/deliverance/trunk/deliverance: . tests
Message-ID: <20100301165807.61CF451054@codespeak.net>

Author: ejucovy
Date: Mon Mar  1 17:58:05 2010
New Revision: 71592

Modified:
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
cleanup for #12:
 * fix meta-charset position in theme as well as content
 * add test for theme with non-ascii characters before charset declaration
 * make tests more readable



Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Mon Mar  1 17:58:05 2010
@@ -73,7 +73,9 @@
 
         try:
             theme_href = theme.resolve_href(req, resp, log)
-            theme_doc = self.get_theme(theme_href, resource_fetcher, log, should_escape_cdata=True)
+            theme_doc = self.get_theme(
+                theme_href, resource_fetcher, log, 
+                should_escape_cdata=True, should_fix_meta_charset_position=True)
             body = resp.body
             body = escape_cdata(body)
             body = fix_meta_charset_position(body)
@@ -124,7 +126,9 @@
                 return True
         return False
 
-    def get_theme(self, url, resource_fetcher, log, should_escape_cdata=False):
+    def get_theme(self, url, resource_fetcher, log,
+                  should_escape_cdata=False,
+                  should_fix_meta_charset_position=False):
         """
         Retrieves the theme at the given URL.  Also stores it in the
         log for later use by the log.
@@ -142,6 +146,8 @@
         body = resp.body
         if should_escape_cdata:
             body = escape_cdata(body)
+        if should_fix_meta_charset_position:
+            body = fix_meta_charset_position(body)
         doc = self.parse_document(body, url)
         self.make_links_absolute(doc)
         return doc

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	Mon Mar  1 17:58:05 2010
@@ -753,5 +753,117 @@
    ...  </body>
    ... </html>''')
 
-   >>> compare_request('/reddot', deliv_filename)
-   'Original content:\n<html><head>\n <title>\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e</title>\n <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n </head><body>\n    \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e\n </body>\n</html>\nThemed content:\n<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">\n<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[\n    @import "http://localhost/style2.css";\n    ]]>\n  </style></head><body>\n\n  <div id="header" class="title-bar">\n    <h1 id="title">This is the theme title</h1>\n    <div class="topnav"></div>\n  </div>\n  <div id="content-wrapper">\n    <a name="top"></a>\n    <div id="content">\n    &#26085;&#26412;&#35486;\n </div>\n    <a href="#top">Back to top</a>\n  </div>\n\n  <div id="footer">\n    foo\n    <![CDATA[\n            some unescaped script content in the footer\n            ]]>\n  </div>\n\n </body></html>'
+   >>> print compare_request('/reddot', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <html><head>
+    <title>???</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head><body>
+       ???
+    </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+   <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top"></a>
+       <div id="content">
+       &#26085;&#26412;&#35486;
+    </div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>
+
+Let's test that for the theme document also. We'll put the Japanese title and misplaced
+charset declaration in the theme instead of the content. The resulting title should be
+the correct HTML sequence:
+
+   >>> app['/reddot'] = Response('''\
+   ... <html><head>
+   ...  </head><body>
+   ...     foo
+   ...  </body>
+   ... </html>''')
+
+   >>> app['/theme.html'] = Response('''\
+   ... <html>
+   ...  <head>
+   ...   <title>\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e</title>
+   ...   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   ...   <link rel=Stylesheet type="text/css" href="style.css">
+   ...   <style type="text/css"><![CDATA[
+   ...     @import "style2.css";
+   ...     ]]>
+   ...   </style>
+   ...  </head>
+   ...  <body>
+   ... 
+   ...   <div id="header" class="title-bar">
+   ...     <h1 id="title">This is the theme title</h1>
+   ...     <div class="topnav"></div>
+   ...   </div>
+   ...   <div id="content-wrapper">
+   ...     <a name="top"></a>
+   ...     <div id="content">
+   ...       This content will be replaced.
+   ...     </div>
+   ...     <a href="#top">Back to top</a>
+   ...   </div>
+   ... 
+   ...   <div id="footer">
+   ...     <span id="copyright">Copyright (C)</span> 2000 Some Corporation
+   ...   </div>
+   ... 
+   ...  </body>
+   ... </html>''')
+
+   >>> print compare_request('/reddot', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <html><head>
+    </head><body>
+       foo
+    </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+   <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top"></a>
+       <div id="content">
+       foo
+    </div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>

From ejucovy at codespeak.net  Mon Mar  1 20:33:51 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon,  1 Mar 2010 20:33:51 +0100 (CET)
Subject: [z3-checkins] r71593 - z3/deliverance/trunk
Message-ID: <20100301193351.B5D4B51054@codespeak.net>

Author: ejucovy
Date: Mon Mar  1 20:33:48 2010
New Revision: 71593

Modified:
   z3/deliverance/trunk/changes_on_trunk.txt
Log:
update changes_on_trunk per logs since c2

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Mon Mar  1 20:33:48 2010
@@ -1,6 +1,30 @@
- * #16
+ * The paste.deploy configuration and middleware factory now accept a `theme_uri`
+   parameter.
 
- * There is a new theme_uri parameter to the middleware factory which you can use in Paste .ini configuration.
-   This will be treated as the global default theme uri and will be used if no theme is defined in the ruleset.
+   If used, this will be the global default theme uri.  It will be used if no
+   theme is defined within the ruleset.
 
- * #22 -- you can now run Deliverance with a garbagecollection middleware
+ * Internal subrequests that return non-200 response codes are now retried as external
+   HTTP requests. (#16)
+
+ * Request/response matching in <rule> elements now work. (#6)
+
+ * <meta http-equiv="Content-Type"> tags are no longer stripped from documents.
+   Instead, they are always included in the output of Deliverance, with a default
+   charset of ASCII. (#34)
+
+ * CDATA sections in XHTML documents are left as-is instead of being incorrectly
+   escaped. (#36)
+
+ * Before applying the rules, Deliverance now moves the <meta> tag with a charset
+   declaration to be the first child of the <head> element, if both are present.
+   This ensures that non-ASCII characters in the <head> are converted to the correct
+   HTML sequences. (#12)
+
+ * There is now a garbage-collecting WSGI middleware `deliverance.garbagecollect`,
+   disabled by default, which calls `gc.collect()` after every request. This was
+   added after a report (unconfirmed) of potential memory leaks when using some
+   versions of lxml. (#22)
+
+   You can use it with `deliverance-proxy --garbage-collect` or, in paste.deploy
+   configurations, filter your app with `use = egg:Deliverance#garbagecollect`.

From ejucovy at codespeak.net  Mon Mar  1 22:54:16 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon,  1 Mar 2010 22:54:16 +0100 (CET)
Subject: [z3-checkins] r71594 - z3/deliverance/tags/0.3c3
Message-ID: <20100301215416.101B851054@codespeak.net>

Author: ejucovy
Date: Mon Mar  1 22:54:12 2010
New Revision: 71594

Added:
   z3/deliverance/tags/0.3c3/
      - copied from r71593, z3/deliverance/trunk/
Log:
tag 0.3c3

From ejucovy at codespeak.net  Mon Mar 15 14:57:08 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon, 15 Mar 2010 14:57:08 +0100 (CET)
Subject: [z3-checkins] r72243 - z3/deliverance/trunk/deliverance
Message-ID: <20100315135708.EE59C282B9C@codespeak.net>

Author: ejucovy
Date: Mon Mar 15 14:57:06 2010
New Revision: 72243

Modified:
   z3/deliverance/trunk/deliverance/middleware.py
Log:
split out body of DeliveranceMiddleware.__call__ for easier customization of default_theme in subclasses

Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py	(original)
+++ z3/deliverance/trunk/deliverance/middleware.py	Mon Mar 15 14:57:06 2010
@@ -56,6 +56,10 @@
 
     def __call__(self, environ, start_response):
         req = Request(environ)
+        default_theme = self.default_theme
+        return self.apply(req, default_theme)
+
+    def apply(self, req, default_theme):
         if 'deliv_notheme' in req.GET:
             return self.app(environ, start_response)
         req.environ['deliverance.base_url'] = req.application_url
@@ -105,7 +109,7 @@
             self.known_titles[req.url] = self._get_title(resp.body)
             self.known_html.add(req.url)
         resp = rule_set.apply_rules(req, resp, resource_fetcher, log, 
-                                    default_theme=self.default_theme)
+                                    default_theme=default_theme)
         if clientside:
             resp.decode_content()
             resp.body = self._substitute_jsenable(resp.body)

From ejucovy at codespeak.net  Mon Mar 15 15:49:22 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon, 15 Mar 2010 15:49:22 +0100 (CET)
Subject: [z3-checkins] r72244 - in z3/deliverance/trunk/deliverance: .
	paster-templates/deliverance/etc
	paster-templates/deliverance/etc/supervisor.d
	paster-templates/deliverance/logs paster-templates/deliverance/theme
	paster-templates/deliverance/var
Message-ID: <20100315144922.F1025282B9C@codespeak.net>

Author: ejucovy
Date: Mon Mar 15 15:49:20 2010
New Revision: 72244

Modified:
   z3/deliverance/trunk/deliverance/middleware.py
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/etc/   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/etc/deliv-users.htpasswd_tmpl   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/etc/deliverance.xml_tmpl   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/etc/supervisor.d/deliverance.conf_tmpl   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/etc/supervisord.conf_tmpl   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/logs/   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/theme/   (props changed)
   z3/deliverance/trunk/deliverance/paster-templates/deliverance/var/   (props changed)
Log:
undo broken previous commit

Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py	(original)
+++ z3/deliverance/trunk/deliverance/middleware.py	Mon Mar 15 15:49:20 2010
@@ -56,10 +56,6 @@
 
     def __call__(self, environ, start_response):
         req = Request(environ)
-        default_theme = self.default_theme
-        return self.apply(req, default_theme)
-
-    def apply(self, req, default_theme):
         if 'deliv_notheme' in req.GET:
             return self.app(environ, start_response)
         req.environ['deliverance.base_url'] = req.application_url
@@ -109,7 +105,7 @@
             self.known_titles[req.url] = self._get_title(resp.body)
             self.known_html.add(req.url)
         resp = rule_set.apply_rules(req, resp, resource_fetcher, log, 
-                                    default_theme=default_theme)
+                                    default_theme=self.default_theme)
         if clientside:
             resp.decode_content()
             resp.body = self._substitute_jsenable(resp.body)

From ejucovy at codespeak.net  Mon Mar 15 15:50:49 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon, 15 Mar 2010 15:50:49 +0100 (CET)
Subject: [z3-checkins] r72245 - in z3/deliverance:
	branches/egj-multiple-deliverances egj-multiple-deliverances
Message-ID: <20100315145049.DD56C282BE2@codespeak.net>

Author: ejucovy
Date: Mon Mar 15 15:50:48 2010
New Revision: 72245

Added:
   z3/deliverance/branches/egj-multiple-deliverances/
      - copied from r72244, z3/deliverance/egj-multiple-deliverances/
Removed:
   z3/deliverance/egj-multiple-deliverances/
Log:
move branch to branches, oops

From ejucovy at codespeak.net  Mon Mar 15 15:52:24 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon, 15 Mar 2010 15:52:24 +0100 (CET)
Subject: [z3-checkins] r72246 - z3/deliverance/branches/egj-theme-per-request
Message-ID: <20100315145224.EA69A282B9C@codespeak.net>

Author: ejucovy
Date: Mon Mar 15 15:52:23 2010
New Revision: 72246

Added:
   z3/deliverance/branches/egj-theme-per-request/
      - copied from r72245, z3/deliverance/trunk/
Log:
a branch to help build custom application policy for setting a global default theme per request

From ejucovy at codespeak.net  Mon Mar 15 15:54:06 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Mon, 15 Mar 2010 15:54:06 +0100 (CET)
Subject: [z3-checkins] r72247 -
	z3/deliverance/branches/egj-theme-per-request/deliverance
Message-ID: <20100315145406.446F3282B9C@codespeak.net>

Author: ejucovy
Date: Mon Mar 15 15:54:04 2010
New Revision: 72247

Modified:
   z3/deliverance/branches/egj-theme-per-request/deliverance/middleware.py
Log:
lazy; this should work

Modified: z3/deliverance/branches/egj-theme-per-request/deliverance/middleware.py
==============================================================================
--- z3/deliverance/branches/egj-theme-per-request/deliverance/middleware.py	(original)
+++ z3/deliverance/branches/egj-theme-per-request/deliverance/middleware.py	Mon Mar 15 15:54:04 2010
@@ -55,6 +55,9 @@
         return 'Deliverance'
 
     def __call__(self, environ, start_response):
+        return self.apply(environ, start_response, self.default_theme)
+
+    def apply(self, environ, start_response, default_theme):
         req = Request(environ)
         if 'deliv_notheme' in req.GET:
             return self.app(environ, start_response)
@@ -105,7 +108,7 @@
             self.known_titles[req.url] = self._get_title(resp.body)
             self.known_html.add(req.url)
         resp = rule_set.apply_rules(req, resp, resource_fetcher, log, 
-                                    default_theme=self.default_theme)
+                                    default_theme=default_theme)
         if clientside:
             resp.decode_content()
             resp.body = self._substitute_jsenable(resp.body)

From ejucovy at codespeak.net  Wed Mar 17 22:00:31 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 17 Mar 2010 22:00:31 +0100 (CET)
Subject: [z3-checkins] r72334 - in z3/deliverance/trunk: . deliverance
	deliverance/tests
Message-ID: <20100317210031.B5B4D282BDC@codespeak.net>

Author: ejucovy
Date: Wed Mar 17 22:00:29 2010
New Revision: 72334

Modified:
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
   z3/deliverance/trunk/setup.py
Log:
#15: fix mangled non-ascii characters by using the unicode_body of the responses, instead of string body, so that lxml knows how to htmlize non-ascii characters correctly

Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Wed Mar 17 22:00:29 2010
@@ -76,7 +76,7 @@
             theme_doc = self.get_theme(
                 theme_href, resource_fetcher, log, 
                 should_escape_cdata=True, should_fix_meta_charset_position=True)
-            body = resp.body
+            body = resp.unicode_body
             body = escape_cdata(body)
             body = fix_meta_charset_position(body)
             content_doc = self.parse_document(body, req.url)
@@ -106,7 +106,6 @@
         else:
             method = "html"
 
-
         ## FIXME: this seems like a terrible way to preserve the content's DOCTYPE
         if resp.body.strip().startswith("<!DOCTYPE"):
             theme_str = tostring(theme_doc, method=method, include_meta_content_type=True)
@@ -143,7 +142,7 @@
                 self, "The resource %s was not 200 OK: %s" % (url, resp.status))
             raise AbortTheme(
                 "The resource %s returned an error: %s" % (url, resp.status))
-        body = resp.body
+        body = resp.unicode_body
         if should_escape_cdata:
             body = escape_cdata(body)
         if should_fix_meta_charset_position:
@@ -242,7 +241,7 @@
                     rules.append(rule)
                     if rule.theme:
                         assert 0, 'no rule themes should be present'
-        content_doc = self.parse_document(resp.body, req.url)
+        content_doc = self.parse_document(resp.unicode_body, req.url)
         actions = []
         run_standard = True
         for rule in rules:

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	Wed Mar 17 22:00:29 2010
@@ -867,3 +867,62 @@
      </div>
    <BLANKLINE>
     </body></html>
+
+Some non-ASCII characters can end up mangled when they pass through lxml.html::
+
+   >>> from lxml.html import fromstring, tostring
+   >>> x = "<html><body>?</body></html>"
+   >>> print tostring(fromstring(x))
+   <html><body>&#226;&#128;&#166;</body></html>
+   
+That should have been "&#8230;", which is the HTML code for the ellipsis character.
+The way to fix this is to decode the string to unicode before lxml.html gets it::
+
+   >>> print tostring(fromstring(x.decode('utf8')))
+   <html><body>&#8230;</body></html>
+
+So, internally, Deliverance will use webob.Response.unicode_body, which uses the
+response's charset to figure out how to decode the string. Let's make sure that
+these characters aren't mangled when they are themed through Deliverance::
+
+   >>> app['/mangled'] = Response('''\
+   ... <html><head>
+   ...  </head><body>
+   ...     ?
+   ...  </body>
+   ... </html>''')
+
+   >>> print compare_request('/mangled', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <html><head>
+    </head><body>
+       ?
+    </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+   <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top"></a>
+       <div id="content">
+       &#8230;
+    </div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Wed Mar 17 22:00:29 2010
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3c3'
+version = '0.3-dev'
 
 setup(name='Deliverance',
       version=version,

From ejucovy at codespeak.net  Thu Mar 18 16:27:52 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 18 Mar 2010 16:27:52 +0100 (CET)
Subject: [z3-checkins] r72381 - in z3/deliverance/trunk/deliverance: tests
	util
Message-ID: <20100318152752.0ACB0282BDE@codespeak.net>

Author: ejucovy
Date: Thu Mar 18 16:27:50 2010
New Revision: 72381

Added:
   z3/deliverance/trunk/deliverance/tests/test_charset.py
Modified:
   z3/deliverance/trunk/deliverance/util/charset.py
Log:
 * Add unit tests for the regex that finds the <meta> tag that declares document charset

 * Tweak that regex a bit to be more permissive
  * Allow self-closing tag, which I think is incorrect(?), but seems common enough in the wild
  * Allow one trailing space (e.g. <meta >, which I think is wrong, and <meta />, which I think is right)
 * Tweak that regex a bit to be less permissive
  * Don't allow quotes inside the charset= phrase (I have no idea if this is correct or not)

 * Add a regex group to find the actual charset that's being declared



Added: z3/deliverance/trunk/deliverance/tests/test_charset.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/tests/test_charset.py	Thu Mar 18 16:27:50 2010
@@ -0,0 +1,34 @@
+from deliverance.util.charset import META_CHARSET_TAG
+from nose.tools import assert_true, assert_false, assert_equals
+
+docs = {
+    """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">""": "UTF-8",
+    """<meta http-equiv="Content-Type" content="text/html; charset=ASCII"></meta>""": "ASCII",
+    """<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>""": "ISO-8859-1",
+    """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />""": "UTF-8",
+    """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >""": "UTF-8",
+}
+
+bad_docs = [
+    """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"  >""", # nobody needs that much whitespace, right?
+    """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"//>""", # only one trailing slash allowed
+    """<meta http-equiv="Content-Type" content="text/html; charset='ASCII'"></meta>""", # shouldn't have nested quotes
+    """<meta http-equiv="Content-Type" content="text/html; charset=ASCII""></meta>""", # can have only one trailing quote!
+    """<meta http-equiv="Content-Type" content="text/html"> <foo charset=UTF-8" >""", # has to be in the meta tag
+    """<meta http-equiv="Content-Type" content="text/html"> charset=UTF-8" >""", # really .. has to be in the meta tag
+]
+
+def test_regex():
+    for doc in docs:
+        should_match(doc, docs[doc])
+    for doc in bad_docs:
+        shouldnt_match(doc)
+
+def shouldnt_match(doc):
+    match = META_CHARSET_TAG.search(doc)
+    assert_false(match)
+
+def should_match(doc, charset):
+    match = META_CHARSET_TAG.search(doc)
+    assert_true(match)
+    assert_equals(match.group('charset'), charset)

Modified: z3/deliverance/trunk/deliverance/util/charset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/util/charset.py	(original)
+++ z3/deliverance/trunk/deliverance/util/charset.py	Thu Mar 18 16:27:50 2010
@@ -2,7 +2,9 @@
 
 import re
 
-META_CHARSET_TAG = re.compile("""(<meta[^>]*charset=["']*[^"'>]*["']*[>])""", re.IGNORECASE|re.DOTALL)
+META_CHARSET_TAG = re.compile(
+    """(<meta[^>]*charset=(?P<charset>[^"'>]*)["']?[ ]?[/]?[>])""",
+    re.IGNORECASE|re.DOTALL)
 HEAD_TAG = re.compile('<head>', re.IGNORECASE)
 
 def fix_meta_charset_position(s):

From ejucovy at codespeak.net  Thu Mar 18 17:28:28 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 18 Mar 2010 17:28:28 +0100 (CET)
Subject: [z3-checkins] r72387 - in z3/deliverance/trunk/deliverance: . tests
	util
Message-ID: <20100318162828.20040282BDB@codespeak.net>

Author: ejucovy
Date: Thu Mar 18 17:28:27 2010
New Revision: 72387

Modified:
   z3/deliverance/trunk/deliverance/ruleset.py
   z3/deliverance/trunk/deliverance/tests/test_charset.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
   z3/deliverance/trunk/deliverance/util/charset.py
Log:
 * Let charset regex work for html5 <meta charset="foo"> 

 * Set response charset before accessing unicode_body, to prevent AttributeError
   when response.charset=None --

  1. If response.charset is set (via HTTP header) leave it
  2. If a charset is found in the document body, use it
  3. Assume utf8 as a last resort



Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Thu Mar 18 17:28:27 2010
@@ -9,7 +9,7 @@
 from deliverance.rules import Rule, remove_content_attribs
 from deliverance.themeref import Theme
 from deliverance.util.cdata import escape_cdata, unescape_cdata
-from deliverance.util.charset import fix_meta_charset_position
+from deliverance.util.charset import fix_meta_charset_position, force_charset
 from urlparse import urljoin
 
 class RuleSet(object):
@@ -76,6 +76,7 @@
             theme_doc = self.get_theme(
                 theme_href, resource_fetcher, log, 
                 should_escape_cdata=True, should_fix_meta_charset_position=True)
+            resp = force_charset(resp)
             body = resp.unicode_body
             body = escape_cdata(body)
             body = fix_meta_charset_position(body)
@@ -142,7 +143,10 @@
                 self, "The resource %s was not 200 OK: %s" % (url, resp.status))
             raise AbortTheme(
                 "The resource %s returned an error: %s" % (url, resp.status))
+        
+        resp = force_charset(resp)
         body = resp.unicode_body
+
         if should_escape_cdata:
             body = escape_cdata(body)
         if should_fix_meta_charset_position:
@@ -241,6 +245,7 @@
                     rules.append(rule)
                     if rule.theme:
                         assert 0, 'no rule themes should be present'
+        resp = force_charset(resp)
         content_doc = self.parse_document(resp.unicode_body, req.url)
         actions = []
         run_standard = True

Modified: z3/deliverance/trunk/deliverance/tests/test_charset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/tests/test_charset.py	(original)
+++ z3/deliverance/trunk/deliverance/tests/test_charset.py	Thu Mar 18 17:28:27 2010
@@ -7,6 +7,13 @@
     """<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>""": "ISO-8859-1",
     """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />""": "UTF-8",
     """<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >""": "UTF-8",
+    """<meta charset="UTF-8" >""": "UTF-8",
+    """<meta charset="UTF-8" />""": "UTF-8",
+    """<meta charset="UTF-8">""": "UTF-8",
+
+    # it's not completely strict; these are OK too:
+    """<meta charset="UTF-8>""": "UTF-8",
+    """<meta charset='UTF-8">""": "UTF-8",
 }
 
 bad_docs = [

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	Thu Mar 18 17:28:27 2010
@@ -790,6 +790,52 @@
    <BLANKLINE>
     </body></html>
 
+   >>> app['/reddot'] = Response('''\
+   ... <html><head>
+   ...  <title>\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e</title>
+   ...  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta>
+   ...  </head><body>
+   ...     \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e
+   ...  </body>
+   ... </html>''')
+
+   >>> print compare_request('/reddot', deliv_filename) # doctest: +REPORT_UDIFF
+   Original content:
+   <html><head>
+    <title>???</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta>
+    </head><body>
+       ???
+    </body>
+   </html>
+   Themed content:
+   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+   <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>&#26085;&#26412;&#35486;</title><link rel="Stylesheet" type="text/css" href="http://localhost/style.css"><style type="text/css"><![CDATA[
+       @import "http://localhost/style2.css";
+       ]]>
+     </style></head><body>
+   <BLANKLINE>
+     <div id="header" class="title-bar">
+       <h1 id="title">This is the theme title</h1>
+       <div class="topnav"></div>
+     </div>
+     <div id="content-wrapper">
+       <a name="top"></a>
+       <div id="content">
+       &#26085;&#26412;&#35486;
+    </div>
+       <a href="#top">Back to top</a>
+     </div>
+   <BLANKLINE>
+     <div id="footer">
+       foo
+       <![CDATA[
+               some unescaped script content in the footer
+               ]]>
+     </div>
+   <BLANKLINE>
+    </body></html>
+
 Let's test that for the theme document also. We'll put the Japanese title and misplaced
 charset declaration in the theme instead of the content. The resulting title should be
 the correct HTML sequence:

Modified: z3/deliverance/trunk/deliverance/util/charset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/util/charset.py	(original)
+++ z3/deliverance/trunk/deliverance/util/charset.py	Thu Mar 18 17:28:27 2010
@@ -3,7 +3,7 @@
 import re
 
 META_CHARSET_TAG = re.compile(
-    """(<meta[^>]*charset=(?P<charset>[^"'>]*)["']?[ ]?[/]?[>])""",
+    """(<meta[^>]*charset=["']?(?P<charset>[^"'>]*)["']?[ ]?[/]?[>])""",
     re.IGNORECASE|re.DOTALL)
 HEAD_TAG = re.compile('<head>', re.IGNORECASE)
 
@@ -18,3 +18,25 @@
         s = HEAD_TAG.sub('<head>'+tag, s)
 
     return s
+
+def force_charset(resp, default="utf8"):
+    """
+    Sets the charset of the response, to guarantee that
+    ``resp.unicode_body`` won't raise AttributeError:
+
+     1. If the charset is already set, leave it.
+
+     2. If a charset declaration is found in the
+        response body, use it.
+
+     3. Otherwise use ``default``.
+    """
+    if resp.charset:
+        return resp
+    match = META_CHARSET_TAG.search(resp.body)
+    if match is None:
+        resp.charset = default
+        return resp
+    charset = match.group('charset')
+    resp.charset = charset
+    return resp

From optilude at codespeak.net  Mon Mar 22 15:48:51 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Mon, 22 Mar 2010 15:48:51 +0100 (CET)
Subject: [z3-checkins] r72560 - z3/xdv/trunk/lib/xdv
Message-ID: <20100322144851.A7445282B90@codespeak.net>

Author: optilude
Date: Mon Mar 22 15:48:49 2010
New Revision: 72560

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
Allow the rules parser to be pre-configured and passed into compile_theme, like the other parsers. This is mainly to support custom resolvers.

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Mon Mar 22 15:48:49 2010
@@ -77,7 +77,7 @@
         elif node.tag == 'style' or node.tag == etree.Comment and node.text.startswith("[if IE"):
             node.text = IMPORT_STYLESHEET.sub(lambda match: match.group(1) + to_absolute(match.group(2), absolute_prefix) + match.group(3), node.text)
 
-def compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None):
+def compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
@@ -95,9 +95,14 @@
     * ``parser`` can be set to an lxml parser instance; the default is an HTMLParser
     * ``compiler_parser``` can be set to an lxml parser instance; the default is a
       XMLParser
+    * ``rules_parser`` can be set to an lxml parser instance; the default is a
+      XMLParse.
     """
-    rules_parser = etree.XMLParser(recover=False)
+    
+    if rules_parser is None:
+        rules_parser = etree.XMLParser(recover=False)
     rules_doc = etree.parse(rules, parser=rules_parser)
+    
     if xinclude:
         rules_doc.xinclude()
     if update:

From optilude at codespeak.net  Tue Mar 23 11:20:34 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Tue, 23 Mar 2010 11:20:34 +0100 (CET)
Subject: [z3-checkins] r72610 - in z3/xdv/trunk: . lib/xdv
Message-ID: <20100323102034.749C8282BD8@codespeak.net>

Author: optilude
Date: Tue Mar 23 11:20:31 2010
New Revision: 72610

Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
Add documentation. Still work in progress.

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Tue Mar 23 11:20:31 2010
@@ -1,57 +1,474 @@
-========================================
-xdv - XSLT engine for Deliverance
-========================================
+=============================
+XDV - XSLT Deliverance Engine
+=============================
+
+.. contents:: Contents
+
+Introduction
+============
+
+XDV is an implementation of the Deliverance concept using pure XSLT. In short,
+it is a way to apply a style/theme to a dynamic website.
+
+Consider a scenario where you have some dynamic website, to which you want to
+apply a theme built by a web designer. The web designer is not familiar with
+the technology behind the dynamic website, and so has supplied a "static HTML"
+version of the site. This consists of an HTML file with more-or-less semantic
+markup, one or more style sheets, and perhaps some other resources like
+images or JavaScript files.
+
+Using XDV, you could apply this theme to your dynamic website as follows:
+
+1. Identify the placeholders in the theme file that need to be replaced with
+   dynamic elements. Ideally, these should be clearly identifiable, for
+   example with a unique HTML ``id`` attribute.
+2. Identify the corresponding markup in the dynamic website. Then write a
+   "replace" or "copy" rule using XDV's rules syntax that replaces the theme's
+   static placeholder with the dynamic content.
+3. Identify markup in the dynamic website that should be copied wholesale into
+   the theme. CSS and JavaScript links in the ``<head />`` are often treated
+   this way. Write an XDV "append" or "prepend" rule to copy these elements
+   over.
+4. Identify parts of the theme and/or dynamic website that are superfluous.
+   Write an XDV "drop" rule to remove these elements.
+
+The rules file is written using a simple XML syntax. Elements in the theme
+and "content" (the dynamic website) can be identified using CSS3 or XPath
+syntax.
+
+Once you have a theme HTML file and a rules XML file, you compile these using
+the XDV compiler into a single XSLT file. You can then deploy this XSLT file
+with your application. An XSLT processor (such as mod_transform in Apache)
+will then transform the dynamic content from your website into the themed
+content your end users see. The transformation takes place on-the-fly for
+each request.
+
+Bear in mind that:
+
+* You never have to write, or even read, a line of XSLT (unless you want to).
+* The XSLT transformation that takes place for each request is very fast.
+* Static theme resources (like images, stylesheets or JavaScript files) can
+  be served from a static webserver, which is normally much faster than
+  serving them from a dynamic application.
+* You can leave the original theme HTML untouched, with makes it easier to
+  re-use for other scenarios. For example, you can stitch two unrelated
+  applications together by using a single theme file with separate rules
+  files. This would result in two compiled XSLT files. You could use location
+  match rules or similar techniques to choose which one to invoke for a given
+  request.
+
+We will illustrate how to set up XDV for deployment below.
+
+Rules file syntax
+=================
+
+The rules file, conventionally called ``rules.xml``, is rooted in a tag
+called ``<rules />``::
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <rules xmlns="http://namespaces.plone.org/xdv"
+           xmlns:css="http://namespaces.plone.org/xdv+css">
+           
+           ...
+           
+    </rules>
+
+Here we have defined two namespaces: the default namespace is used for rules
+and XPath selectors. The ``css`` namespace is used for CSS3 selectors. These
+are functionally equivalent. In fact, CSS selectors are replaced by the
+equivalent XPath selector the pre-processing step of the compiler. Thus, they
+have no performance impact.
+
+XDV supports complex CSS3 and XPath selectors, including things like the
+``nth-child`` pseudo-selector. You are advised to consult a good reference
+if you are new to XPath and/or CSS3.
+
+The following elements are allowed inside the ``<rules />`` element:
+
+``<replace />``
+---------------
+
+Used to replace an element in the theme entirely with an element in the
+content. For example::
+
+    <replace theme="/html/head/title" content="/html/head/title"/>
 
-xdv is a mini-project to implement a subset of Deliverance using a
-pure XSLT engine.  With xdv, you "compile" your theme and ruleset in
-one step, then use a superfast/simple transform on each request
-thereafter.  Alternatively, compile your theme during development,
-check it into Subversion, and not touch xdv during deployment.
+The (near-)equivalent using CSS selectors would be::
 
-Usage
-----------------
+    <replace css:theme="title" css:content="title"/>
 
-1) Create the files ``theme.html``, ``rules.xml``, and ``content.html``.
+The result of either is that the ``<title />`` element in the theme is
+replaced with the ``<title />`` element in the (dynamic) content.
 
-2) xsltproc --html compiler.xsl theme.html > compiledtheme.xsl
+``<copy />``
+------------
 
-3) xsltproc --html compiledtheme.xsl content.html > output.html
+Used to replace the contents of a placeholder tag with a tag from the
+theme. For example::
 
-4) open output.html
+    <copy css:theme="#main" css:content="#portal-content > *" />
 
-Specifying the rules file
-------------------------------
+This would replace any placeholder content inside the element with id
+``main`` in the theme with all children of the element with id
+``portal-content`` in the content. The usual reason for using ``<copy />``
+instead of ``<replace />``, is that the theme has CSS styles or other
+behaviour attached to the target element (with id ``main`` in this case).
 
-The Deliverance rules file is read into the compiler.xsl file using
-the XSLT ``document()`` function.  This function is given a URI, which
-it loads and parses.
+``<append />`` and ``<prepend />``
+----------------------------------
 
-By default it looks for ``rules.xml`` in the same directory as the
-``compiler.xsl``.  However, you can pass a parameter in when compiling
-the theme::
+Used to copy elements from the content into an element in the theme,
+leaving existing content in place. ``<append />`` places the matched
+content directly before the closing tag in the theme; append places it
+directly after the opening tag. For example::
 
-  xsltproc --nonet --html --stringparam rulesuri rules.xml compiler.xsl theme.html > compiledtheme.xsl
+    <append theme="/html/head" content="/html/head/link" />
 
-Running from Python
------------------------
+This will copy all ``<link />`` elements in the head of the content into
+the theme.
+
+As a special case, you can copy individual *attributes* from a content
+element to an element in the theme using ``<prepend />``::
+
+    <prepend theme="/html/body" content="/html/body/@class" />
 
-There is a little bit of support for generating a theme and printing
-it to stdout using lxml:
+This would copy the ``class`` attribute of the ``<body />`` element in
+the content into the theme (replacing an existing attribute with the
+same name if there is one).
 
-  $ cd xdv
-  $ python tests/test_nodes.py
+``<before />`` and ``<after />``
+--------------------------------
 
-Usage
+These are equivalent to ``<append />`` and ``<prepend />``, but place
+the matched content before or after the matched theme element, rather
+than immediately inside it. For example:
+    
+    <before css:theme="#content" css:content="#info-box" />
+
+This would place the element with id ``info-box`` from the content
+immediately before the element with id ``content`` in the theme. If we
+wanted the box below the content instead, we could do::
+
+    <after css:theme="#content" css:content="#info-box" />
+    
+``<drop />``
 ------------
 
-- Attribute merging can be performed using <prepend>.  For example::
+Used to drop elements from the theme or the content. This is the only
+element that accepts either ``theme`` or ``content`` attributes (or their
+``css:`` equivalents), but not both::
+
+    <drop css:content="#portal-content .about-box" />
+    <copy css:theme="#content" css:content="#portal-content > *" />
+
+This would copy all children of the element with id ``portal-content`` in
+the theme  into the element with id ``content`` in the theme, but only
+after removing any element with class ``about-box`` inside the content
+element first. Similarly::
+
+    <drop theme="/html/head/base" />
+
+Would drop the ``<base />`` tag from the head of the theme.
+
+Order of rule execution
+-----------------------
+
+XXX: Laurence needs to check this
 
-  <prepend theme="/html/body" content="/html/body/@class" />
+In most cases, you should not care too much about the inner workings of the
+XDV compiler. However, it can sometimes be useful to understand the order
+in which rules are applied.
+
+1. ``<drop />`` rules referring to the *content* are applied first. Thus,
+   anything that is dropped from the content will never be matched by any
+   other rule.
+2. ``<before />`` rules execute next, followed by ``<after />`` rules.
+3. ``<replace />`` rules execute next.
+4. ``<prepend />``, ``<copy />`` and ``<append />`` rules are then executed.
+5. Finally, ``<drop />`` rules referring to the *theme* are applied, meaning
+   they can also match elements that have landed in the theme as a result of
+   one of the above rules.
+
+Behaviour if theme or content is not matched
+--------------------------------------------
+
+XXX: Laurence needs to check this - is it correct? Does the same rule apply
+to all rules, or only to <copy /> and <replace />?
+
+If a rule does not match the theme (whether or not it matches the content),
+it is silently ignored.
+
+If a rule matches the theme, but not the content, the matched element will
+be dropped in the theme::
+
+    <replace css:theme="#header" content="#header-element" />
+
+If the element with id ``header-element`` is not found in the content, the
+placeholder with id ``header`` in the theme is removed.
+
+If you want the placeholder to stay put, you can make this a conditional
+rule::
+
+    <replace css:theme="#header" content="#header-element" if-content="" />
+
+See below for more details on conditional rules.
+
+Advanced usage
+--------------
+
+The simple rules above should suffice for most use cases. However, there are
+a few more advanced tools at your disposal, should you need them.
+
+Conditional rules
+~~~~~~~~~~~~~~~~~
+
+XXX: Laurence needs to check this
+
+Sometimes, it is useful to apply a rule only if a given element appears or
+does not appear in the markup. The ``if-content`` attribute can be used with
+any rule to make it conditional.
+
+``if-content`` should be set an XPath expression. You can also use
+``css:if-content`` with a CSS3 expression. If the expression matches a node
+in the content, the rule will be applied::
+
+    <copy css:theme="#portlets" css:content=".portlet"/>
+    <drop css:theme="#portlet-wrapper" if-content="not(//*[@class='portlet'])"/>
+
+This will copy all elements with class ``portlet`` into the ``portlets``
+element. If there are no matching elements in the content, the ``portlets``
+element will be dropped as normal. However, we also drop the
+``portlet-wrapper`` element in this case, as it is presumably superfluous.
+
+Here is another example using CSS selectors::
+
+    <copy css:theme="#header" css:content="#header-box > *" css:if-content="#personal-bar"/>
+
+This will copy the children of the element with id ``header-box`` in the
+content into the element with id ``header`` in the theme, so long as an
+element with id ``personal-bar`` also appears somewhere in the content.
+
+Above, we also saw the special case of an empty ``if-content`` (which also
+works with an empty ``css:if-content``). This is a shortcut that means "use
+the expression in the ``content`` or ``css:content``` attribute as the
+condition". Hence the following two rules are equivalent::
+
+    <copy css:theme="#header" css:content="#header-box > *" css:if-content="#header-box > *"/>
+    <copy css:theme="#header" css:content="#header-box > *" css:if-content=""/>
+
+Including external content
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+XXX: Laurence needs to check/complete this
+
+Normally, the ``content`` attribute of any rule selects nodes from the
+response being returned by the underlying dynamic web server. However, it is
+possible to include content from a different URL using the ``href`` attribute
+on any rule (other than ``<drop />``). For example::
+
+    <append css:theme="#left-column" css:content="#portlet" href="/extra.html"/>
+
+This will resolve the URL ``/extra.html``, look for an element with id
+``portlet`` and then append to to the element with id ``left-column`` in the
+theme.
+
+The inclusion can happen in one of three ways:
+
+* Using the XSLT ``document()`` function. This is the default, but it can
+  be explicitly specified by adding an attribute ``method="document"`` to the 
+  rule element. Whether this is able to resolve the URL depends on how and
+  where the compiled XSLT is being executed::
+  
+    <append css:theme="#left-column" css:content="#portlet" href="/extra.html" method="document" />
+  
+* Via a Server Side Include directive. This can be specified by setting the
+  ``method`` attribute to ``ssi``::
+  
+    <append css:theme="#left-column" css:content="#portlet" href="/extra.html" method="ssi"/>
+
+  The output will look something like this::
+  
+    <!--# include  virtual="/extra.html?;filter_xpath=//*[@id%20=%20'portlet']" wait="yes" -->
+  
+  This SSI instruction would need to be processed by a fronting web server
+  such as Apache or nginx. Also note the ``;filter_xpath`` query string
+  parameter. Since we are deferring resolution of the referenced document
+  until SSI processing takes place (i.e. after the compiled XDV XSLT transform
+  has executed), we need to ask the SSI processor to filter out elements in
+  the included file that we are not interested in. This requires specific
+  configuration. An example for nginx is included below.
+
+* Via an Edge Side Includes directive. This can be specified by setting the
+  ``method`` attribute to ``esi``::
+  
+    <append css:theme="#left-column" css:content="#portlet" href="/extra.html" method="esi"/>
+
+  The output is similar to that for the SSI mode::
+
+    <esi:include src="/extra.html?;filter_xpath=//*[@id%20=%20'portlet']"></esi:include>
+  
+  Again, the directive would need to be processed by a fronting server, such
+  as Varnish. Chances are an ESI-aware cache server would not support
+  arbitrary XPath filtering. If the referenced file is served by a dynamic
+  web server, it may be able to inspect the ``;filter_xpath`` parameter and
+  return a tailored response. Otherwise, if a server that can be made aware
+  of this is placed in-between the cache server and the underlying web server,
+  that server can perform the necessary filtering.
+
+Modifying the theme on the fly
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+XXX: Laurence needs to check/complete this
+
+Compilation
+===========
+
+XXX: Laurence needs to check/complete this - do we need a CSS pre-processing
+ step?
+
+Once you have written your rules file, you need to compile it to an XSLT for
+deployment. In some cases, you may have an application server that does this
+on the fly, e.g. if you are using the ``collective.xdv`` package with Plone.
+For deployment to a web server like Apache or nginx, however, you will need
+to perform this step manually.
+
+Compilation uses the XSLT file ``compiler.xsl``. The easiest way to run this
+is with the ``xsltproc`` command, which should come installed with
+``libxslt``. You will need to install ``libxslt`` if you don't have it already.
+
+To execute the compiler::
+
+    $ xsltproc --nonet --html compiler.xsl theme.html > compiledtheme.xsl
+
+This will look for a rules file called ``rules.xml`` in the current directory.
+If you need to specify an alternative file, you can do::
+
+    $ xsltproc --nonet --html --stringparam rulesuri rules.xml compiler.xsl theme.html > compiledtheme.xsl
+
+There are various other parameters which can be specified using the
+``--stringparam`` syntax:
+
+* ``rulesuri``, which gives a URI or filename to the rules file.
+* ``boilerplateurl``, which gives a URL to the ``boilerplate.xsl`` file.
+  You probably don't need to override this.
+* ``extraurl``, which gives a URL to an XSLT file which will be inserted into
+  the compiled theme. Use this to include arbitrary XSLT instructions in the
+  compiled theme.
+* ``trace``, which can be set to 1 to enable debug tracing during the
+  compilation step.
+* ``includemode``, which can be set to one of ``document``, ``ssi`` or
+  ``esi`` to specify the default inclusion method for external content when
+  using the ``href`` attribute.
+* ``ssiprefix``, ``ssisuffix``, which can be used to add a prefix or suffix to
+  a URI generated for SSI inclusion.
+* ``ssiquerysuffix``, which can be used to change the ``;filter_xpath=``
+  request variable name in a URL generated for SSI inclusion.
+* ``esiprefix``, ``esisuffix`` and ``esiquerysuffix``, which serve the same
+  function for ESI inclusions.
+
+Testing the compiled theme
+--------------------------
+
+To test the compiled theme, you can apply it to a static file representing
+the content, e.g. with::
+
+    $ xsltproc --nonet --html compiledtheme.xsl content.html > output.html
+
+Open ``output.html`` to see the transformed theme.
+
+Compiling the theme in Python code
+----------------------------------
+
+XXX: Laurence needs to check this
+
+XDV can be used without Python, but it is primarily distributed as part of
+the ``xdv`` Python package. This provides a test suite and certain utilities.
+One of those utilities is a method to compile an XDV XSLT file::
+
+    >>> from xdv.compiler import compile_theme
+
+This method takes the following arguments:
+
+* ``rules`` is the rules file, given either as a file name or a string with
+  the file contents.
+* ``theme`` is the theme file, given either as a file name or a string with
+  the file contents
+* ``extra`` is an optional XSLT file with XDV extensions, given as a URI
+* ``css``   can be set to False to disable CSS syntax support (providing a
+  moderate speed gain)
+* ``xinclude`` can be set to ``True`` to enable XInclude support (at a
+  moderate speed cost). If enabled, XInclude syntax can be used to split the
+  rules file into multiple, re-usable fragments.
+* ``absolute_prefix`` can be set to a string that will be prefixed to any
+  *relative* URL referenced in an image, link or stylesheet in the theme
+  HTML file before the theme is passed to the compiler. This allows a
+  theme to be written so that it can be opened and views standalone on the
+  filesystem, even if at runtime its static resources are going to be
+  served from some other location. For example, an
+  ``<img src="images/foo.jpg" />`` can be turned into 
+  ``<img src="/static/images/foo.jpg" />`` with an ``absolute_prefix`` of
+  "/static".
+* ``update`` can be set to ``False`` to disable the automatic update support
+  for the old Deliverance 0.2 namespace (for a moderate speed gain)
+* ``trace`` can be set to True to enable compiler trace information
+* ``includemode`` can be set to 'document', 'esi' or 'ssi' to change the way
+  in which includes are processed
+* ``parser`` can be set to an lxml parser instance; the default is an
+  HTMLParser
+* ``compiler_parser``` can be set to an lxml parser instance; the default is a
+  XMLParser
+* ``rules_parser`` can be set to an lxml parser instance; the default is a
+  XMLParse.
+
+The parser parameters may be used to add custom resolvers for external content
+if required. See the `lxml <http://codespeak.net/lxml>`_ documentation for
+details.
+
+``compile_theme()`` returns an XSLT document in ``lxml``'s ``ElementTree``
+format. To set up a transform representing the theme and rules, you can do::
+
+    from lxml import etree
+    
+    extraurl = None
+    absolute_prefix = "/static"
+    xinclude = False
+            
+    rules = "rules.xml"
+    theme = "theme.html"
+            
+    compiled_theme = compile_theme(rules, theme, extra=extraurl, 
+                                   xinclude=xinclude,
+                                   absolute_prefix=absolute_prefix)
+            
+    transform = etree.XSLT(compiled_theme)
+    
+You can now use this transformation::
+
+    content = etree.parse(some_content)
+    transformed = transform(content)
+    
+    output = etree.tostring(transformed)
+
+Please see the ``lxml`` documentation for more details.
+
+Deployment
+==========
+
+Plone
+-----
+
+nginx
+-----
+
+XXX: Laurence needs to check this
+
+Varnish
+-------
 
-Not Supported
---------------------
+XXX: Laurence needs to check this
 
-1) Multiple themes or "page types"
+Apache
+------
 
-2) Link rewriting
+XXX: Laurence needs to check this
 

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Tue Mar 23 11:20:31 2010
@@ -87,11 +87,20 @@
       moderate speed gain)
     * ``xinclude`` can be set to True to enable XInclude support (at a
       moderate speed cost)
+    * ``absolute_prefix`` can be set to a string that will be prefixed to any
+      *relative* URL referenced in an image, link or stylesheet in the theme
+      HTML file before the theme is passed to the compiler. This allows a
+      theme to be written so that it can be opened and views standalone on the
+      filesystem, even if at runtime its static resources are going to be
+      served from some other location. For example, an
+      ``<img src="images/foo.jpg" />`` can be turned into 
+      ``<img src="/static/images/foo.jpg" />`` with an ``absolute_prefix`` of
+      "/static".
     * ``update`` can be set to False to disable the automatic update support for
       the old Deliverance 0.2 namespace (for a moderate speed gain)
     * ``trace`` can be set to True to enable compiler trace information
-    * ``includemode`` can be set to 'document' or 'ssi' to change the way in
-      which includes are processed
+    * ``includemode`` can be set to 'document', 'esi' or 'ssi' to change the
+      way in which includes are processed
     * ``parser`` can be set to an lxml parser instance; the default is an HTMLParser
     * ``compiler_parser``` can be set to an lxml parser instance; the default is a
       XMLParser

From optilude at codespeak.net  Tue Mar 23 17:26:03 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Tue, 23 Mar 2010 17:26:03 +0100 (CET)
Subject: [z3-checkins] r72637 - in z3/xdv/trunk: . lib/xdv
Message-ID: <20100323162603.3D0F5282BD6@codespeak.net>

Author: optilude
Date: Tue Mar 23 17:26:02 2010
New Revision: 72637

Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
Lots of more documentation

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Tue Mar 23 17:26:02 2010
@@ -59,6 +59,52 @@
 
 We will illustrate how to set up XDV for deployment below.
 
+Installation
+============
+
+To install XDV, you should install the ``xdv`` egg. You can do that using
+``easy_install``, ``pip`` or ``zc.buildout``. For example, using
+``easy_install`` (ideally in a ``virtualenv``)::
+    
+    $ easy_install -U xdv
+
+If using ``zc.buildout``, you can use the following ``buildout.cfg`` as a
+starting point. This will ensure that the console scripts are installed,
+which is important if you need to execute the XDV compiler manually::
+
+    [buildout]
+    parts =
+        xdv
+
+    [xdv]
+    recipe = zc.recipe.egg
+    eggs = xdv
+
+Note that ``lxml`` is a dependency of ``xdv``. On some operating systems,
+notably Mac OS X, installing a "good" ``lxml`` egg can be problematic, due to
+a mismatch in the operating system versions of the ``libxml2`` and ``libxslt``
+libraries that ``lxml`` uses. To get around that, you can compile a static
+``lxml`` egg using the following buildout recipe::
+
+    [buildout]
+    # lxml should be first in the parts list
+    parts =
+        lxml
+        xdv
+    
+    [lxml]
+    recipe = z3c.recipe.staticlxml
+    egg = lxml
+    libxml2-url = http://xmlsoft.org/sources/libxml2-2.7.6.tar.gz
+    libxslt-url = http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz
+    
+    [xdv]
+    recipe = zc.recipe.egg
+    eggs = xdv
+
+Once installed, you should find ``xdvcompiler`` and ``xdvrun`` in your
+``bin`` directory.
+
 Rules file syntax
 =================
 
@@ -173,41 +219,39 @@
 Order of rule execution
 -----------------------
 
-XXX: Laurence needs to check this
-
 In most cases, you should not care too much about the inner workings of the
 XDV compiler. However, it can sometimes be useful to understand the order
 in which rules are applied.
 
-1. ``<drop />`` rules referring to the *content* are applied first. Thus,
-   anything that is dropped from the content will never be matched by any
-   other rule.
-2. ``<before />`` rules execute next, followed by ``<after />`` rules.
-3. ``<replace />`` rules execute next.
-4. ``<prepend />``, ``<copy />`` and ``<append />`` rules are then executed.
-5. Finally, ``<drop />`` rules referring to the *theme* are applied, meaning
-   they can also match elements that have landed in the theme as a result of
-   one of the above rules.
+1. ``<before />`` rules are always executed first.
+2. ``<drop />`` rules are executed next.
+3. ``<replace />`` rules are executed next, provided no ``<drop />`` rule was
+   applied to the same theme node.
+4. ``<prepend />``, ``<copy />`` and ``<append />`` rules execute next,
+   provided no ``<replace />`` rule was applied to the same theme node.
+5. ``<after />`` rules are executed last.
 
 Behaviour if theme or content is not matched
 --------------------------------------------
 
-XXX: Laurence needs to check this - is it correct? Does the same rule apply
-to all rules, or only to <copy /> and <replace />?
-
 If a rule does not match the theme (whether or not it matches the content),
 it is silently ignored.
 
-If a rule matches the theme, but not the content, the matched element will
-be dropped in the theme::
+If a ``<replace />`` rule matches the theme, but not the content, the matched
+element will be dropped in the theme::
 
     <replace css:theme="#header" content="#header-element" />
 
-If the element with id ``header-element`` is not found in the content, the
-placeholder with id ``header`` in the theme is removed.
+Here, if the element with id ``header-element`` is not found in the content,
+the placeholder with id ``header`` in the theme is removed.
+
+Similarly, the contents of a theme node matched with a ``<copy />`` rule will
+be dropped if there is no matching content. Another way to think of this is
+that if no content node is matched, XDV uses an empty node when copying or
+replacing.
 
-If you want the placeholder to stay put, you can make this a conditional
-rule::
+If you want the placeholder to stay put in the case of a missing content node,
+you can make this a conditional rule::
 
     <replace css:theme="#header" content="#header-element" if-content="" />
 
@@ -222,8 +266,6 @@
 Conditional rules
 ~~~~~~~~~~~~~~~~~
 
-XXX: Laurence needs to check this
-
 Sometimes, it is useful to apply a rule only if a given element appears or
 does not appear in the markup. The ``if-content`` attribute can be used with
 any rule to make it conditional.
@@ -236,9 +278,8 @@
     <drop css:theme="#portlet-wrapper" if-content="not(//*[@class='portlet'])"/>
 
 This will copy all elements with class ``portlet`` into the ``portlets``
-element. If there are no matching elements in the content, the ``portlets``
-element will be dropped as normal. However, we also drop the
-``portlet-wrapper`` element in this case, as it is presumably superfluous.
+element. If there are no matching elements in the content we drop the
+``portlet-wrapper`` element, which is presumably superfluous.
 
 Here is another example using CSS selectors::
 
@@ -256,11 +297,25 @@
     <copy css:theme="#header" css:content="#header-box > *" css:if-content="#header-box > *"/>
     <copy css:theme="#header" css:content="#header-box > *" css:if-content=""/>
 
+If there are multiple rules of the same type with the same ``them``
+expression and different ``if-content`` expressions, they will be as an
+if..else if...else block::
+
+    <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
+    <copy theme="/html/body/h1" content="//h1[@id='first-heading']/text()" if-content="//h1[@id='first-heading']"/>
+    <copy theme="/html/body/h1" content="/html/head/title/text()" />
+
+These rules all attempt to fill the text in the ``<h1 />`` inside the body.
+The first rule looks for a similar ``<h1 />`` tag and uses its text. If that
+doesn't match, the second rule looks for any ``<h1 />`` with id
+``first-heading``, and uses its text. If that doesn't match either, the
+final rule will be used as a fallback (since it has no ``if-content``),
+taking the contents of the ``<title />`` tag in the head of the content
+document.
+
 Including external content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-XXX: Laurence needs to check/complete this
-
 Normally, the ``content`` attribute of any rule selects nodes from the
 response being returned by the underlying dynamic web server. However, it is
 possible to include content from a different URL using the ``href`` attribute
@@ -318,72 +373,169 @@
 Modifying the theme on the fly
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-XXX: Laurence needs to check/complete this
+Sometimes, the theme is almost perfect, but cannot be modified, for example
+because it is being served from a remote location that you do not have access
+to, or because it is shared with other applications.
+
+XDV allows you to modify the theme using "inline" markup in the rules file.
+You can think of this as a rule where the matched ``content`` is explicitly
+stated in the rules file, rather than pulled from the response being styled.
+
+For example::
+
+    <xdv:rules
+        xmlns:xdv="http://namespaces.plone.org/xdv"
+        xmlns:css="http://namespaces.plone.org/xdv+css"
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        >
+
+        <xdv:append theme="/html/head">
+            <style type="text/css">
+                /* From the rules */
+                body > h1 { color: red; }
+            </style>
+        </xdv:append>
+
+    </xdv:rules>
+
+Notice how we have placed the rules in an explicit ``xdv`` namespace, so that
+we can write the "inline" HTML without a namespace.
+
+In the example above, the ``<append />`` rule will copy the ``<style />``
+attribute and its contents into the ``<head />`` of the theme. Similar rules
+can be constructed for ``<copy />``, ``<replace />``, ``<prepend />``, 
+``<before />`` or ``<after />``.
+
+It is even possible to insert XSLT instructions into the compiled theme in
+this manner. Having declared the ``xsl`` namespace as shown above, we can do
+something like this::
+
+    <xdv:replace css:theme="#details">
+        <dl id="details">
+            <xsl:for-each css:select="table#details > tr">
+                <dt><xsl:copy-of select="td[1]/text()"/></dt>
+                <dd><xsl:copy-of select="td[2]/node()"/></dd>
+            </xsl:for-each>
+        </dl>
+    </xdv:replace>
+
+Note that css expressions are converted to "placeless" XPath expressions,
+so ``css:select="table#details > tr"`` converts to
+``select="//table[@id='details]/tr"``. This means it would not be possible to
+use ``css:select="td:first-child > *"`` as you want a relative selector here.
+You can, of course, just use a manual XPath in a ``select`` attribute instead.
+
+XInclude
+~~~~~~~~
+
+You may wish to re-use elements of your rules file across multiple themes.
+This is particularly useful if you have multiple variations on the same theme
+used to style different pages on a particular website.
+
+Rules files can be included using the XInclude protocol. By default, XInclude
+processing is disabled (since it is a slight performance hit at compile
+time), but it can be enabled in the XDV compiler using a command line option.
+
+Inclusions use standard XInclude syntax. For example::
+
+    <rules
+        xmlns="http://namespaces.plone.org/xdv"
+        xmlns:css="http://namespaces.plone.org/xdv+css"
+        xmlns:xi="http://www.w3.org/2001/XInclude">
+        
+        <xi:include href="standard-rules.xml" />
+    
+    </rules>
 
 Compilation
 ===========
 
-XXX: Laurence needs to check/complete this - do we need a CSS pre-processing
- step?
-
 Once you have written your rules file, you need to compile it to an XSLT for
 deployment. In some cases, you may have an application server that does this
 on the fly, e.g. if you are using the ``collective.xdv`` package with Plone.
 For deployment to a web server like Apache or nginx, however, you will need
 to perform this step manually.
 
-Compilation uses the XSLT file ``compiler.xsl``. The easiest way to run this
-is with the ``xsltproc`` command, which should come installed with
-``libxslt``. You will need to install ``libxslt`` if you don't have it already.
-
-To execute the compiler::
-
-    $ xsltproc --nonet --html compiler.xsl theme.html > compiledtheme.xsl
-
-This will look for a rules file called ``rules.xml`` in the current directory.
-If you need to specify an alternative file, you can do::
-
-    $ xsltproc --nonet --html --stringparam rulesuri rules.xml compiler.xsl theme.html > compiledtheme.xsl
-
-There are various other parameters which can be specified using the
-``--stringparam`` syntax:
-
-* ``rulesuri``, which gives a URI or filename to the rules file.
-* ``boilerplateurl``, which gives a URL to the ``boilerplate.xsl`` file.
-  You probably don't need to override this.
-* ``extraurl``, which gives a URL to an XSLT file which will be inserted into
-  the compiled theme. Use this to include arbitrary XSLT instructions in the
-  compiled theme.
-* ``trace``, which can be set to 1 to enable debug tracing during the
-  compilation step.
-* ``includemode``, which can be set to one of ``document``, ``ssi`` or
-  ``esi`` to specify the default inclusion method for external content when
-  using the ``href`` attribute.
-* ``ssiprefix``, ``ssisuffix``, which can be used to add a prefix or suffix to
-  a URI generated for SSI inclusion.
-* ``ssiquerysuffix``, which can be used to change the ``;filter_xpath=``
-  request variable name in a URL generated for SSI inclusion.
-* ``esiprefix``, ``esisuffix`` and ``esiquerysuffix``, which serve the same
-  function for ESI inclusions.
+The easiest way to invoke the XDV compiler is via the ``xdvcompiler`` command
+line script which is installed with the ``xdv`` egg. To see its help output,
+do::
+
+    $ bin/xdvcompiler --help
+
+To run the compiler with ``rules.xml`` operating on ``theme.html``::
+
+    $ bin/xdvcompiler rules.xml theme.html
+
+This will print the compiled XSLT file to the standard output. You can save
+it to a file instead using::
+
+    $ bin/xdvcompiler -o theme.xsl rules.xml theme.html
+
+The following command line options are available:
+
+* Use ``-p`` to pretty-print the output for improved readability. There is a
+  risk that this could alter rendering in the browser, though, as browsers
+  are sensitive to some kinds of whitespace.
+* Use ``-a`` to set an absolute prefix - see below.
+* Use ``-i`` to set the default external file inclusion mode to one of
+  ``document``, ``ssi`` or ``esi``.
+* Use ``-e`` to specify an "extras" XSLT file to be included in the compiled
+  theme. This allows you to include arbitrary XSLT instructions beyond what
+  XDV creates for you.
+* Use ``--trace`` to output trace logging during the compilation step. This
+  can be helpful in debugging rules.
+* Use ``--xinclude`` to process XInclude instructions in the rules file.
+
+Check the output of the ``--help`` option for more details.
+
+Absolute prefix
+---------------
+
+The compiler can be passed an "absolute prefix". This is a string that will be
+prefixed to any *relative* URL referenced an image, link or stylesheet in the
+theme HTML file, before the theme is passed to the compiler. This allows a
+theme to be written so that it can be opened and views standalone on the
+filesystem, even if at runtime its static resources are going to be served
+from some other location.
+
+For example, say the theme is written with relative URLs for images and
+external resources, such as ``<img src="images/foo.jpg" />``. When the
+compiled theme is applied to a live site, this is unlikely to work for
+any URL other than a sibling of the ``images`` folder.
+
+Let's say the theme's static resources are served from a simple web server
+and made available under the directory ``/static``. In this case, we can
+set an absolute prefix of ``/static``. This will modify the ``<img />`` tag
+in the compiled theme so that it becomes an absolute path that will work for
+any URL: ``<img src="/static/images/foo.jpg"`` />
 
 Testing the compiled theme
 --------------------------
 
 To test the compiled theme, you can apply it to a static file representing
-the content, e.g. with::
+the content. The easiest way to do this is via the ``xdvrun`` script::
+
+    $ bin/xdvrun theme.xsl content.html
+
+This will print the output to the standard output. You can save it to a file
+instead with::
+
+    $ bin/xdvrun -o output.html theme.xsl content.html
 
-    $ xsltproc --nonet --html compiledtheme.xsl content.html > output.html
+For testing, you can also compile and run the theme in one go, by using the
+``-r`` (rules) and ``-t`` (theme) arguments to ``xdvrun``::
 
-Open ``output.html`` to see the transformed theme.
+    $ bin/xdvrun -o output.html -r rules.xml -t theme.html content.html
+
+To see the built-in help for this command, run::
+    
+    $ bin/xdvrun --help
 
 Compiling the theme in Python code
 ----------------------------------
 
-XXX: Laurence needs to check this
-
-XDV can be used without Python, but it is primarily distributed as part of
-the ``xdv`` Python package. This provides a test suite and certain utilities.
-One of those utilities is a method to compile an XDV XSLT file::
+You can run the XDV compiler from Python code using the following helper
+function::
 
     >>> from xdv.compiler import compile_theme
 
@@ -399,15 +551,8 @@
 * ``xinclude`` can be set to ``True`` to enable XInclude support (at a
   moderate speed cost). If enabled, XInclude syntax can be used to split the
   rules file into multiple, re-usable fragments.
-* ``absolute_prefix`` can be set to a string that will be prefixed to any
-  *relative* URL referenced in an image, link or stylesheet in the theme
-  HTML file before the theme is passed to the compiler. This allows a
-  theme to be written so that it can be opened and views standalone on the
-  filesystem, even if at runtime its static resources are going to be
-  served from some other location. For example, an
-  ``<img src="images/foo.jpg" />`` can be turned into 
-  ``<img src="/static/images/foo.jpg" />`` with an ``absolute_prefix`` of
-  "/static".
+* ``absolute_prefix`` can be set an string to be used as the "absolute prefix"
+  for relative URLs - see above.
 * ``update`` can be set to ``False`` to disable the automatic update support
   for the old Deliverance 0.2 namespace (for a moderate speed gain)
 * ``trace`` can be set to True to enable compiler trace information
@@ -428,6 +573,7 @@
 format. To set up a transform representing the theme and rules, you can do::
 
     from lxml import etree
+    from xdv.compiler import compile_theme
     
     extraurl = None
     absolute_prefix = "/static"

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Tue Mar 23 17:26:02 2010
@@ -179,7 +179,7 @@
                       help="relative urls in the theme file will be made into absolute links with this prefix.",
                       dest="absolute_prefix", default=None)
     parser.add_option("-i", "--includemode", metavar="INC",
-                      help="include mode (document or ssi)",
+                      help="include mode (document, ssi or esi)",
                       dest="includemode", default=None)
     (options, args) = parser.parse_args()
     

From ldr at codespeak.net  Wed Mar 24 02:53:52 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 02:53:52 +0100 (CET)
Subject: [z3-checkins] r72679 - z3/xdv/trunk
Message-ID: <20100324015352.ADBA6282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 02:53:51 2010
New Revision: 72679

Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/setup.py
Log:
documentation update

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Wed Mar 24 02:53:51 2010
@@ -34,7 +34,7 @@
 
 The rules file is written using a simple XML syntax. Elements in the theme
 and "content" (the dynamic website) can be identified using CSS3 or XPath
-syntax.
+selectors.
 
 Once you have a theme HTML file and a rules XML file, you compile these using
 the XDV compiler into a single XSLT file. You can then deploy this XSLT file
@@ -80,11 +80,16 @@
     recipe = zc.recipe.egg
     eggs = xdv
 
-Note that ``lxml`` is a dependency of ``xdv``. On some operating systems,
-notably Mac OS X, installing a "good" ``lxml`` egg can be problematic, due to
-a mismatch in the operating system versions of the ``libxml2`` and ``libxslt``
-libraries that ``lxml`` uses. To get around that, you can compile a static
-``lxml`` egg using the following buildout recipe::
+Note that ``lxml`` is a dependency of ``xdv``, so you may need to install the
+libxml2 and libxslt development packages in order for it to build. On
+Debian/Ubuntu you can run::
+
+    $ sudo apt-get install libxslt1-dev
+
+On some operating systems, notably Mac OS X, installing a "good" ``lxml`` egg
+can be problematic, due to a mismatch in the operating system versions of the
+``libxml2`` and ``libxslt`` libraries that ``lxml`` uses. To get around that,
+you can compile a static ``lxml`` egg using the following buildout recipe::
 
     [buildout]
     # lxml should be first in the parts list
@@ -122,8 +127,8 @@
 Here we have defined two namespaces: the default namespace is used for rules
 and XPath selectors. The ``css`` namespace is used for CSS3 selectors. These
 are functionally equivalent. In fact, CSS selectors are replaced by the
-equivalent XPath selector the pre-processing step of the compiler. Thus, they
-have no performance impact.
+equivalent XPath selector during the pre-processing step of the compiler.
+Thus, they have no performance impact.
 
 XDV supports complex CSS3 and XPath selectors, including things like the
 ``nth-child`` pseudo-selector. You are advised to consult a good reference
@@ -196,7 +201,7 @@
 wanted the box below the content instead, we could do::
 
     <after css:theme="#content" css:content="#info-box" />
-    
+
 ``<drop />``
 ------------
 
@@ -247,7 +252,7 @@
 
 Similarly, the contents of a theme node matched with a ``<copy />`` rule will
 be dropped if there is no matching content. Another way to think of this is
-that if no content node is matched, XDV uses an empty node when copying or
+that if no content node is matched, XDV uses an empty nodeset when copying or
 replacing.
 
 If you want the placeholder to stay put in the case of a missing content node,
@@ -297,8 +302,8 @@
     <copy css:theme="#header" css:content="#header-box > *" css:if-content="#header-box > *"/>
     <copy css:theme="#header" css:content="#header-box > *" css:if-content=""/>
 
-If there are multiple rules of the same type with the same ``them``
-expression and different ``if-content`` expressions, they will be as an
+If multiple rules of the same type match the same theme node but have
+different ``if-content`` expressions, they will be combined as an
 if..else if...else block::
 
     <copy theme="/html/body/h1" content="/html/body/h1/text()" if-content="/html/body/h1"/>
@@ -399,7 +404,7 @@
     </xdv:rules>
 
 Notice how we have placed the rules in an explicit ``xdv`` namespace, so that
-we can write the "inline" HTML without a namespace.
+we can write the "inline" HTML without a namespace prefix.
 
 In the example above, the ``<append />`` rule will copy the ``<style />``
 attribute and its contents into the ``<head />`` of the theme. Similar rules
@@ -443,10 +448,12 @@
         xmlns:css="http://namespaces.plone.org/xdv+css"
         xmlns:xi="http://www.w3.org/2001/XInclude">
         
-        <xi:include href="standard-rules.xml" />
+        <xi:include href="standard-rules.xml#xpointer(/*/node())" />
     
     </rules>
 
+An xpointer is used so as not to pull in the outer <rules> element.
+
 Compilation
 ===========
 
@@ -603,18 +610,177 @@
 Plone
 -----
 
-nginx
+See the `collective.xdv <http://plone.org/products/collective.xdv>`_
+documentation for details.
+
+Nginx
 -----
 
-XXX: Laurence needs to check this
+XDV currently requires a version of Nginx with xslt html parsing support
+patched in. The latest patched version may be downloaded from the `html-xslt
+project page <http://code.google.com/p/html-xslt/>`_.
+
+When building Nginx, make sure to enable the xslt module::
+
+    $ ./configure --with-http_xslt_module
+
+If libxml2 or libxslt are installed in a non-standard location you may need to
+supply the ``--with-libxml2=/opt`` and ``--with-libxslt=/opt`` options. This requires that you
+set an appropriate ``LD_LIBRARY_PATH`` (Linux / BSD) or ``DYLD_LIBRARY_PATH`` (Mac OS
+X) environment variable when running Nginx.
+
+For theming a static site, enable the xsl transform as follows::
+
+    location / {
+        xslt_stylesheet /path/to/compiled-theme.xsl;
+        xslt_html_parser on;
+        xslt_types text/html;
+    }
+
+Nginx may also be configured as a transforming proxy server::
+
+    location / {
+        xslt_stylesheet /path/to/compiled-theme.xsl;
+        xslt_html_parser on;
+        xslt_types text/html;
+        rewrite ^(.*)$ /VirtualHostBase/http/localhost/Plone/VirtualHostRoot$1 break;
+        proxy_pass http://127.0.0.1:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-XDV "true";
+        proxy_set_header Accept-Encoding "";
+    }
+
+Removing the Accept-Encoding header is sometimes necessary to prevent the
+backend server compressing the response (and preventing transformation). The
+response may be compressed in Nginx by setting ``gzip on;`` - see the `gzip
+module documentation <http://wiki.nginx.org/NginxHttpGzipModule>`_ for
+details. In this example an X-XDV header was set so the backend server may
+choose to serve different different CSS resources.
+
+Including external content
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As an event based server, it is not practical to add ``document()`` support to
+the Nginx XSLT module for in-transform inclusion. Instead, external content is
+included through SSI in a subrequest.
+
+Example nginx.conf::
+
+    worker_processes  1;
+    events {
+        worker_connections  1024;
+    }
+    http {
+        include mime.types;
+        gzip on;
+        server {
+            listen 80;
+            server_name localhost;
+            root html;
+
+            # Decide if we need to filter
+            if ($args ~ "^(.*);filter_xpath=(.*)$") {
+                set $newargs $1;
+                set $filter_xpath $2;
+                # rewrite args to avoid looping
+                rewrite    ^(.*)$    /_include$1?$newargs?;
+            }
+
+            location @include500 { return 500; }
+            location @include404 { return 404; }
+
+            location ^~ /_include {
+                # Restrict _include (but not ?;filter_xpath=) to subrequests
+                internal;
+                error_page 404 = @include404;
+                # Cache page fragments in Varnish for 1h when using ESI mode
+                expires 1h;
+                # Proxy
+                rewrite    ^/_include(.*)$    $1    break;
+                proxy_pass http://127.0.0.1:80;
+                # Protect against infinite loops
+                proxy_set_header X-Loop 1$http_X_Loop; # unary count
+                proxy_set_header Accept-Encoding "";
+                error_page 500 = @include500;
+                if ($http_X_Loop ~ "11111") {
+                    return 500;
+                }
+                # Filter by xpath
+                xslt_stylesheet filter.xsl
+                    xpath=$filter_xpath
+                    ;
+                xslt_html_parser on;
+                xslt_types text/html;
+            }
+
+            location / {
+                xslt_stylesheet theme.xsl;
+                xslt_html_parser on;
+                xslt_types text/html;
+                ssi on; # Not required in ESI mode
+            }
+        }
+    }
+
+In this example the subrequest is set to loop back on itself, so the include
+is taken from a themed page. ``filter.xsl`` (in the lib/xdv directory) and
+``theme.xsl`` should both be placed in the same directory as ``nginx.conf``.
+
+An example buildout is available in ``nginx.cfg``.
 
 Varnish
 -------
 
-XXX: Laurence needs to check this
+To enable ESI in Varnish simply add the following to your VCL file::
+
+    sub vcl_fetch {
+        if (obj.http.Content-Type ~ "text/html") {
+            esi;
+        }
+    }
+
+An example buildout is available in ``varnish.cfg``.
 
 Apache
 ------
 
-XXX: Laurence needs to check this
+XDV currently requires a version of mod_transform with html parsing support
+and a disabled mod_depends. The latest patched versions may be downloaded from
+the `html-xslt project page <http://code.google.com/p/html-xslt/>`_.
+
+As well as the libxml2 and libxslt development packages, you will require
+libapreq2 and the Apache development pacakges::
+
+    $ sudo apt-get install libxslt1-dev libapache2-mod-apreq2 libapreq2-dev apache2-threaded-dev
+
+Install mod_depends then mod_transform using the standard procedure::
+
+    $ ./configure
+    $ make
+    $ sudo make install
+
+Example virtual host configuration (e.g. /etc/apache2/sites-available/default)::
+
+    NameVirtualHost *
+    LoadModule depends_module /usr/lib/apache2/modules/mod_depends.so
+    LoadModule transform_module /usr/lib/apache2/modules/mod_transform.so
+    <VirtualHost *>
+
+        FilterDeclare THEME
+        FilterProvider THEME XSLT resp=Content-Type $text/html
+
+        TransformOptions +ApacheFS +HTML
+        TransformSet /theme.xsl
+        TransformCache /theme.xsl /etc/apache2/theme.xsl
+
+        <LocationMatch "/">
+            FilterChain THEME
+        </LocationMatch>
+        
+    </VirtualHost>
+
+The +ApacheFS directive enables content XSLT ``document()`` inclusion.
 
+Unfortunately it is not possible to theme error responses (such as a 404 Not
+Found page) with Apache as these do not pass through the filter chain.

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 02:53:51 2010
@@ -3,16 +3,18 @@
     name='xdv',
     version='0.3a1',
     description='''\
-xdv implements a subset of Deliverance using a pure XSLT engine. With xdv, you
+XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple
 transform on each request thereafter. Alternatively, compile your theme during
-development, check it into Subversion, and not touch xdv during deployment.''',
+development, check it into Subversion, and not touch XDV during deployment.''',
+    long_description=open("README.txt").read(),
     packages=find_packages('lib'),
     package_dir = {'':'lib'},
     include_package_data=True,
-    zip_safe=False,
-    author='Laurence Rowe',
-    author_email='laurence at lrowe.co.uk',
+    zip_safe=False
+    author='Paul Everitt, Laurence Rowe and Martin Aspeli.'
+    maintainer='Laurence Rowe',
+    maintainer_email='laurence at lrowe.co.uk',
     license='New BSD',
     install_requires=[
         'setuptools',

From ldr at codespeak.net  Wed Mar 24 02:55:14 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 02:55:14 +0100 (CET)
Subject: [z3-checkins] r72680 - z3/xdv/trunk
Message-ID: <20100324015514.838E4282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 02:55:13 2010
New Revision: 72680

Modified:
   z3/xdv/trunk/setup.py
Log:
typo

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 02:55:13 2010
@@ -12,7 +12,7 @@
     package_dir = {'':'lib'},
     include_package_data=True,
     zip_safe=False
-    author='Paul Everitt, Laurence Rowe and Martin Aspeli.'
+    author='Paul Everitt, Laurence Rowe and Martin Aspeli.',
     maintainer='Laurence Rowe',
     maintainer_email='laurence at lrowe.co.uk',
     license='New BSD',

From ldr at codespeak.net  Wed Mar 24 02:55:39 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 02:55:39 +0100 (CET)
Subject: [z3-checkins] r72681 - z3/xdv/trunk
Message-ID: <20100324015539.ECDAE282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 02:55:38 2010
New Revision: 72681

Modified:
   z3/xdv/trunk/setup.py
Log:
typo

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 02:55:38 2010
@@ -11,7 +11,7 @@
     packages=find_packages('lib'),
     package_dir = {'':'lib'},
     include_package_data=True,
-    zip_safe=False
+    zip_safe=False,
     author='Paul Everitt, Laurence Rowe and Martin Aspeli.',
     maintainer='Laurence Rowe',
     maintainer_email='laurence at lrowe.co.uk',

From ldr at codespeak.net  Wed Mar 24 02:58:23 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 02:58:23 +0100 (CET)
Subject: [z3-checkins] r72682 - z3/xdv/trunk/templates
Message-ID: <20100324015823.71B74282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 02:58:22 2010
New Revision: 72682

Modified:
   z3/xdv/trunk/templates/nginx.conf.in
Log:
make nginx.conf template match docs

Modified: z3/xdv/trunk/templates/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/templates/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Wed Mar 24 02:58:22 2010
@@ -39,6 +39,7 @@
             
             # Our safety belt.
             proxy_set_header X-Loop 1$http_X_Loop; # unary count
+            proxy_set_header Accept-Encoding "";
             error_page 500 = @include500;
             if ($http_X_Loop ~ "11111") {
                 return 500;

From ldr at codespeak.net  Wed Mar 24 03:08:01 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:08:01 +0100 (CET)
Subject: [z3-checkins] r72683 - z3/xdv/trunk
Message-ID: <20100324020801.C372C282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:08:00 2010
New Revision: 72683

Modified:
   z3/xdv/trunk/setup.py
Log:
author email

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 03:08:00 2010
@@ -13,6 +13,7 @@
     include_package_data=True,
     zip_safe=False,
     author='Paul Everitt, Laurence Rowe and Martin Aspeli.',
+    author_email='deliverance-devel at lists.coactivate.org',
     maintainer='Laurence Rowe',
     maintainer_email='laurence at lrowe.co.uk',
     license='New BSD',

From ldr at codespeak.net  Wed Mar 24 03:09:02 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:09:02 +0100 (CET)
Subject: [z3-checkins] r72684 - in z3/xdv/trunk/lib/xdv: . tests/010
Message-ID: <20100324020902.80AB5282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:09:01 2010
New Revision: 72684

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
Log:
simplify the compiler

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Wed Mar 24 03:09:01 2010
@@ -223,13 +223,20 @@
         <xsl:variable name="matching-rules" select="$rules//*[dv:matches/dv:xmlid=$thisxmlid]"/>
         <xsl:choose>
             <xsl:when test="$matching-rules">
+                <xsl:call-template name="trace-path"/>
+                <!-- Before -->
+                <xsl:call-template name="trace"><xsl:with-param name="rule-name">before</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='before']"/></xsl:call-template>
+                <xsl:apply-templates select="$matching-rules[local-name()='before']" mode="conditional-include"/>
                 <!--
                     Pass control to first rule template
                 -->
-                <xsl:call-template name="before">
+                <xsl:call-template name="drop">
                     <xsl:with-param name="matching-rules" select="$matching-rules"/>
                     <xsl:with-param name="rules" select="$rules"/>
                 </xsl:call-template>
+                <!-- After -->
+                <xsl:call-template name="trace"><xsl:with-param name="rule-name">after</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='after']"/></xsl:call-template>
+                <xsl:apply-templates select="$matching-rules[local-name()='after']" mode="conditional-include"/>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:copy>
@@ -261,23 +268,6 @@
     <!--
         Rule templates
     -->
-
-    <xsl:template name="before">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">before</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-
-        <xsl:apply-templates select="$matching-this" mode="conditional-include"/>
-
-        <xsl:call-template name="drop">
-            <xsl:with-param name="matching-rules" select="$matching-other"/>
-            <xsl:with-param name="rules" select="$rules"/>
-        </xsl:call-template>
-    </xsl:template>
-
     <xsl:template name="drop">
         <xsl:param name="matching-rules"/>
         <xsl:param name="rules"/>
@@ -289,13 +279,8 @@
             <xsl:when test="$matching-this[not(@if-content)]">
                 <!--
                     Do nothing.  We want to get rid of this node
-                    in the theme.
+                    in the theme. Next rule is `after`.
                 -->
-                <!-- jump to after rules -->
-                <xsl:call-template name="after">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
             </xsl:when>
             <xsl:when test="$matching-this/@if-content">
                 <!--
@@ -365,11 +350,6 @@
                             <xsl:call-template name="include">
                                 <xsl:with-param name="rule" select="."/>
                             </xsl:call-template>
-                            <!-- jump to after rules -->
-                            <xsl:call-template name="after">
-                                <xsl:with-param name="matching-rules" select="$matching-other"/>
-                                <xsl:with-param name="rules" select="$rules"/>
-                            </xsl:call-template>
                         </xsl:element>
                     </xsl:for-each>
                     <xsl:choose>
@@ -380,11 +360,6 @@
                                 <xsl:call-template name="include">
                                     <xsl:with-param name="rule" select="$unconditional"/>
                                 </xsl:call-template>
-                                <!-- jump to after rules -->
-                                <xsl:call-template name="after">
-                                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                                    <xsl:with-param name="rules" select="$rules"/>
-                                </xsl:call-template>
                             </xsl:element>
                         </xsl:when>
                         <xsl:otherwise>
@@ -404,11 +379,6 @@
                 <xsl:call-template name="include">
                     <xsl:with-param name="rule" select="$unconditional"/>
                 </xsl:call-template>
-                <!-- jump to after rules -->
-                <xsl:call-template name="after">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:call-template name="prepend-copy-append">
@@ -426,8 +396,7 @@
         <xsl:variable name="matching-this" select="$matching-rules[local-name()='prepend' or local-name()='copy' or local-name()='append']"/>
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-        <xsl:choose>
-            <xsl:when test="$matching-this">
+
                 <xsl:copy>
                     <!-- Theme attributes -->
                     <xsl:apply-templates select="@*" mode="apply-rules">
@@ -499,42 +468,9 @@
                     <xsl:apply-templates select="$matching-rules[local-name()='append']" mode="conditional-include"/>
 
                 </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="pass" select="node()|@*">
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="after">
-            <xsl:with-param name="matching-rules" select="$matching-rules"/>
-            <xsl:with-param name="rules" select="$rules"/>
-        </xsl:call-template>
-    </xsl:template>
-
-    <xsl:template name="after">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">after</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 
-        <xsl:apply-templates select="$matching-this" mode="conditional-include"/>
-        
-        <!-- Last rule template -->
     </xsl:template>
 
-    <xsl:template name="pass">
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">pass</xsl:variable>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/></xsl:call-template>
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="apply-rules">
-                <xsl:with-param name="rules" select="$rules"/>
-            </xsl:apply-templates>
-        </xsl:copy>
-    </xsl:template>
 
     <!--
         Content inclusion
@@ -649,7 +585,7 @@
         <xsl:param name="rule-name"/>
         <xsl:param name="matching" select="/.."/>
         <xsl:if test="$trace">
-            <xsl:message>TRACE: <xsl:call-template name="printpath"/> - <xsl:value-of select="$rule-name"/></xsl:message>
+            <xsl:if test="not($matching)"><xsl:message>TRACE: (<xsl:value-of select="$rule-name"/>)</xsl:message></xsl:if>
             <xsl:for-each select="$matching">
                 <xsl:message>RULE: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
                     <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
@@ -657,8 +593,12 @@
         </xsl:if>
     </xsl:template>
 
-    <xsl:template name="printpath"
-        ><xsl:for-each select="ancestor::*">/<xsl:value-of select="name()"/>[<xsl:number/>]</xsl:for-each
-        >/<xsl:value-of select="name()"/>[<xsl:number/>]</xsl:template>
+    <xsl:template name="trace-path">
+        <xsl:if test="$trace">
+            <xsl:message>THEME: <xsl:for-each select="ancestor-or-self::*"><xsl:variable name="this" select="."
+                />/<xsl:value-of select="name()"/><xsl:choose><xsl:when test="@id">[@id='<xsl:value-of select="@id"/>']</xsl:when><xsl:when test="preceding-sibling::*[name()=name($this)]|following-sibling::*[name()=name($this)]">[<xsl:number/>]</xsl:when></xsl:choose></xsl:for-each></xsl:message>
+        </xsl:if>
+    </xsl:template>
+
 
 </xsl:stylesheet>

Modified: z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	Wed Mar 24 03:09:01 2010
@@ -37,7 +37,7 @@
             <div id="portlets"><xsl:choose><xsl:when test="//*[@id='aaa']"><xsl:copy-of select="//*[@class='portlet']"/></xsl:when><xsl:otherwise>
                 <div class="portlet" id="portlet1">Portlet</div>
             </xsl:otherwise></xsl:choose></div>
-        <xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='manage-portlets-link']"/></xsl:if></div><xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='bbb']"/></xsl:if></xsl:otherwise></xsl:choose>
+        <xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='manage-portlets-link']"/></xsl:if></div></xsl:otherwise></xsl:choose><xsl:if test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='bbb']"/></xsl:if>
         <xsl:choose><xsl:when test="//*[@class='portlet']"><xsl:copy-of select="//*[@id='footer']"/></xsl:when><xsl:otherwise><div id="footer">Footer</div></xsl:otherwise></xsl:choose>
     </body></html>
     </xsl:template>

From ldr at codespeak.net  Wed Mar 24 03:10:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:10:10 +0100 (CET)
Subject: [z3-checkins] r72686 - z3/xdv/trunk
Message-ID: <20100324021010.5A924282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:10:08 2010
New Revision: 72686

Modified:
   z3/xdv/trunk/setup.py
Log:
0.3a2

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 03:10:08 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name='xdv',
-    version='0.3a1',
+    version='0.3a2',
     description='''\
 XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple

From ldr at codespeak.net  Wed Mar 24 03:13:09 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:13:09 +0100 (CET)
Subject: [z3-checkins] r72687 - z3/xdv/trunk
Message-ID: <20100324021309.69271282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:13:07 2010
New Revision: 72687

Modified:
   z3/xdv/trunk/setup.py
Log:
remove maintainer, it overwrites the author info

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Wed Mar 24 03:13:07 2010
@@ -13,9 +13,7 @@
     include_package_data=True,
     zip_safe=False,
     author='Paul Everitt, Laurence Rowe and Martin Aspeli.',
-    author_email='deliverance-devel at lists.coactivate.org',
-    maintainer='Laurence Rowe',
-    maintainer_email='laurence at lrowe.co.uk',
+    author_email='laurence at lrowe.co.uk',
     license='New BSD',
     install_requires=[
         'setuptools',

From ldr at codespeak.net  Wed Mar 24 03:15:43 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:15:43 +0100 (CET)
Subject: [z3-checkins] r72688 - z3/xdv/trunk
Message-ID: <20100324021543.70F4E282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:15:41 2010
New Revision: 72688

Modified:
   z3/xdv/trunk/README.txt
Log:
typo

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Wed Mar 24 03:15:41 2010
@@ -780,7 +780,7 @@
         
     </VirtualHost>
 
-The +ApacheFS directive enables content XSLT ``document()`` inclusion.
+The +ApacheFS directive enables XSLT ``document()`` inclusion.
 
 Unfortunately it is not possible to theme error responses (such as a 404 Not
 Found page) with Apache as these do not pass through the filter chain.

From ldr at codespeak.net  Wed Mar 24 03:25:53 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 24 Mar 2010 03:25:53 +0100 (CET)
Subject: [z3-checkins] r72689 - z3/xdv/tags/0.3a2
Message-ID: <20100324022553.6FF2C282BD6@codespeak.net>

Author: ldr
Date: Wed Mar 24 03:25:51 2010
New Revision: 72689

Added:
   z3/xdv/tags/0.3a2/
      - copied from r72688, z3/xdv/trunk/
Log:
tag 0.3a2

From optilude at codespeak.net  Wed Mar 24 03:57:51 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 03:57:51 +0100 (CET)
Subject: [z3-checkins] r72690 - z3/xdv/trunk
Message-ID: <20100324025751.D7F7F282BD6@codespeak.net>

Author: optilude
Date: Wed Mar 24 03:57:50 2010
New Revision: 72690

Modified:
   z3/xdv/trunk/README.txt
Log:
Expand documentation a bit

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Wed Mar 24 03:57:50 2010
@@ -607,29 +607,79 @@
 Deployment
 ==========
 
+Before it can be used, the deployed theme needs to be deployed to a proxying
+web server which can apply the XSLT to the response coming back from another
+web application.
+
+In theory, any XSLT processor will do. In practice, however, most websites
+do not produce 100% well-formed XML (i.e. they do not conform to the XHTML
+"strict" doctype). For this reason, it is normally necessary to use an XSLT
+processor that will parse the content using a more lenient parser with some
+knowledge of HTML. libxml2, the most popular XML processing library on Linux
+and similar operating systems, contains such a parser.
+
 Plone
 -----
 
-See the `collective.xdv <http://plone.org/products/collective.xdv>`_
-documentation for details.
+If you are working with Plone, the easiest way to use XDV is via the
+`collective.xdv <http://pypi.python.org/pypi/collective.xdv>`_ add-on. This
+provides a control panel for configuring the XDV rules file, theme and
+other options, and hooks into a transformation chain that executes after
+Plone has rendered the final page to apply the XDV transform.
+
+Even if you intend to deploy the compiled theme to another web server,
+``collective.xdv`` is a useful development tool: so long as Zope is in
+"development mode", it will re-compile the theme on the fly, allowing you
+to make changes to theme and rules on the fly. It also provides some tools
+for packaging up your theme and deploying it to different sites.
 
-Nginx
+nginx
 -----
 
-XDV currently requires a version of Nginx with xslt html parsing support
-patched in. The latest patched version may be downloaded from the `html-xslt
-project page <http://code.google.com/p/html-xslt/>`_.
+To deploy an XDV theme to the `nginx <http://nginx.org>`_ web server, you
+will need to compile nginx with a special version of the XSLT module that
+can (optionally) use the HTML parser from libxml2.
+
+In the future, the necessary patches to enable HTML mode parsing will
+hopefully be part of the standard nginx distribution. In the meantime,
+they are maintained in the `html-xslt <http://code.google.com/p/html-xslt/>`_
+project.
 
-When building Nginx, make sure to enable the xslt module::
+Using a properly patched nginx, you can configure it with XSLT support like
+so::
 
     $ ./configure --with-http_xslt_module
 
+If you are using zc.buildout and would like to build nginx, you can start
+with the following example::
+
+    [buildout]
+    parts =
+        ...
+        nginx
+    
+    ...
+        
+    [nginx]
+    recipe = zc.recipe.cmmi
+    url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-2.tar.gz
+    extra_options =
+        --conf-path=${buildout:directory}/etc/nginx.conf
+        --sbin-path=${buildout:directory}/bin
+        --error-log-path=${buildout:directory}/var/log/nginx-error.log
+        --http-log-path=${buildout:directory}/var/log/nginx-access.log
+        --pid-path=${buildout:directory}/var/nginx.pid
+        --lock-path=${buildout:directory}/var/nginx.lock
+        --with-http_stub_status_module
+        --with-http_xslt_module
+
 If libxml2 or libxslt are installed in a non-standard location you may need to
-supply the ``--with-libxml2=/opt`` and ``--with-libxslt=/opt`` options. This requires that you
-set an appropriate ``LD_LIBRARY_PATH`` (Linux / BSD) or ``DYLD_LIBRARY_PATH`` (Mac OS
-X) environment variable when running Nginx.
+supply the ``--with-libxml2=<path>`` and ``--with-libxslt=<path>`` options.
+This requires that you set an appropriate ``LD_LIBRARY_PATH`` (Linux / BSD) or
+``DYLD_LIBRARY_PATH`` (Mac OS X) environment variable when running nginx.
 
-For theming a static site, enable the xsl transform as follows::
+For theming a static site, enable the XSLT transform in the nginx
+configuration as follows::
 
     location / {
         xslt_stylesheet /path/to/compiled-theme.xsl;
@@ -637,7 +687,7 @@
         xslt_types text/html;
     }
 
-Nginx may also be configured as a transforming proxy server::
+nginx may also be configured as a transforming proxy server::
 
     location / {
         xslt_stylesheet /path/to/compiled-theme.xsl;
@@ -653,19 +703,22 @@
 
 Removing the Accept-Encoding header is sometimes necessary to prevent the
 backend server compressing the response (and preventing transformation). The
-response may be compressed in Nginx by setting ``gzip on;`` - see the `gzip
+response may be compressed in nginx by setting ``gzip on;`` - see the `gzip
 module documentation <http://wiki.nginx.org/NginxHttpGzipModule>`_ for
-details. In this example an X-XDV header was set so the backend server may
-choose to serve different different CSS resources.
+details.
+
+In this example an X-XDV header was set so the backend server may choose to
+serve different different CSS resources.
 
 Including external content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As an event based server, it is not practical to add ``document()`` support to
-the Nginx XSLT module for in-transform inclusion. Instead, external content is
-included through SSI in a subrequest.
-
-Example nginx.conf::
+the nginx XSLT module for in-transform inclusion. Instead, external content is
+included through SSI in a sub-request. The SSI sub-request includes a query
+string parameter to indicate which parts of the resultant document to include,
+called ``;filter_xpath`` - see above for a full example. The configuration
+below uses this parameter to apply a filter::
 
     worker_processes  1;
     events {
@@ -723,11 +776,11 @@
         }
     }
 
-In this example the subrequest is set to loop back on itself, so the include
+In this example the sub-request is set to loop back on itself, so the include
 is taken from a themed page. ``filter.xsl`` (in the lib/xdv directory) and
 ``theme.xsl`` should both be placed in the same directory as ``nginx.conf``.
 
-An example buildout is available in ``nginx.cfg``.
+An example buildout is available in ``nginx.cfg`` in this package.
 
 Varnish
 -------
@@ -760,7 +813,7 @@
     $ make
     $ sudo make install
 
-Example virtual host configuration (e.g. /etc/apache2/sites-available/default)::
+An example virtual host configuration is shown below::
 
     NameVirtualHost *
     LoadModule depends_module /usr/lib/apache2/modules/mod_depends.so

From optilude at codespeak.net  Wed Mar 24 13:38:53 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 13:38:53 +0100 (CET)
Subject: [z3-checkins] r72701 - in z3:
	deliverance/sandboxes/optilude/dv.xdvserver dv.xdvserver
Message-ID: <20100324123853.43B9E282BD6@codespeak.net>

Author: optilude
Date: Wed Mar 24 13:38:51 2010
New Revision: 72701

Added:
   z3/dv.xdvserver/
      - copied from r72700, z3/deliverance/sandboxes/optilude/dv.xdvserver/
Removed:
   z3/deliverance/sandboxes/optilude/dv.xdvserver/
Log:
Move this to a more normal location

From optilude at codespeak.net  Wed Mar 24 15:37:06 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 15:37:06 +0100 (CET)
Subject: [z3-checkins] r72713 - z3/dv.xdvserver/trunk/dv/xdvserver
Message-ID: <20100324143706.9B2F9282BDC@codespeak.net>

Author: optilude
Date: Wed Mar 24 15:37:05 2010
New Revision: 72713

Modified:
   z3/dv.xdvserver/trunk/dv/xdvserver/   (props changed)
   z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
Log:
Move to use new XDV package

Modified: z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
==============================================================================
--- z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	(original)
+++ z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	Wed Mar 24 15:37:05 2010
@@ -1,5 +1,7 @@
-import os.path
 import re
+import urllib2
+import pkg_resources
+import os.path
 
 from lxml import etree
 
@@ -8,7 +10,7 @@
 from paste.wsgilib import intercept_output
 from paste.deploy.converters import asbool
 
-from dv.xdvserver.xdvcompiler import compile_theme
+from xdv.copmiler import compile_theme
 
 IGNORE_EXTENSIONS = ['js', 'css', 'gif', 'jpg', 'jpeg', 'pdf', 'ps', 'doc',
                      'png', 'ico', 'mov', 'mpg', 'mpeg', 'mp3', 'm4a', 'txt',
@@ -18,7 +20,49 @@
 
 IGNORE_URL_PATTERN = re.compile("^.*\.(%s)$" % '|'.join(IGNORE_EXTENSIONS))
 HTML_DOC_PATTERN = re.compile(r"^.*<\s*html(\s*|>).*$",re.I|re.M)
-IMPORT_STYLESHEET_PATTERN = re.compile('@import url\\([\'"](.+)[\'"]\\);', re.I)
+
+class ExternalResolver(etree.Resolver):
+    """Resolver for external absolute paths (including protocol)
+    """
+    
+    def resolve(self, system_url, public_id, context):
+        
+        # Expand python:// URI to file:// URI
+        url = resolveURL(system_url.lower())
+        
+        # Resolve file:// URIs as absolute file paths
+        if url.startswith('file://'):
+            filename = url[7:]
+            return self.resolve_filename(filename, context)
+        
+        # Resolve other standard URIs with urllib2
+        if (
+            url.startswith('http://') or
+            url.startswith('https://') or
+            url.startswith('ftp://')
+        ):
+            return self.resolve_file(urllib2.urlopen(url), context)
+
+def resolveURL(url):
+    """Resolve the input URL to an actual URL.
+    
+    This can resolve python://dotted.package.name/file/path URLs to file://
+    URIs.
+    """
+    
+    if not url:
+        return url
+    
+    if url.lower().startswith('python://'):
+        spec = url[9:]
+        filename = pkg_resources.resource_filename(*spec.split('/', 1))
+        if filename:
+            if os.path.sep != '/':
+                filename = filename.replace(os.path.sep, '/')
+                return 'file:///%s' % filename
+            return 'file://%s' % filename
+    
+    return url
 
 class XSLTMiddleware(object):
     """Apply XSLT in middleware
@@ -42,7 +86,7 @@
         
         self.ignore_paths = []
         if ignore_paths:
-            ignore_paths = [s.strip() for s in ignore_paths.split('\n') if s.strip()]
+            ignore_paths = [s.strip() for s in ignore_paths if s.strip()]
             for p in ignore_paths:
                 self.ignore_paths.append(re.compile(p))
         
@@ -117,79 +161,90 @@
     """Invoke the Deliverance xdv transform as middleware
     """
     
-    def __init__(self, app, global_conf, theme, rules, compiler=None,
-                    boilerplate=None, live=False, absolute_prefix=None, notheme=None,
-                    theme_uri=None, extraurl=None):
+    def __init__(self, app, global_conf, live=False, rules=None, theme=None, extra=None,
+                 css=True, xinclude=False, absolute_prefix=None, update=False,
+                 includemode='document', notheme=None,
+                 # BBB parameters
+                 theme_uri=None, extraurl=None):
         """Create the middleware. The parameters are:
         
-            theme
-                URI or file name from which to pull the theme
-            rules
-                Filename or path to the rules file
-            compiler
-                Filename or path to the compiler XSLT. A bundled version of
-                the xdv compiler.xsl will be used if this is not set.
-            boilerplate
-                Filename or path to the boilerplate XSLT file that the
-                compiler expects to be able to use. A bundled version from
-                xdv will be used if this is not set.
-            live
-                If set to true, the theme will be recompiled on each
-                request. The default is to compile the theme on startup only.
-            absolute_prefix
-                If set to a string, then all relative image and CSS references
-                in the theme will be prefixed by this string.
-            notheme
-                Newline-separtated list of paths that should not be themed.
-                May include regular expressions.
-            extraurl
-                Optional filename or path to an extra xslt file that will be used 
-                when compiling
+        * ``rules``, the rules file
+        * ``theme``, the theme file
+        * ``extra``, an optional XSLT file with XDV extensions
+        * ``css``, can be set to False to disable CSS syntax support (providing
+          a  moderate speed gain)
+        * ``xinclude`` can be set to True to enable XInclude support (at a
+          moderate speed cost)
+        * ``absolute_prefix`` can be set to a string that will be prefixed to
+          any *relative* URL referenced in an image, link or stylesheet in the
+          theme HTML file before the theme is passed to the compiler. This
+          allows a theme to be written so that it can be opened and views
+          standalone on the filesystem, even if at runtime its static
+          resources are going to be served from some other location. For
+          example, an ``<img src="images/foo.jpg" />`` can be turned into 
+          ``<img src="/static/images/foo.jpg" />`` with an ``absolute_prefix``
+          of "/static".
+        * ``update`` can be set to False to disable the automatic update support for
+          the old Deliverance 0.2 namespace (for a moderate speed gain)
+        * ``includemode`` can be set to 'document', 'esi' or 'ssi' to change
+          the way in which includes are processed
+        * ``live``, set to True to recompile the theme on each request
+        * ``notheme``, a list of regular expressions for paths which should
+          not be themed.
         """
         
+        if isinstance(notheme, basestring):
+            notheme = [p for p in notheme.split('\n') if p.strip()]
+        
         self.app = app
         self.global_conf = global_conf
         
-        self.theme = theme
-        
-        # For BBB
-        if not theme and theme_uri:
-            self.theme = theme_uri
-        
-        self.compiler = compiler
-        self.boilerplate = boilerplate
-        self.extraurl = extraurl
-        self.rules = rules
-        
+        self.rules = resolveURL(rules)
+        self.theme = resolveURL(theme or theme_uri) # theme_uri is for BBB
+        self.extra = resolveURL(extra or extraurl) # extraurl is for BBB
+        self.css = css
+        self.xinclude = xinclude
         self.absolute_prefix = absolute_prefix
+        self.update = update
+        self.includemode = includemode
 
-        if compiler is None:
-            self.compiler = os.path.join(os.path.split(__file__)[0], 'compiler', 'compiler.xsl')
-
-        if not os.path.isfile(self.compiler):
-            raise ValueError("Compiler XSLT %s does not exist" % self.compiler)
-        if boilerplate and not os.path.isfile(self.boilerplate):
-            raise ValueError("Boilerplate XSLT %s does not exist" % self.boilerplate)
-        if extraurl and not os.path.isfile(self.extraurl):
-            raise ValueError("Extraurl XSLT %s does not exist" % self.extraurl)
-        
-        if not os.path.isfile(self.rules):
-            raise ValueError("Rules file %s does not exist" % self.rules)
-        
         self.live = asbool(live)
         self.notheme = notheme
-        self.transform = self.get_transform()
+        
+        self.transform = None
     
     def compile_theme(self):
-        return compile_theme(self.compiler, self.theme, self.rules,
-                             self.boilerplate, self.absolute_prefix, self.extraurl)
+        resolver = ExternalResolver()
+        
+        rules_parser = etree.XMLParser(recover=False)
+        rules_parser.resolvers.add(resolver)
+        
+        theme_parser = etree.HTMLParser()
+        theme_parser.resolvers.add(resolver)
+        
+        compiler_parser = etree.XMLParser()
+        compiler_parser.resolvers.add(resolver)
+        
+        return compile_theme(self.rules, self.theme,
+                extra=self.extra,
+                css=self.css,
+                xinclude=self.xinclude,
+                absolute_prefix=self.absolute_prefix,
+                update=self.update,
+                inclduemode=self.includemode,
+                compiler_parser=self.compiler_parser,
+                parser=self.theme_parser,
+                rules_parser=self.rules_parser,
+            )
     
     def get_transform(self):
-        return XSLTMiddleware(self.app, self.global_conf, 
-                                ignore_paths=self.notheme, xslt_source=self.compile_theme())
+        return XSLTMiddleware(self.app, self.global_conf,
+                ignore_paths=self.notheme,
+                xslt_source=self.compile_theme()
+            )
     
     def __call__(self, environ, start_response):
         transform = self.transform
-        if self.live:
+        if transform is None or self.live:
             transform = self.get_transform()
         return transform(environ, start_response)

From optilude at codespeak.net  Wed Mar 24 15:45:56 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 15:45:56 +0100 (CET)
Subject: [z3-checkins] r72715 - z3/dv.xdvserver/trunk
Message-ID: <20100324144556.9E215282BDC@codespeak.net>

Author: optilude
Date: Wed Mar 24 15:45:55 2010
New Revision: 72715

Modified:
   z3/dv.xdvserver/trunk/setup.py
Log:
This script now comes from xdv

Modified: z3/dv.xdvserver/trunk/setup.py
==============================================================================
--- z3/dv.xdvserver/trunk/setup.py	(original)
+++ z3/dv.xdvserver/trunk/setup.py	Wed Mar 24 15:45:55 2010
@@ -31,9 +31,6 @@
           # -*- Extra requirements: -*-
       ],
       entry_points="""
-      [console_scripts]
-      xdvcompiler = dv.xdvserver.xdvcompiler:compile
-      
       [paste.filter_app_factory]
       xslt = dv.xdvserver.filter:XSLTMiddleware
       xdv = dv.xdvserver.filter:XDVMiddleware

From optilude at codespeak.net  Wed Mar 24 16:05:29 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 16:05:29 +0100 (CET)
Subject: [z3-checkins] r72724 - in z3/dv.xdvserver/trunk: . dv/xdvserver
Message-ID: <20100324150529.03593282BDC@codespeak.net>

Author: optilude
Date: Wed Mar 24 16:05:28 2010
New Revision: 72724

Modified:
   z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
   z3/dv.xdvserver/trunk/setup.py
Log:
Fix various typos

Modified: z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
==============================================================================
--- z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	(original)
+++ z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	Wed Mar 24 16:05:28 2010
@@ -10,7 +10,7 @@
 from paste.wsgilib import intercept_output
 from paste.deploy.converters import asbool
 
-from xdv.copmiler import compile_theme
+from xdv.compiler import compile_theme
 
 IGNORE_EXTENSIONS = ['js', 'css', 'gif', 'jpg', 'jpeg', 'pdf', 'ps', 'doc',
                      'png', 'ico', 'mov', 'mpg', 'mpeg', 'mp3', 'm4a', 'txt',
@@ -68,20 +68,21 @@
     """Apply XSLT in middleware
     """
     
-    def __init__(self, app, global_conf, ignore_paths=None, xslt_file=None, xslt_source=""):
+    def __init__(self, app, global_conf, ignore_paths=None, xslt_file=None, xslt_source="", xslt_tree=None):
         """Initialise, giving a filename or file pointer for an XSLT file.
         """
         
         self.app = app
         self.global_conf = global_conf
-
-        if xslt_file is not None:
+        
+        if xslt_file:
             xslt_file = open(xslt_file)
             xslt_source = xslt_file.read()
             xslt_file.close()
         
-        xslt_source = xslt_source
-        xslt_tree = etree.fromstring(xslt_source)
+        if xslt_source:
+            xslt_tree = etree.fromstring(xslt_source)
+        
         self.transform = etree.XSLT(xslt_tree)
         
         self.ignore_paths = []
@@ -202,7 +203,7 @@
         self.rules = resolveURL(rules)
         self.theme = resolveURL(theme or theme_uri) # theme_uri is for BBB
         self.extra = resolveURL(extra or extraurl) # extraurl is for BBB
-        self.css = css
+        self.css = asbool(css)
         self.xinclude = xinclude
         self.absolute_prefix = absolute_prefix
         self.update = update
@@ -231,20 +232,22 @@
                 xinclude=self.xinclude,
                 absolute_prefix=self.absolute_prefix,
                 update=self.update,
-                inclduemode=self.includemode,
-                compiler_parser=self.compiler_parser,
-                parser=self.theme_parser,
-                rules_parser=self.rules_parser,
+                includemode=self.includemode,
+                compiler_parser=compiler_parser,
+                parser=theme_parser,
+                rules_parser=rules_parser,
             )
     
     def get_transform(self):
         return XSLTMiddleware(self.app, self.global_conf,
                 ignore_paths=self.notheme,
-                xslt_source=self.compile_theme()
+                xslt_tree=self.compile_theme()
             )
     
     def __call__(self, environ, start_response):
         transform = self.transform
         if transform is None or self.live:
             transform = self.get_transform()
+        if transform is not None and not self.live:
+            self.transform = transform
         return transform(environ, start_response)

Modified: z3/dv.xdvserver/trunk/setup.py
==============================================================================
--- z3/dv.xdvserver/trunk/setup.py	(original)
+++ z3/dv.xdvserver/trunk/setup.py	Wed Mar 24 16:05:28 2010
@@ -28,7 +28,7 @@
           'PasteDeploy',
           'PasteScript',
           'lxml',
-          # -*- Extra requirements: -*-
+          'xdv',
       ],
       entry_points="""
       [paste.filter_app_factory]

From optilude at codespeak.net  Wed Mar 24 16:44:39 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Wed, 24 Mar 2010 16:44:39 +0100 (CET)
Subject: [z3-checkins] r72730 - z3/xdv/trunk
Message-ID: <20100324154439.03E38282BDC@codespeak.net>

Author: optilude
Date: Wed Mar 24 16:44:38 2010
New Revision: 72730

Modified:
   z3/xdv/trunk/README.txt
Log:
Document dv.xdvserver option

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Wed Mar 24 16:44:38 2010
@@ -633,6 +633,19 @@
 to make changes to theme and rules on the fly. It also provides some tools
 for packaging up your theme and deploying it to different sites.
 
+WSGI
+----
+
+If you are using a WSGI stack, you can use the `dv.xdvserver
+<http://pypi.python.org/pypi/dv.xdvserver>`_ middleware to apply an XDV
+theme. This supports all the core XDV options, and can be configured to
+either re-compile the theme on the fly (useful for development), or compile
+it only once (useful for deployment.)
+
+It is also possible to use this with the Paste ``proxy`` middleware to
+create a standalone XDV proxy for any site. See the `dv.xdvserver`_
+documentation for details.
+
 nginx
 -----
 

From optilude at codespeak.net  Fri Mar 26 03:21:53 2010
From: optilude at codespeak.net (optilude at codespeak.net)
Date: Fri, 26 Mar 2010 03:21:53 +0100 (CET)
Subject: [z3-checkins] r72872 - z3/xdv/trunk
Message-ID: <20100326022153.6DE12282BE4@codespeak.net>

Author: optilude
Date: Fri Mar 26 03:21:45 2010
New Revision: 72872

Modified:
   z3/xdv/trunk/README.txt
Log:
Improve the first paragraph a bit

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Fri Mar 26 03:21:45 2010
@@ -7,10 +7,12 @@
 Introduction
 ============
 
-XDV is an implementation of the Deliverance concept using pure XSLT. In short,
-it is a way to apply a style/theme to a dynamic website.
+XDV is an implementation of the `Deliverance`_ concept using pure XSLT. In
+short, it is a way to apply a style/theme contained in a static HTML web page
+(usually with related CSS, JavaScript and image resources) to a dynamic
+website created using any server-side technology.
 
-Consider a scenario where you have some dynamic website, to which you want to
+Consider a scenario where you have a dynamic website, to which you want to
 apply a theme built by a web designer. The web designer is not familiar with
 the technology behind the dynamic website, and so has supplied a "static HTML"
 version of the site. This consists of an HTML file with more-or-less semantic
@@ -850,3 +852,5 @@
 
 Unfortunately it is not possible to theme error responses (such as a 404 Not
 Found page) with Apache as these do not pass through the filter chain.
+
+.. _Deliverance: http://deliverance.openplans.org/

From ejucovy at codespeak.net  Tue Mar 30 18:44:14 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Tue, 30 Mar 2010 18:44:14 +0200 (CEST)
Subject: [z3-checkins] r73185 -
	z3/deliverance/DeliveranceVHoster/trunk/dvhoster
Message-ID: <20100330164414.4B17C282B9D@codespeak.net>

Author: ejucovy
Date: Tue Mar 30 18:44:12 2010
New Revision: 73185

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py
Log:
don't normalize domain name bc regex doesn't accept IP addresses, and this doesn't seem too important anyway

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py	Tue Mar 30 18:44:12 2010
@@ -68,9 +68,9 @@
         Normalize a domain name (lower case, no funny characters).
         """
         domain_name = domain_name.strip().lower()
-        if not domain_re.search(domain_name):
-            raise ValueError(
-                'Bad domain name: %r' % domain_name)
+        #if not domain_re.search(domain_name):
+        #    raise ValueError(
+        #        'Bad domain name: %r' % domain_name)
         return domain_name
 
     def domain(self, domain_name, aliases=()):