From 979fd8329b169400522c51c67eb0048cb0476696 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@rubypad>
Date: Wed, 6 Sep 2006 11:19:46 -0400
Subject: [PATCH] FOAF Online Accounts

---
 THANKS                        |   1 +
 examples/foaf-based.ini       |   5 +-
 planet/config.py              |   2 +-
 tests/data/config/eliast.foaf | 178 ++++++++++++++++++++++++++++++++++
 tests/data/config/foaf.ini    |  10 ++
 tests/data/config/rlist.ini   |   3 +-
 tests/test_foaf.py            |  19 +++-
 7 files changed, 212 insertions(+), 6 deletions(-)
 create mode 100644 tests/data/config/eliast.foaf
 create mode 100644 tests/data/config/foaf.ini

diff --git a/THANKS b/THANKS
index 726e560..f7004e7 100644
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,6 @@
 DeWitt Clinton - Mac OSX
 Mary Gardiner - PythonPath
+Elias Torres - FOAF OnlineAccounts
 
 This codebase represents a radical refactoring of Planet 2.0, which lists
 the following contributors:
diff --git a/examples/foaf-based.ini b/examples/foaf-based.ini
index dd4e48a..3ea5f58 100644
--- a/examples/foaf-based.ini
+++ b/examples/foaf-based.ini
@@ -39,5 +39,6 @@ width = 500
 # subscription list
 [http://torrez.us/who#elias]
 content_type = foaf
-online_accounts = http://del.icio.us/|http://del.icio.us/rss/{foaf:accountName}
-    http://flickr.com/|http://api.flickr.com/services/feeds/photos_public.gne?id={foaf:accountName}
+online_accounts = 
+  http://del.icio.us/|http://del.icio.us/rss/{foaf:accountName}
+  http://flickr.com/|http://api.flickr.com/services/feeds/photos_public.gne?id={foaf:accountName}
diff --git a/planet/config.py b/planet/config.py
index a65cd28..312c1f0 100644
--- a/planet/config.py
+++ b/planet/config.py
@@ -12,7 +12,7 @@ Usage:
 
   # administrative / structural information
   print config.template_files()
-  print config.feeds()
+  print config.subscriptions()
 
   # planet wide configuration
   print config.name()
diff --git a/tests/data/config/eliast.foaf b/tests/data/config/eliast.foaf
new file mode 100644
index 0000000..a9e2f7a
--- /dev/null
+++ b/tests/data/config/eliast.foaf
@@ -0,0 +1,178 @@
+<rdf:RDF
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+      xmlns:dc="http://purl.org/dc/elements/1.1/"
+      xmlns:doap="http://usefulinc.com/ns/doap#"
+      xmlns:ical="http://www.w3.org/2002/12/cal/icaltzd#"
+      xmlns:rss="http://purl.org/rss/1.0/"
+      xmlns:foaf="http://xmlns.com/foaf/0.1/">
+<foaf:PersonalProfileDocument rdf:about="http://torrez.us/who">
+	<foaf:maker rdf:resource="http://torrez.us/who#elias"/>
+	<foaf:primaryTopic rdf:resource="http://torrez.us/who#elias"/>
+</foaf:PersonalProfileDocument>
+<foaf:Person rdf:about="http://torrez.us/who#elias">
+	<foaf:name>Elias Torres</foaf:name>
+	<foaf:givenname>Elias</foaf:givenname>
+	<foaf:family_name>Torres</foaf:family_name>
+	<foaf:nick>EliasT</foaf:nick>
+	<foaf:mbox_sha1sum>171e69034f0c1563ed13d66d4abaa8b5d70e4e57</foaf:mbox_sha1sum>
+	<foaf:homepage rdf:resource="http://torrez.us/"/>
+	<foaf:workplaceHomepage rdf:resource="http://www.ibm.com/"/>
+	<foaf:schoolHomepage rdf:resource="http://www.usf.edu/"/>
+	<foaf:schoolHomepage rdf:resource="http://www.harvard.edu/"/>
+	<foaf:aimChatID>rico811</foaf:aimChatID>
+	<foaf:msnChatID>elias_torres@hotmail.com</foaf:msnChatID>
+	
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Dan Smith</foaf:name>
+			<rdfs:seeAlso rdf:resource="http://www.sirpheon.com/foaf.rdf"/>
+			<foaf:mbox_sha1sum>bd4506f3e280442e626b7123d65dc6d7af348906</foaf:mbox_sha1sum>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person rdf:about="http://thefigtrees.net/lee/ldf-card#LDF"> 
+			<foaf:name>Lee Feigenbaum</foaf:name>
+			<foaf:homepage rdf:resource="http://thefigtrees.net/"/>
+			<foaf:mbox_sha1sum>15b51eca0082d66bee850ce4774ff2d9921c1f08</foaf:mbox_sha1sum>
+			<rdfs:seeAlso rdf:resource="http://thefigtrees.net/lee/ldf-card"/>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Dan Connolly</foaf:name>
+			<foaf:homepage rdf:resource="http://www.w3.org/People/Connolly/"/>
+			<foaf:mbox rdf:resource="mailto:connolly@w3.org" />
+			<rdfs:seeAlso>
+				<ical:Vcalendar rdf:about="http://www.w3.org/People/Connolly/home-smart.rdf"/>
+			</rdfs:seeAlso>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>James Snell</foaf:name>
+			<foaf:homepage rdf:resource="http://snellspace.com/"/>
+			<foaf:mbox rdf:resource="mailto:jasnell@us.ibm.com" />
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Sam Ruby</foaf:name>
+			<foaf:mbox_sha1sum>703471c6f39094d88665d24ce72c42fdc5f20585</foaf:mbox_sha1sum>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Mark Pilgrim</foaf:name>
+			<foaf:mbox_sha1sum>85d089d9dc87139d5542aa4ee2822bf65e56b55e</foaf:mbox_sha1sum>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+		      <foaf:name>Eric Miller</foaf:name>
+		      <foaf:mbox_sha1sum>fd1c7fa497930b8b24e3998927fcebe63509ef20</foaf:mbox_sha1sum>
+		      <foaf:homepage rdf:resource="http://purl.org/net/eric/"/>
+		      <foaf:workplaceHomepage rdf:resource="http://www.w3.org/People/EM/"/>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Libby Miller</foaf:name>
+			<foaf:mbox_sha1sum>80f78952ba7c71bc9a0a38de415692922a3f6024</foaf:mbox_sha1sum>
+			<foaf:mbox_sha1sum>289d4d44325d0b0218edc856c8c3904fa3fd2875</foaf:mbox_sha1sum>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Dave Beckett</foaf:name>
+			<foaf:mbox_sha1sum>970987f991961f2553a1bf2574166fa29befbccb</foaf:mbox_sha1sum>
+			<rdfs:seeAlso rdf:resource="http://www.dajobe.org/foaf.rdf"/>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Kendall Grant Clark</foaf:name>
+			<foaf:mbox rdf:resource="mailto:kendall@monkeyfist.com"/>
+			<foaf:mbox rdf:resource="mailto:kclark@ntlug.org"/>
+			<rdfs:seeAlso rdf:resource="http://clark.dallas.tx.us/kendall/foaf.rdf"/>
+		</foaf:Person>
+	</foaf:knows>
+	<foaf:knows>
+		<foaf:Person>
+			<foaf:name>Bijan Parsia</foaf:name>
+			<foaf:mbox_sha1sum>f49a6854842c5fa76dc0edb8e82f8fe04fd56bc9</foaf:mbox_sha1sum>
+		</foaf:Person>
+	</foaf:knows>
+	
+	<foaf:interest>
+		<rdf:Description rdf:about="http://dublincore.org/" 
+			dc:title="Dublin Core Metadata Initiative" />
+	</foaf:interest>
+	<foaf:interest>
+		<rdf:Description rdf:about="http://www.w3.org/RDF/" 
+			dc:title="Resource Description Framework (RDF)" /> 
+	</foaf:interest>
+	<foaf:interest>
+		<rdf:Description rdf:about="http://purl.org/rss/" 
+			dc:title="RDF Site Summary (RSS 1.0)" />
+	</foaf:interest>
+	<foaf:interest>
+		<rdf:Description rdf:about="http://www.w3.org/2000/01/sw/" 
+			dc:title="Semantic Web" /> 
+	</foaf:interest>
+	<foaf:interest>
+		<rdf:Description rdf:about="http://www.atomenabled.org/"
+			dc:title="Atom" /> 
+	</foaf:interest>
+
+	<rdfs:seeAlso>
+		<ical:Vcalendar rdf:about="http://torrez.us/elias/school.ics" />
+	</rdfs:seeAlso>
+
+  <foaf:weblog> 
+    <foaf:Document rdf:about="http://torrez.us/"> 
+      <dc:title>Elias Torres</dc:title> 
+      <rdfs:seeAlso> 
+        <rss:channel rdf:about="http://torrez.us/feed/rdf"> 
+          <foaf:maker rdf:resource="http://torrez.us/who#elias"/> 
+          <foaf:topic rdf:resource="http://www.w3.org/2001/sw/"/> 
+          <foaf:topic rdf:resource="http://www.w3.org/RDF/"/> 
+        </rss:channel> 
+      </rdfs:seeAlso> 
+    </foaf:Document> 
+  </foaf:weblog> 
+
+  <foaf:holdsAccount> 
+    <foaf:OnlineAccount> 
+      <foaf:accountServiceHomepage rdf:resource="http://del.icio.us/"/> 
+      <foaf:accountName>eliast</foaf:accountName> 
+    </foaf:OnlineAccount> 
+  </foaf:holdsAccount> 
+  <foaf:holdsAccount> 
+    <foaf:OnlineAccount> 
+      <foaf:accountServiceHomepage rdf:resource="http://flickr.com/"/> 
+      <foaf:accountName>77366516@N00</foaf:accountName> 
+    </foaf:OnlineAccount> 
+  </foaf:holdsAccount> 
+  
+</foaf:Person>
+<rdf:Description rdf:about="http://rdflib.net#">
+  <doap:developer rdf:resource="http://torrez.us/who#elias"/>
+</rdf:Description>
+
+<!--
+<foaf:Person rdf:about="http://torrez.us/who#alejandra">
+	<foaf:name>Alejandra Torres</foaf:name>
+	<foaf:mbox_sha1sum>9cb53a79c6290901979a1887ccfb422b399c530f</foaf:mbox_sha1sum>
+</foaf:Person>
+<foaf:Person rdf:about="http://torrez.us/who#briana">
+	<foaf:name>Briana Torres</foaf:name>
+	<foaf:mbox_sha1sum>0848c584116ae83e03e89f85698ae63151e6dc84</foaf:mbox_sha1sum>
+</foaf:Person>
+<foaf:Person rdf:about="http://torrez.us/who#noah">
+	<foaf:name>Noah Torres</foaf:name>
+	<foaf:mbox_sha1sum>0e2b5e875c7646a20199d751760c354b4f7cfa2b</foaf:mbox_sha1sum>
+</foaf:Person>
+-->
+
+</rdf:RDF>
diff --git a/tests/data/config/foaf.ini b/tests/data/config/foaf.ini
new file mode 100644
index 0000000..db7a7fb
--- /dev/null
+++ b/tests/data/config/foaf.ini
@@ -0,0 +1,10 @@
+[Planet]
+name = FOAF Test Configuration
+cache_directory = tests/work/config/cache
+
+[tests/data/config/eliast.foaf]
+content_type = foaf
+online_accounts =
+  http://del.icio.us/|http://del.icio.us/rss/{foaf:accountName}
+  http://flickr.com/|http://api.flickr.com/services/feeds/photos_public.gne?id={foaf:accountName}
+
diff --git a/tests/data/config/rlist.ini b/tests/data/config/rlist.ini
index 595f0c6..4d1ed03 100644
--- a/tests/data/config/rlist.ini
+++ b/tests/data/config/rlist.ini
@@ -1,6 +1,5 @@
 [Planet]
-name = Test Configuration
-output_theme = asf
+name = OPML Test Configuration
 cache_directory = tests/work/config/cache
 
 [tests/data/config/opml.xml]
diff --git a/tests/test_foaf.py b/tests/test_foaf.py
index 22eaedb..adc2022 100644
--- a/tests/test_foaf.py
+++ b/tests/test_foaf.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
-import unittest
+import unittest, os, shutil
 from planet.foaf import foaf2config
 from ConfigParser import ConfigParser
+from planet import config
+
+workdir = 'tests/work/config/cache'
 
 blogroll = 'http://journal.dajobe.org/journal/2003/07/semblogs/bloggers.rdf'
 testfeed = "http://dannyayers.com/feed/rdf"
@@ -45,6 +48,11 @@ class FoafTest(unittest.TestCase):
         self.config = ConfigParser()
         self.config.add_section(blogroll)
 
+    def tearDown(self):
+        if os.path.exists(workdir):
+            shutil.rmtree(workdir)
+            os.removedirs(os.path.split(workdir)[0])
+
     #
     # Tests
     #
@@ -74,6 +82,15 @@ class FoafTest(unittest.TestCase):
         foaf2config(test, self.config)
         self.assertEqual('Danny Ayers', self.config.get(testfeed, 'name'))
 
+    def test_online_accounts(self):
+        config.load('tests/data/config/foaf.ini')
+        feeds = config.subscriptions()
+        feeds.sort()
+        self.assertEqual(['http://api.flickr.com/services/feeds/' +
+            'photos_public.gne?id=77366516@N00',
+            'http://del.icio.us/rss/eliast',
+            'http://torrez.us/feed/rdf'], feeds)
+
 # these tests only make sense if libRDF is installed
 try:
     import RDF