From 8fa8bd0adb034f05131648dcb7b14011672649e8 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 27 Apr 2007 08:34:09 +0000
Subject: the kind of perl code that can only be written at 4:30 am

(Get a good message when a PageSpec fails due to a negated success by
creating success objects with a reason string, which morph into failure
objects when negated.)
---
 IkiWiki/Plugin/conditional.pm  | 32 ++++++++++++++++++++++++--------
 IkiWiki/Plugin/testpagespec.pm |  8 ++++++--
 2 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 58e2b04b9..a7ed6590e 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -62,8 +62,12 @@ sub match_enabled ($$;@) { #{{{
 	my $plugin=shift;
 	
 	# test if the plugin is enabled
-	return 1 if UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import");
-	return IkiWiki::FailReason->new("$plugin is not enabled");
+	if (UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import")) {
+		return IkiWiki::SuccessReason->new("$plugin is enabled");
+	}
+	else {
+		return IkiWiki::FailReason->new("$plugin is not enabled");
+	}
 } #}}}
 
 sub match_sourcepage ($$;@) { #{{{
@@ -72,8 +76,12 @@ sub match_sourcepage ($$;@) { #{{{
 	my %params=@_;
 
 	return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
-	return 1 if match_glob($params{sourcepage}, $glob, @_);
-	return IkiWiki::FailReason->new("sourcepage does not match $glob");
+	if (match_glob($params{sourcepage}, $glob, @_)) {
+		return IkiWiki::SuccessReason->new("sourcepage matches $glob");
+	}
+	else {
+		return IkiWiki::FailReason->new("sourcepage does not match $glob");
+	}
 } #}}}
 
 sub match_destpage ($$;@) { #{{{
@@ -82,8 +90,12 @@ sub match_destpage ($$;@) { #{{{
 	my %params=@_;
 	
 	return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
-	return 1 if match_glob($params{destpage}, $glob, @_);
-	return IkiWiki::FailReason->new("destpage does not match $glob");
+	if (match_glob($params{destpage}, $glob, @_)) {
+		return IkiWiki::SuccessReason->new("destpage matches $glob");
+	}
+	else {
+		return IkiWiki::FailReason->new("destpage does not match $glob");
+	}
 } #}}}
 
 sub match_included ($$;$) { #{{{
@@ -92,8 +104,12 @@ sub match_included ($$;$) { #{{{
 	my %params=@_;
 
 	return IkiWiki::FailReason->new("cannot match included") unless exists $params{sourcepage} && exists $params{destpage};
-	return 1 if $params{sourcepage} ne $params{destpage};
-	return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+	if ($params{sourcepage} ne $params{destpage}) {
+		return IkiWiki::SuccessReason->new("page $params{sourcepage} is included");
+	}
+	else {
+		return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
+	}
 } #}}}
 
 1
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 56dc03cef..4966f4e10 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -16,8 +16,12 @@ sub preprocess (@) { #{{{
 	
 	my $ret=pagespec_match($params{match}, $params{pagespec}, 
 			location => $params{page});
-	return $ret if ! $ret;
-	return "the pagespec matches";
+	if ($ret) {
+		return "match: $ret";
+	}
+	else {
+		return "no match: $ret";
+	}
 } # }}}
 
 1
-- 
cgit v1.2.3