Start to implement WikiController.

Changed controllers from servlet to filter by mapping flexibility.

src/main/scala/ScalatraBootstrap.scala

@@ -4,8 +4,9 @@ import javax.servlet._
 
 class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
-    context.mount(new CreateRepositoryServlet, "/new")
-    context.mount(new RepositoryViewerServlet, "/*")
+    context.mount(new CreateRepositoryController, "/new")
+    context.mount(new WikiController, "/*")
+    context.mount(new RepositoryViewerController, "/*")
     
     context.addListener(new ServletContextListener(){
       def contextInitialized(e: ServletContextEvent): Unit = {

src/main/scala/app/CreateRepositoryController.scala

@@ -11,7 +11,7 @@ import jp.sf.amateras.scalatra.forms._
 /**
  * Creates new repository.
  */
-class CreateRepositoryServlet extends ServletBase {
+class CreateRepositoryController extends ControllerBase {
   
   case class RepositoryCreationForm(name: String, description: String)
   

src/main/scala/app/RepositoryViewerController.scala

@@ -64,7 +64,7 @@ case class ContentInfo(viewType: String, content: Option[String])
 /**
  * The repository viewer.
  */
-class RepositoryViewerServlet extends ServletBase {
+class RepositoryViewerController extends ControllerBase {
   
   /**
    * Displays user information.

src/main/scala/app/ServletBase.scala

@@ -9,7 +9,7 @@ import jp.sf.amateras.scalatra.forms._
 /**
  * Provides generic features for ScalatraServlet implementations.
  */
-abstract class ServletBase extends ScalatraServlet with ClientSideValidationFormSupport with JacksonJsonSupport {
+abstract class ControllerBase extends ScalatraFilter with ClientSideValidationFormSupport with JacksonJsonSupport {
   
   implicit val jsonFormats = DefaultFormats
   

src/main/scala/app/UsersController.scala

@@ -0,0 +1,9 @@
+package app
+
+class UsersController extends ControllerBase {
+
+  get("/"){
+    
+  }
+  
+}

src/main/scala/app/UsersServlet.scala

@@ -1,9 +0,0 @@
-package app
-
-class UsersServlet extends ServletBase {
-
-  get("/"){
-    
-  }
-  
-}

src/main/scala/app/WikiController.scala

@@ -0,0 +1,14 @@
+package app
+
+import util.{WikiUtil, JGitUtil}
+
+class WikiController extends ControllerBase {
+
+  get("/:owner/:repository/wiki"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    
+    html.wiki(WikiUtil.getPage(owner, repository, "Home"), JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
+  
+}

src/main/scala/util/WikiUtil.scala

@@ -1,77 +1,97 @@
-package util
-
-import java.io.File
-import java.util.Date
-import org.eclipse.jgit.api.Git
-import org.apache.commons.io.FileUtils
-
-object WikiUtil {
-  
-  /**
-   * The model for wiki page.
-   * 
-   * @param name the page name
+package util
+
+import java.io.File
+import java.util.Date
+import org.eclipse.jgit.api.Git
+import org.apache.commons.io.FileUtils
+import org.eclipse.jgit.lib.RepositoryBuilder
+
+object WikiUtil {
+  
+  /**
+   * The model for wiki page.
+   * 
+   * @param name the page name
    * @param content the page content
-   */
-  case class WikiPageInfo(name: String, content: String)
-  
-  /**
-   * The model for wiki page history.
-   * 
-   * @param name the page name
-   * @param committer the committer the committer
-   * @param message the commit message
+   */
+  case class WikiPageInfo(name: String, content: String)
+  
+  /**
+   * The model for wiki page history.
+   * 
+   * @param name the page name
+   * @param committer the committer the committer
+   * @param message the commit message
    * @param date the commit date
-   */
-  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
-  
-  /**
+   */
+  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
+  
+  /**
    * Returns the directory of the wiki repository.
-   */
-  def getWikiRepositoryDir(owner: String, repository: String): File =
-    new File("%s/%s/%s-wiki.git".format(Directory.RepositoryHome, owner, repository))
-  
-  /**
+   */
+  def getWikiRepositoryDir(owner: String, repository: String): File =
+    new File("%s/%s/%s-wiki.git".format(Directory.RepositoryHome, owner, repository))
+  
+  /**
    * Returns the directory of the wiki working directory which is cloned from the wiki repository.
-   */
-  def getWikiWorkDir(owner: String, repository: String): File = 
-    new File("%s/tmp/%s/%s-wiki".format(Directory.RepositoryHome, owner, repository))
-
-  
-  /**
+   */
+  def getWikiWorkDir(owner: String, repository: String): File = 
+    new File("%s/tmp/%s/%s-wiki".format(Directory.RepositoryHome, owner, repository))
+
+  // TODO synchronized?
+  def createWikiRepository(owner: String, repository: String): Unit = {
+    val dir = getWikiRepositoryDir(owner, repository)
+    if(!dir.exists){
+      val repo = new RepositoryBuilder().setGitDir(dir).setBare.build
+      repo.create
+    }
+  }
+  
+  /**
    * Returns the wiki page.
-   */
-  def getPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
-    val git = Git.open(getWikiRepositoryDir(owner, repository))
-    JGitUtil.getFileList(git, "master", ".").find(_.name == pageName).map { file =>
-      WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"))
-    }
-  }
-  
-  // TODO 
-  //def getPageHistory(owner: String, repository: String, pageName: String): List[WikiPageHistoryInfo]
-  
-  // TODO synchronized
-  /**
-   * Save the wiki page.
-   */
-  def savePage(owner: String, repository: String, pageName: String, content: String, committer: String, message: String): Unit = {
-    val workDir = getWikiWorkDir(owner, repository)
-    
-    // clone
-    if(!workDir.exists){
-      Git.cloneRepository.setURI(getWikiRepositoryDir(owner, repository).toURI.toString).setDirectory(workDir).call
-    }
-    
-    // write as file
-    val file = new File(workDir, pageName + ".md")
-    FileUtils.writeStringToFile(file, content, "UTF-8")
-    
-    // commit and push
-    val cloned = Git.open(workDir)
-    cloned.add.addFilepattern(file.getName).call
-    cloned.commit.setAuthor(committer, committer + "@devnull").setMessage(message).call
-    cloned.push.call
-  }
-  
+   */
+  def getPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
+    createWikiRepository(owner, repository)
+    val git = Git.open(getWikiRepositoryDir(owner, repository))
+    try {
+      JGitUtil.getFileList(git, "master", ".").find(_.name == pageName).map { file =>
+        WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"))
+      }
+    } catch {
+      // TODO no commit, but it should not judge by exception.
+      case e: NullPointerException => None
+    }
+  }
+  
+  // TODO
+  // def getPageList(owner: String, repository: String): List[WikiPageHistoryInfo]
+  
+  // TODO 
+  //def getPageHistory(owner: String, repository: String, pageName: String): List[WikiPageHistoryInfo]
+  
+  // TODO synchronized
+  /**
+   * Save the wiki page.
+   */
+  def savePage(owner: String, repository: String, pageName: String, content: String, committer: String, message: String): Unit = {
+    createWikiRepository(owner, repository)
+    
+    val workDir = getWikiWorkDir(owner, repository)
+    
+    // clone
+    if(!workDir.exists){
+      Git.cloneRepository.setURI(getWikiRepositoryDir(owner, repository).toURI.toString).setDirectory(workDir).call
+    }
+    
+    // write as file
+    val file = new File(workDir, pageName + ".md")
+    FileUtils.writeStringToFile(file, content, "UTF-8")
+    
+    // commit and push
+    val cloned = Git.open(workDir)
+    cloned.add.addFilepattern(file.getName).call
+    cloned.commit.setAuthor(committer, committer + "@devnull").setMessage(message).call
+    cloned.push.call
+  }
+  
 }