Changeset 312

Timestamp:

05/25/06 17:04:25 (6 years ago)

Author:

nick

Message:

Include the categories in the Feeds, in the appropriate places

Location:

wiki-toolkit/trunk

Files:

• lib/Wiki/Toolkit/Feed/Atom.pm (modified) (2 diffs)
• lib/Wiki/Toolkit/Feed/RSS.pm (modified) (2 diffs)
• t/296_feed_rss_recentchanges_add_test_data.t (modified) (1 diff)
• t/297_feed_rss_recentchanges.t (modified) (2 diffs)
• t/301_feed_atom_add_test_data.t (modified) (1 diff)
• t/302_feed_atom_recentchanges.t (modified) (2 diffs)

wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/Atom.pm

@@ -154 +154 @@
        $title =~ s/>/>/g;
 
-    # TODO: Store categories in the atom:category element (4.2.2)
+    # Pop the categories into atom:category elements (4.2.2)
+    # We can do this because the spec says:
+    #   "This specification assigns no meaning to the content (if any) 
+    #    of this element."
+    # TODO: Decide if we should include the "all categories listing" url
+    #        as the scheme (URI) attribute?
+    my $category_atom;
+    if($node->{metadata}->{category}) {
+        foreach my $cat (@{ $node->{metadata}->{category} }) {
+            $category_atom .= "    <category term=\"$cat\" />\n";
+        }
+    }
+
     # TODO: Find an Atom equivalent of ModWiki, so we can include more info
     
@@ -165 +177 @@
     <updated>$item_timestamp</updated>
     <author><name>$author</name></author>
+$category_atom
   </entry>
 };

wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/RSS.pm

@@ -200 +200 @@
        $title =~ s/</&lt;/g;
        $title =~ s/>/&gt;/g;
+
+    # Pop the categories into dublin core subject elements
+    #  (http://dublincore.org/usage/terms/history/#subject-004)
+    # TODO: Decide if we should include the "all categories listing" url
+    #        as the scheme (URI) attribute?
+    my $category_rss;
+    if($node->{metadata}->{category}) {
+        foreach my $cat (@{ $node->{metadata}->{category} }) {
+            $category_rss .= "  <dc:subject>$cat</dc:subject>\n";
+        }
+    }
     
     push @items, qq{
@@ -214 +225 @@
   <modwiki:history>$history_url</modwiki:history>
   <rdfs:seeAlso rdf:resource="$rdf_url" />
+$category_rss
 </item>
 };

wiki-toolkit/trunk/t/296_feed_rss_recentchanges_add_test_data.t

@@ -45 +45 @@
                          { username => "Kake",
                            comment  => "new node",
+               category => [ 'TestCategory1', 'Meta' ]
                          }
                        );

wiki-toolkit/trunk/t/297_feed_rss_recentchanges.t

@@ -5 +5 @@
 
 use Test::More tests =>
-  (3 + 17 * $Wiki::Toolkit::TestConfig::Utilities::num_stores);
+  (3 + 18 * $Wiki::Toolkit::TestConfig::Utilities::num_stores);
 
 use_ok( "Wiki::Toolkit::Feed::RSS" );
@@ -69 +69 @@
       like( $feed, qr|<description>.*\[nou]</description>|,
             "username included in description" );
+
+      like( $feed, qr|<dc:subject>TestCategory1</dc:subject>|,
+            "dublin core subject contains category" );
 
       # Check that interwiki things are passed through right.

wiki-toolkit/trunk/t/301_feed_atom_add_test_data.t

@@ -45 +45 @@
                          { username => "Kake",
                            comment  => "new node",
+               category => [ 'TestCategory1', 'Meta' ]
                          }
                        );

wiki-toolkit/trunk/t/302_feed_atom_recentchanges.t

@@ -5 +5 @@
 
 use Test::More tests =>
-  (3 + 11 * $Wiki::Toolkit::TestConfig::Utilities::num_stores);
+  (3 + 12 * $Wiki::Toolkit::TestConfig::Utilities::num_stores);
 
 use_ok( "Wiki::Toolkit::Feed::Atom" );
@@ -62 +62 @@
             "username included in summary" );
 
+      # Check we also have some categories
+      like( $feed, qr|<category term="TestCategory1" />|,
+            "contains categories" );
+
       # Test the 'items' parameter.
       $feed = $atom->recent_changes( items => 2 );