Changeset 509

Timestamp:

09/20/04 21:05:10 (4 years ago)

Author:

kake

Message:

@INDEX_LIST macro

Location:

trunk

Files:

• Build.PL (modified) (1 diff)
• Changes (modified) (1 diff)
• PREREQUISITES (modified) (2 diffs)
• lib/OpenGuides/Utils.pm (modified) (3 diffs)
• t/12_macros.t (modified) (3 diffs)

trunk/Build.PL

@@ -233 +233 @@
         'CGI::Cookie'                     => 0,
         'CGI::Wiki'                       => '0.54',
-        'CGI::Wiki::Formatter::UseMod'    => '0.09',
+        'CGI::Wiki::Formatter::UseMod'    => '0.16', # macros
         'CGI::Wiki::Plugin::Categoriser'  => 0,
         'CGI::Wiki::Plugin::Diff'         => '0.07', # earlier buggy

trunk/Changes

@@ -8 +8 @@
           on edit form, banner at top of page (see CUSTOMISATION file
           for details).
+        Added new macro - used as eg @INDEX_LIST [[Locale Fulham]]
 
 0.40    18 September 2004

trunk/PREREQUISITES

@@ -1 @@
-Modules required by OpenGuides 0.40
+Modules required by OpenGuides 0.41
 ===================================
 
@@ -7 +7 @@
 CGI::Cookie
 CGI::Wiki (version 0.54 or later)
-CGI::Wiki::Formatter::UseMod (version 0.09 or later)
+CGI::Wiki::Formatter::UseMod (version 0.16 or later)
 CGI::Wiki::Plugin::Categoriser
 CGI::Wiki::Plugin::Diff (version 0.07 or later)

trunk/lib/OpenGuides/Utils.pm

@@ -3 +3 @@
 use strict;
 use vars qw( $VERSION );
-$VERSION = '0.07';
+$VERSION = '0.08';
 
 use Carp qw( croak );
@@ -120 +120 @@
         qr/\@INDEX_LINK\s+\[\[(Category|Locale)\s+([^\]|]+)\|?([^\]]+)?\]\]/ =>
             sub {
+                  my $wiki = shift;
                   my $link_title = $_[2] || "View all pages in $_[0] $_[1]";
                   return qq(<a href="$script_name?action=index;index_type=) . uri_escape(lc($_[0])) . qq(;index_value=) . uri_escape($_[1]) . qq(">$link_title</a>);
                 },
-        qr/\@RSS\s+\[(.*?)\]/ => sub { 
+        qr/\@INDEX_LIST\s+\[\[(Category|Locale)\s+([^\]]+)]]/ =>
+             sub {
+                   my ($wiki, $type, $value) = @_;
+                   my @nodes = $wiki->list_nodes_by_metadata(
+                       metadata_type  => $type,
+                       metadata_value => $value,
+                       ignore_case    => 1,
+                   );
+                   unless ( scalar @nodes ) {
+                       return "\n* No pages currently in "
+                              . lc($type) . " $value\n";
+                   }
+                   my $return = "\n";
+                   foreach my $node ( @nodes ) {
+                       $return .= "* "
+                               . $wiki->formatter->format_link(
+                                                                wiki => $wiki,
+                                                                link => $node,
+                                                              )
+                                . "\n";
+                   }
+                   return $return;
+                 },
+        qr/\@RSS\s+\[(.*?)\]/ => sub {
+                                       my $wiki = shift; 
                                       # Get the URL. It's already been formatted into a 
                                       # hyperlink so we need to reverse that.
@@ -156 +181 @@
                                    div code strike sub sup font)],
         macros              => \%macros,
+        pass_wiki_to_macros => 1,
         node_prefix         => "$script_name?",
         edit_prefix         => "$script_name?action=edit&id=",

trunk/t/12_macros.t

@@ -1 +1 @@
 use strict;
+use CGI::Wiki::Setup::SQLite;
 use Config::Tiny;
-use OpenGuides::Utils;
-use Test::More tests => 2;
+use OpenGuides;
+use Test::More tests => 6;
 
 eval { require DBD::SQLite; };
@@ -8 +9 @@
 
 SKIP: {
-    skip "DBD::SQLite not installed - no database to test with", 2
+    skip "DBD::SQLite not installed - no database to test with", 6
       unless $have_sqlite;
+
+    # Clear out the database from any previous runs.
+    unlink "t/node.db";
+    unlink <t/indexes/*>;
+    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
 
     my $config = Config::Tiny->new;
@@ -18 +24 @@
                      script_url         => "",
                      script_name        => "",
+                     site_name          => "Test",
+                     template_path      => "./templates",
+                     home_name          => "Home",
                    };
 
-    my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
-    my $formatter = $wiki->formatter;
+    my $guide = OpenGuides->new( config => $config );
+    my $wiki = $guide->wiki;
 
-    my $wikitext = <<WIKI;
+    # Test @INDEX_LINK
+    $wiki->write_node( "Test 1", "\@INDEX_LINK [[Category Foo]]" )
+      or die "Can't write node";
+    $wiki->write_node( "Test 2", "\@INDEX_LINK [[Category Bar|Bars]]" )
+      or die "Can't write node";
 
-\@INDEX_LINK [[Category Foo]]
+    my $output;
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 1",
+                                  );
+    like( $output, qr/View all pages in Category Foo/,
+          "\@INDEX_LINK has right default link text" );
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 2",
+                                  );
+    like( $output, qr/>Bars<\/a>/, "...and can be overridden" );
 
-\@INDEX_LINK [[Category Bar|Bars]]
-
-WIKI
-
-    my $html = $formatter->format($wikitext);
-    like( $html, qr/View all pages in Category Foo/,
-          "\@INDEX_LINK has right default link text" );
-    like( $html, qr/>Bars<\/a>/, "...and can be overridden" );
+    # Test @INDEX_LIST
+    $wiki->write_node( "Test 3", "\@INDEX_LIST [[Category Foo]]" )
+      or die "Can't write node";
+    $wiki->write_node( "Test 4", "\@INDEX_LIST [[Locale Bar]]" )
+      or die "Can't write node";
+    $wiki->write_node( "Test 5", "\@INDEX_LIST [[Category Nonexistent]]" )
+      or die "Can't write node";
+    $wiki->write_node( "Test 6", "\@INDEX_LIST [[Locale Nonexistent]]" )
+      or die "Can't write node";
+    $wiki->write_node( "Wibble", "wibble", undef,
+                       {
+                         category => "foo",
+                         locale   => "bar",
+                       }
+                     )
+      or die "Can't write node";
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 3",
+                                  );
+    like ( $output, qr|<a href=".*">Wibble</a>|,
+           '@INDEX_LIST works for categories' );
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 5",
+                                  );
+    like ( $output, qr|No pages currently in category|,
+           "...and fails nicely if no pages in category" );
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 4",
+                                  );
+    like ( $output, qr|<a href=".*">Wibble</a>|,
+           '@INDEX_LIST works for locales' );
+    $output = $guide->display_node(
+                                    return_output => 1,
+                                    id            => "Test 6",
+                                  );
+    like ( $output, qr|No pages currently in locale|,
+           "...and fails nicely if no pages in locale" );
 }