Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(html): Add created datetime as a meta tag #1033

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/valid/docfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<thead><tr>
<td class="left"></td>
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
<td class="right">August 2023</td>
<td class="right">September 2023</td>
</tr></thead>
<tfoot><tr>
<td class="left">xml2rfc(1)</td>
Expand All @@ -39,7 +39,7 @@
<dd class="workgroup">xml2rfc(1)</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2023-08-21" class="published">21 August 2023</time>
<time datetime="2023-09-22" class="published">22 September 2023</time>
</dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/draft-miek-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.9.1
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/draft-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.9.1
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
Expand Down
16 changes: 8 additions & 8 deletions tests/valid/indexes.pages.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 30, 2023
Internet-Draft September 22, 2023
Intended status: Experimental
Expires: March 2, 2024
Expires: March 25, 2024


xml2rfc index tests
Expand All @@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on March 2, 2024.
This Internet-Draft will expire on March 25, 2024.

Copyright Notice

Expand All @@ -53,9 +53,9 @@ Table of Contents



Person Expires March 2, 2024 [Page 1]
Person Expires March 25, 2024 [Page 1]

Internet-Draft xml2rfc index tests August 2023
Internet-Draft xml2rfc index tests September 2023


This is another section!
Expand Down Expand Up @@ -109,9 +109,9 @@ Index



Person Expires March 2, 2024 [Page 2]
Person Expires March 25, 2024 [Page 2]

Internet-Draft xml2rfc index tests August 2023
Internet-Draft xml2rfc index tests September 2023


E
Expand Down Expand Up @@ -165,4 +165,4 @@ Author's Address



Person Expires March 2, 2024 [Page 3]
Person Expires March 25, 2024 [Page 3]
6 changes: 3 additions & 3 deletions tests/valid/indexes.prepped.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-08-30T08:01:10" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-09-22T11:10:28" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.18.0 -->


Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="30" month="08" year="2023"/>
<date day="22" month="09" year="2023"/>
<boilerplate>
<section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
<name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
Expand All @@ -41,7 +41,7 @@
material or to cite them other than as "work in progress."
</t>
<t indent="0" pn="section-boilerplate.1-4">
This Internet-Draft will expire on 2 March 2024.
This Internet-Draft will expire on 25 March 2024.
</t>
</section>
<section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
Expand Down
6 changes: 3 additions & 3 deletions tests/valid/indexes.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 30, 2023
Internet-Draft September 22, 2023
Intended status: Experimental
Expires: March 2, 2024
Expires: March 25, 2024


xml2rfc index tests
Expand All @@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on March 2, 2024.
This Internet-Draft will expire on March 25, 2024.

Copyright Notice

Expand Down
10 changes: 5 additions & 5 deletions tests/valid/indexes.v3.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc index tests</td>
<td class="right">August 2023</td>
<td class="right">September 2023</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires March 2, 2024</td>
<td class="center">Expires March 25, 2024</td>
<td class="right">[Page]</td>
</tr></tfoot>
</table>
Expand All @@ -36,12 +36,12 @@
<dd class="internet-draft">indexes-00</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2023-08-30" class="published">August 30, 2023</time>
<time datetime="2023-09-22" class="published">September 22, 2023</time>
</dd>
<dt class="label-intended-status">Intended Status:</dt>
<dd class="intended-status">Experimental</dd>
<dt class="label-expires">Expires:</dt>
<dd class="expires"><time datetime="2024-03-02">March 2, 2024</time></dd>
<dd class="expires"><time datetime="2024-03-25">March 25, 2024</time></dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
<div class="author">
Expand Down Expand Up @@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
<p id="section-boilerplate.1-4">
This Internet-Draft will expire on March 2, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on March 25, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
</section>
</div>
<div id="copyright">
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/manpage.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xml2rfc(1) xml2rfc(1)
30 August 2023
22 September 2023


Xml2rfc Vocabulary Version 3 Schema
Expand Down
3 changes: 2 additions & 1 deletion tests/valid/rfc7911.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
address prefix.
" name="description">
<meta content="xml2rfc 3.18.0" name="generator">
<meta content="2023-09-22T11:16Z" name="created">
<meta content="7911" name="rfc.number">
<!-- Generator version information:
xml2rfc 3.18.0
Expand All @@ -26,7 +27,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.9.1
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
Expand Down
1 change: 1 addition & 0 deletions tests/valid/rfc7911.v3.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
address prefix.
" name="description">
<meta content="xml2rfc 3.18.0" name="generator">
<meta content="2023-09-22T11:16Z" name="created">
<meta content="7911" name="rfc.number">
<link href="tests/input/rfc7911.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down
3 changes: 2 additions & 1 deletion tests/valid/rfc9001.canonical.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
This document describes how Transport Layer Security (TLS) is used to secure
QUIC.
" name="description">
<meta content="xml2rfc 3.15.2" name="generator">
<meta content="xml2rfc 3.18.0" name="generator">
<meta content="2023-09-22T11:22Z" name="created">
<meta content="crypto" name="keyword">
<meta content="opportunistic encryption" name="keyword">
<meta content="plaintext quic" name="keyword">
Expand Down
20 changes: 10 additions & 10 deletions tests/valid/sourcecode.pages.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 30, 2023
Internet-Draft September 22, 2023
Intended status: Experimental
Expires: March 2, 2024
Expires: March 25, 2024


xml2rfc sourcecode tests
Expand All @@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on March 2, 2024.
This Internet-Draft will expire on March 25, 2024.

Copyright Notice

Expand All @@ -53,9 +53,9 @@ Table of Contents



Person Expires March 2, 2024 [Page 1]
Person Expires March 25, 2024 [Page 1]

Internet-Draft xml2rfc sourcecode tests August 2023
Internet-Draft xml2rfc sourcecode tests September 2023


print("01")
Expand Down Expand Up @@ -109,9 +109,9 @@ Internet-Draft xml2rfc sourcecode tests August 2023



Person Expires March 2, 2024 [Page 2]
Person Expires March 25, 2024 [Page 2]

Internet-Draft xml2rfc sourcecode tests August 2023
Internet-Draft xml2rfc sourcecode tests September 2023


print("49")
Expand Down Expand Up @@ -165,9 +165,9 @@ Internet-Draft xml2rfc sourcecode tests August 2023



Person Expires March 2, 2024 [Page 3]
Person Expires March 25, 2024 [Page 3]

Internet-Draft xml2rfc sourcecode tests August 2023
Internet-Draft xml2rfc sourcecode tests September 2023


print("47")
Expand Down Expand Up @@ -221,4 +221,4 @@ Author's Address



Person Expires March 2, 2024 [Page 4]
Person Expires March 25, 2024 [Page 4]
6 changes: 3 additions & 3 deletions tests/valid/sourcecode.prepped.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2023-08-30T08:01:18" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2023-09-22T11:10:35" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.18.0 -->


Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="30" month="08" year="2023"/>
<date day="22" month="09" year="2023"/>
<boilerplate>
<section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
<name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
Expand All @@ -41,7 +41,7 @@
material or to cite them other than as "work in progress."
</t>
<t indent="0" pn="section-boilerplate.1-4">
This Internet-Draft will expire on 2 March 2024.
This Internet-Draft will expire on 25 March 2024.
</t>
</section>
<section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
Expand Down
6 changes: 3 additions & 3 deletions tests/valid/sourcecode.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 30, 2023
Internet-Draft September 22, 2023
Intended status: Experimental
Expires: March 2, 2024
Expires: March 25, 2024


xml2rfc sourcecode tests
Expand All @@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on March 2, 2024.
This Internet-Draft will expire on March 25, 2024.

Copyright Notice

Expand Down
10 changes: 5 additions & 5 deletions tests/valid/sourcecode.v3.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc sourcecode tests</td>
<td class="right">August 2023</td>
<td class="right">September 2023</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires March 2, 2024</td>
<td class="center">Expires March 25, 2024</td>
<td class="right">[Page]</td>
</tr></tfoot>
</table>
Expand All @@ -36,12 +36,12 @@
<dd class="internet-draft">sourcecode-00</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2023-08-30" class="published">August 30, 2023</time>
<time datetime="2023-09-22" class="published">September 22, 2023</time>
</dd>
<dt class="label-intended-status">Intended Status:</dt>
<dd class="intended-status">Experimental</dd>
<dt class="label-expires">Expires:</dt>
<dd class="expires"><time datetime="2024-03-02">March 2, 2024</time></dd>
<dd class="expires"><time datetime="2024-03-25">March 25, 2024</time></dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
<div class="author">
Expand Down Expand Up @@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
<p id="section-boilerplate.1-4">
This Internet-Draft will expire on March 2, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on March 25, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
</section>
</div>
<div id="copyright">
Expand Down
6 changes: 6 additions & 0 deletions xml2rfc/writers/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function, division

import datetime
import lxml
import os
import re
Expand Down Expand Up @@ -473,6 +474,11 @@ def render_rfc(self, h, x):

generator = "%s %s" % (xml2rfc.NAME, xml2rfc.__version__)
add.meta(head, None, name='generator', content=generator)

# o created - date created in UTC timezone using ISO format
current_time = datetime.datetime.now(datetime.timezone.utc)
created = current_time.isoformat(timespec="minutes").replace('+00:00', 'Z')
add.meta(head, None, name='created', content=created)

# o keywords - comma-separated <keyword>s from the XML source

Expand Down
Loading