Implement request #12: DOAP documents for all pastes

diff --git a/ChangeLog b/ChangeLog
index 7e45b7d52608793f0f9ff4e386340042765049d8..afefa9afa245d166e6157e87ccfd9560faafc9f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-16  Christian Weiske  <cweiske@cweiske.de>
+
+       * Implement request #12: DOAP documents for all pastes
+

 2012-09-08  Christian Weiske  <cweiske@cweiske.de>
 
        * Fix bug #11: do not index edit, delete and tool pages
 2012-09-08  Christian Weiske  <cweiske@cweiske.de>
 
        * Fix bug #11: do not index edit, delete and tool pages

diff --git a/data/templates/display.htm b/data/templates/display.htm
index 6d84c463a510613ec3ea9554adc15d316ff667ca..5bcb0162adcc1f49f1a4e81f18e97daef0d41934 100644 (file)
--- a/data/templates/display.htm
+++ b/data/templates/display.htm
@@ -3,6 +3,10 @@
  {{repo.getTitle}}
 {% endblock %}
 
  {{repo.getTitle}}
 {% endblock %}
 

+{% block meta %}
+<link rel="meta" title="DOAP" type="application/rdf+xml" href="{{repo.getLink('doap')}}"/>
+{% endblock %}
+

 {% block content %}
  {% include 'display-head.htm' %}
 
 {% block content %}
  {% include 'display-head.htm' %}
 

diff --git a/data/templates/doap.htm b/data/templates/doap.htm
new file mode 100644 (file)
index 0000000..5302dd4
--- /dev/null
+++ b/data/templates/doap.htm
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       xmlns="http://usefulinc.com/ns/doap#">
+ <Project rdf:about="{{link}}">
+  <name>{{repo.getTitle}}</name>
+  <homepage rdf:resource="{{link}}" />
+  <created>{{date}}</created>
+  {% if repo.getCloneURL(true) %}
+  <repository>
+   <GitRepository>
+    <location rdf:resource="{{repo.getCloneURL(true)}}" />
+    <browse rdf:resource="{{link}}" />
+   </GitRepository>
+  </repository>
+  {%endif %}
+ </Project>
+</rdf:RDF>

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index 448982baa2da6c54252731382fd746cc61d832e9..46b2f6526fa4d2ee083a6e541141361ce638a436 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -228,6 +228,8 @@ class Repository
             return '/' . $this->id;
         } else if ($type == 'fork') {
             return '/' . $this->id . '/fork';
             return '/' . $this->id;
         } else if ($type == 'fork') {
             return '/' . $this->id . '/fork';

+        } else if ($type == 'doap') {
+            return '/' . $this->id . '/doap';

         } else if ($type == 'delete') {
             return '/' . $this->id . '/delete';
         } else if ($type == 'delete-confirm') {
         } else if ($type == 'delete') {
             return '/' . $this->id . '/delete';
         } else if ($type == 'delete-confirm') {

diff --git a/www/.htaccess b/www/.htaccess
index a8f2eedc4b3e60e3f7e5b62d77a41e026d1c454b..c379b234b9b81c63b7b176561f4068cdca2d2dcf 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -5,6 +5,7 @@ RewriteBase /
 RewriteRule ^([0-9]+)$ /display.php?id=$1
 RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1
 RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1
 RewriteRule ^([0-9]+)$ /display.php?id=$1
 RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1
 RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1

+RewriteRule ^([0-9]+)/doap$ /doap.php?id=$1

 RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1
 RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
 RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2
 RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1
 RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
 RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2

diff --git a/www/doap.php b/www/doap.php
new file mode 100644 (file)
index 0000000..db00df4
--- /dev/null
+++ b/www/doap.php
@@ -0,0 +1,21 @@
+<?php
+namespace phorkie;
+/**
+ * Display DOAP of the paste.
+ * Contains a machine-readable project description with Git URL.
+ */
+require_once 'www-header.php';
+
+$repo = new Repository();
+$repo->loadFromRequest();
+
+header('Content-Type: application/rdf+xml');
+render(
+    'doap',
+    array(
+        'repo' => $repo,
+        'date' => date('Y-m-d', end($repo->getHistory())->committerTime),
+        'link' => Tools::fullUrl($repo->getLink('display'))
+    )
+);
+?>