Changeset 740:119f013c8e27 in hatta-dev

Timestamp:

01/24/10 13:28:09 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

Add option and placeholder for the subdirectory storage

Files:

• hatta.py (modified) (3 diffs)
• tests/test_repo.py (modified) (1 diff)

hatta.py

@@ -185 +185 @@
             help='Use the STYLE pygments style for highlighting',
             metavar='STYLE')
+        add('-D', '--subdirectories', dest='subdirectories',
+            action="store_true",
+            help='Store subpages as subdirectories in the filesystem')
 
         options, args = parser.parse_args()
@@ -662 +665 @@
             if filename.startswith(self.repo_prefix):
                 yield self._file_to_title(filename)
+
+
+class WikiSubdirectoryStorage(WikiStorage):
+    """
+    A version of WikiStorage that keeps the subpages in real subdirectories in
+    the filesystem.
+
+    """
+
+    # XXX Override required methods here.
+
 
 class WikiParser(object):
@@ -2446 +2460 @@
         self.icon_page = self.config.get('icon_page', None)
         self.pygments_style = self.config.get('pygments_style', 'tango')
-
-        self.storage = self.storage_class(self.path, self.page_charset)
+        self.subdirectories = self.config.get_bool('subdirectories', False)
+        if self.subdirectories:
+            self.storage = WikiSubdirectoryStorage(self.path, self.page_charset)
+        else:
+            self.storage = self.storage_class(self.path, self.page_charset)
         if not os.path.isdir(self.cache):
             os.makedirs(self.cache)

tests/test_repo.py

@@ -48 +48 @@
     return hatta.WikiStorage(repo_path)
 
+def pytest_funcarg__subdir_repo(request):
+    """
+    This function is executed whenever a test needs a "repo" parameter.
+    It creates a new WikiSubdirectoryStorage object with Hatta repository in a
+    temporary directory.
+    """
+
+    repo_path = str(request.config.ensuretemp('repo'))
+    request.addfinalizer(lambda: clear_directory(repo_path))
+    return hatta.WikiSubdirectoryStorage(repo_path)
+
+class TestSubdirectoryStorage(object):
+    """
+    Tests for the WikiSubdirectoryStorage.
+    """
+
+    # XXX Put your tests here.
+
+
 class TestMercurialStorage(object):
     """