Cleanup for easier builds using hudson.

[redakcja.git] / apps / wiki / models.py

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index e4ac728..f800481 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -20,11 +20,12 @@ class DocumentStorage(object):
         self.vstorage = vstorage.VersionedStorage(path)
 
     def get(self, name, revision=None):
         self.vstorage = vstorage.VersionedStorage(path)
 
     def get(self, name, revision=None):

-        if revision is None:
-            text = self.vstorage.page_text(name)
-        else:
-            text = self.vstorage.revision_text(name, revision)
-        return Document(self, name=name, text=text)
+        text, rev = self.vstorage.page_text(name, revision)
+        return Document(self, name=name, text=text, revision=rev)
+
+    def get_by_tag(self, name, tag):
+        text, rev = self.vstorage.page_text_by_tag(name, tag)
+        return Document(self, name=name, text=text, revision=rev)

 
     def get_or_404(self, *args, **kwargs):
         try:
 
     def get_or_404(self, *args, **kwargs):
         try:


@@ -40,6 +41,18 @@ class DocumentStorage(object):
                 comment=comment,
                 parent=parent)
 
                 comment=comment,
                 parent=parent)
 

+        return document
+
+    def create_document(self, id, text, title=None):
+        if title is None:
+            title = id.title()
+
+        if text is None:
+            text = u''
+
+        document = Document(self, name=id, text=text, title=title)
+        return self.put(document, u"<wiki>", u"Document created.", None)
+

     def delete(self, name, author, comment):
         self.vstorage.delete_page(name, author, comment)
 
     def delete(self, name, author, comment):
         self.vstorage.delete_page(name, author, comment)
 


@@ -49,9 +62,6 @@ class DocumentStorage(object):
     def history(self, title):
         return list(self.vstorage.page_history(title))
 
     def history(self, title):
         return list(self.vstorage.page_history(title))
 

-    def _info(self, name):
-        return self.vstorage.page_meta(name)
-

 
 class Document(object):
     META_REGEX = re.compile(r'\s*<!--\s(.*?)-->', re.DOTALL | re.MULTILINE)
 
 class Document(object):
     META_REGEX = re.compile(r'\s*<!--\s(.*?)-->', re.DOTALL | re.MULTILINE)


@@ -61,16 +71,10 @@ class Document(object):
         for attr, value in kwargs.iteritems():
             setattr(self, attr, value)
 
         for attr, value in kwargs.iteritems():
             setattr(self, attr, value)
 

-    def revision(self):
-        try:
-            return self.storage._info(self.name)[0]
-        except DocumentNotFound:
-            return - 1
-
-    def add_tag(self, tag):
+    def add_tag(self, tag, revision, author):

         """ Add document specific tag """
         """ Add document specific tag """

-        logger.debug("Adding tag %s to doc %s version %d", tag, self.name, self.revision)
-        self.storage.vstorage.add_page_tag(self.name, self.revision, tag)
+        logger.debug("Adding tag %s to doc %s version %d", tag, self.name, revision)
+        self.storage.vstorage.add_page_tag(self.name, revision, tag, user=author)

 
     @property
     def plain_text(self):
 
     @property
     def plain_text(self):


@@ -101,10 +105,7 @@ class Document(object):
         return result
 
     def info(self):
         return result
 
     def info(self):

-        return dict(zip(
-            ('revision', 'last_update', 'last_comitter', 'commit_message'),
-            self.storage._info(self.name),
-        ))
+        return self.storage.vstorage.page_meta(self.name, self.revision)

 
 
 def getstorage():
 
 
 def getstorage():