Changeset 1066

Timestamp:

06/11/07 04:06:21 (1 year ago)

Author:

kake

Message:

Refactor redirect detection into OpenGuides::Utils->detect_redirect

Files:

• trunk/lib/OpenGuides.pm (modified) (1 diff)
• trunk/lib/OpenGuides/RDF.pm (modified) (2 diffs)
• trunk/lib/OpenGuides/Utils.pm (modified) (1 diff)
• trunk/t/11_utils.t (modified) (3 diffs)

trunk/lib/OpenGuides.pm

@@ -269 +269 @@
-                                . "?id=";
-    }
-
-
-
-
-
-
-
+
+
+
+
-        # Don't redirect if the parameter "redirect" is given as 0.
-        if ($do_redirect == 0) {

trunk/lib/OpenGuides/RDF.pm

@@ -2 +2 @@
-
-use strict;
+
+use OpenGuides::Utils;
-
-use vars qw( $VERSION );
@@ -140 +142 @@
-                                                        $tt_vars{version} );
-
-# Should probably be moved into OpenGuides::Utils.
-if ($node_data{content} =~ /^\#REDIRECT \[\[(.*?)]\]$/) {
-    my $redirect = $1;
+my $redirect = OpenGuides::Utils->detect_redirect( content =>
+                                                     $node_data{content} );
+if ( $redirect ) {
-        $tt_vars{redirect} = $config->script_url . $config->script_name
-                             . "?id="

trunk/lib/OpenGuides/Utils.pm

@@ -329 +329 @@
-}
-
+=item B<detect_redirect>
+
+    $redir = OpenGuides::Utils->detect_redirect( content => "foo" );
+
+Checks the content of a node to see if the node is a redirect to another
+node.  If so, returns the name of the node that this one redirects to.  If
+not, returns false.
+
+(Also returns false if no content is provided.)
+
+=cut
+
+sub detect_redirect {
+    my ( $self, %args ) = @_;
+    return unless $args{content};
+
+    if ( $args{content} =~ /^#REDIRECT\s+(.+?)\s*$/ ) {
+        my $redirect = $1;
+
+        # Strip off enclosing [[ ]] in case this is an extended link.
+        $redirect =~ s/^\[\[//;
+        $redirect =~ s/\]\]\s*$//;
+
+        return $redirect;
+    }
+}
+
-=back
-

trunk/t/11_utils.t

@@ -3 +3 @@
-use OpenGuides::Config;
-use OpenGuides::Utils;
-8
+10
-
-eval { my $wiki = OpenGuides::Utils->make_wiki_object; };
@@ -29 +29 @@
-
-SKIP: {
-
+
+
-      unless $have_sqlite;
-
@@ -60 +61 @@
-    ok( $wiki->search_obj, "...and search defined" );
-    ok( $wiki->formatter,  "...and formatter defined" );
+
+    # Now test ->detect_redirect
+    is( OpenGuides::Utils->detect_redirect( content => "#REDIRECT [[Foo]]" ),
+        "Foo",
+        "->detect_redirect successfully detects redirect content" );
+    ok( !OpenGuides::Utils->detect_redirect( content => "Mmmm, tea." ),
+        "...and successfully detects non-redirect content" );
-}