(refs #34)Link conversion checks existence of accounts and issues.

src/main/scala/view/AvatarImageProvider.scala

@@ -0,0 +1,26 @@
+package view
+
+import service.RequestCache
+import twirl.api.Html
+import util.StringUtil
+
+trait AvatarImageProvider { self: RequestCache =>
+
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  protected def getAvatarImageHtml(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = {
+    val src = getAccountByUserName(userName).collect { case account if(account.image.isEmpty) =>
+      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+    } getOrElse {
+      s"""${context.path}/${userName}/_avatar"""
+    }
+    if(tooltip){
+      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
+    } else {
+      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" />""")
+    }
+  }
+
+}

src/main/scala/view/LinkConverter.scala

@@ -0,0 +1,33 @@
+package view
+
+import service.RequestCache
+import util.Implicits.RichString
+
+trait LinkConverter { self: RequestCache =>
+
+  /**
+   * Converts issue id, username and commit id to link.
+   */
+  protected def convertRefsLinks(value: String, repository: service.RepositoryService.RepositoryInfo,
+                                 issueIdPrefix: String =  "#")(implicit context: app.Context): String = {
+    value
+      // escape HTML tags
+      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+      // convert issue id to link
+      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
+          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+        } else {
+          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+        }
+      }
+      // convert @username to link
+      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+        getAccountByUserName(m.group(2)).map { _ =>
+          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+        }
+      }
+      // convert commit id to link
+      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+  }
+}

src/main/scala/view/Markdown.scala

@@ -1,11 +1,13 @@
 package view
 
 import util.StringUtil
+import util.Implicits._
 import org.parboiled.common.StringUtils
 import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
 import scala.collection.JavaConverters._
+import service.RequestCache
 
 object Markdown {
 
@@ -13,12 +15,17 @@ object Markdown {
    * Converts Markdown of Wiki pages to HTML.
    */
   def toHtml(markdown: String, repository: service.RepositoryService.RepositoryInfo,
-             enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): String = {
+             enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
+    // escape issue id
+    val source = if(enableRefsLink){
+      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+    } else markdown
+
     val rootNode = new PegDownProcessor(
       Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
-    ).parseMarkdown(markdown.toCharArray)
+    ).parseMarkdown(source.toCharArray)
 
-    new GitBucketHtmlSerializer(markdown, context, repository, enableWikiLink, enableCommitLink, enableIssueLink).toHtml(rootNode)
+    new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
   }
 }
 
@@ -64,15 +71,13 @@ class GitBucketVerbatimSerializer extends VerbatimSerializer {
 
 class GitBucketHtmlSerializer(
     markdown: String,
-    context: app.Context,
     repository: service.RepositoryService.RepositoryInfo,
     enableWikiLink: Boolean,
-    enableCommitLink: Boolean,
-    enableIssueLink: Boolean
-  ) extends ToHtmlSerializer(
+    enableRefsLink: Boolean
+  )(implicit val context: app.Context) extends ToHtmlSerializer(
     new GitBucketLinkRender(context, repository, enableWikiLink),
     Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava
-  ) {
+  ) with LinkConverter with RequestCache {
 
   override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
     printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
@@ -100,10 +105,7 @@ class GitBucketHtmlSerializer(
 
   override def visit(node: TextNode) {
     // convert commit id and username to link.
-    val text = if(enableCommitLink) node.getText
-      .replaceAll("(^|\\W)([0-9a-f]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
-      .replaceAll("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)", s"""$$1<a href="${context.path}/$$2">@$$2</a>$$3""")
-    else node.getText
+    val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
 
     if (abbreviations.isEmpty) {
       printer.print(text)
@@ -112,15 +114,4 @@ class GitBucketHtmlSerializer(
     }
   }
 
-  override def visit(node: HeaderNode) {
-    val text = markdown.substring(node.getStartIndex, node.getEndIndex - 1).trim
-    if(enableIssueLink && text.matches("#[\\d]+")){
-      // convert issue id to link
-      val issueId = text.substring(1).toInt
-      printer.print(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${issueId}">#${issueId}</a>""")
-    } else {
-      printTag(node, "h" + node.getLevel)
-    }
-  }
-
 }

src/main/scala/view/helpers.scala

@@ -3,12 +3,12 @@ import java.util.Date
 import java.text.SimpleDateFormat
 import twirl.api.Html
 import util.StringUtil
-import service.AccountService
+import service.RequestCache
 
 /**
  * Provides helper methods for Twirl templates.
  */
-object helpers {
+object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
   
   /**
    * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
@@ -31,10 +31,23 @@ object helpers {
    * Converts Markdown of Wiki pages to HTML.
    */
   def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): Html = {
-    Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
   }
 
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
+    getAvatarImageHtml(userName, size, tooltip)
+
+  /**
+   * Converts commit id, issue id and username to the link.
+   */
+  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
+    Html(convertRefsLinks(value, repository))
+
   def activityMessage(message: String)(implicit context: app.Context): Html =
     Html(message
       .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
@@ -66,38 +79,6 @@ object helpers {
   def assets(implicit context: app.Context): String =
     s"${context.path}/assets"
 
-  /**
-   * Converts issue id and commit id to link.
-   */
-  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
-    Html(value
-      // escape HTML tags
-      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
-      // convert issue id to link
-      .replaceAll("(^|\\W)#(\\d+)(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/issues/$$2">#$$2</a>$$3""")
-      // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3"""))
-
-
-  /**
-   * Returns &lt;img&gt; which displays the avatar icon.
-   * Looks up Gravatar if avatar icon has not been configured in user settings.
-   */
-  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = {
-    val account = context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
-    }
-    val src = account.collect { case account if(account.image.isEmpty) =>
-      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
-    } getOrElse {
-      s"""${context.path}/${userName}/_avatar"""
-    }
-    if(tooltip){
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
-    } else {
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" />""")
-    }
-  }
 
   /**
    * Implicit conversion to add mkHtml() to Seq[Html].