Merge pull request #164 from furbrain/master

Add HideNoNs option

_tests/src/test/java/nspages/Test_hideNoNs.java

@@ -0,0 +1,35 @@
+package nspages;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+public class Test_hideNoNs extends Helper {
+	@Test
+	public void withoutOption(){
+		generatePage("noitems:start", "<nspages -exclude nonexistent>");
+
+		List<WebElement> sections = getDriver().findElements(By.className("catpageheadline"));
+		assertEquals(0, sections.size());
+
+		//Without this assert, the test would succeed even without the implementation commit
+		assertTrue(pagesContains("namespace doesn't exist:"));
+	}
+
+	@Test
+	public void withOption(){
+		generatePage("noitems:start", "<nspages -exclude -hideNoNs nonexistent>");
+
+		List<WebElement> sections = getDriver().findElements(By.className("catpageheadline"));
+		assertEquals(0, sections.size());
+
+		//Without this assert, the test would succeed even without the implementation commit
+		assertFalse(pagesContains("namespace doesn't exist:"));
+	}
+}

syntax.php

@@ -65,6 +65,7 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
         optionParser::checkOption($match, "sort(By)?Date", $return['sortDate'], true);
         optionParser::checkOption($match, "sort(By)?CreationDate", $return['sortByCreationDate'], true);
         optionParser::checkOption($match, "hidenopages", $return['hidenopages'], true);
+        optionParser::checkOption($match, "hidenons", $return['hidenons'], true);
         optionParser::checkOption($match, "hidenosubns", $return['hidenosubns'], true);
         optionParser::checkOption($match, "showhidden", $return['showhidden'], true);
         optionParser::checkOption($match, "(use)?Pictures?", $return['usePictures'], true);
@@ -124,7 +125,7 @@ private function _getDefaultOptions(){
             'pagesinns'     => false, 'anchorName' => null, 'actualTitleLevel' => false,
             'idAndTitle'    => false, 'nbItemsMax' => 0, 'numberedList' => false,
             'natOrder'      => false, 'sortDate' => false,
-            'hidenopages'   => false, 'hidenosubns' => false, 'usePictures' => false,
+            'hidenopages'   => false, 'hidenons' => false, 'hidenosubns' => false, 'usePictures' => false,
             'showhidden'    => false, 'dictOrder' => false,
             'modificationDateOnPictures' => false,
             'displayModificationDate' => false,
@@ -165,8 +166,11 @@ function render($mode, Doku_Renderer $renderer, $data) {
         }
 
 
-        if( ! $this->_isNamespaceUsable($data)){
-            $printer->printUnusableNamespace($data['wantedNS']);
+        if( ! $this->_isNamespaceUsable($data))
+        {
+            if( ! $data['hidenons']) {
+                $printer->printUnusableNamespace($data['wantedNS']);
+            }
             return TRUE;
         }