Changeset 132:add99b61e833

Timestamp:

03/22/2010 01:15:25 AM (4 months ago)

Author:

dcaoyuan

Branch:

default

Message:

Finished Routes with PackratParser?

Location:

blogbird/src/main/scala/org/aiotrade/blog/frontend

Files:

• Routes.scala (modified) (2 diffs)
• Views.scala (modified) (2 diffs)

blogbird/src/main/scala/org/aiotrade/blog/frontend/Routes.scala

@@ -9 +9 @@
 import org.aiotrade.blog.frontend.{Actions => A}
 import org.aiotrade.blog.frontend.{Feeds => F}
-
-
-object Routes {
+import scala.util.parsing.combinator.PackratParsers
+import scala.util.parsing.combinator
+import scala.util.parsing.input.CharSequenceReader
+
+
+object Routes extends PackratParsers {
   trait Route
   case class XhtmlView(view: V.View) extends Route
@@ -26 +29 @@
   case class NoSuchUri(uri: String) extends Route
 
+  val entrance = phrase(uriParser)
+
+  def parse(text: String): ParseResult[_] = {
+    val input = new PackratReader(new CharSequenceReader(text))
+    entrance(input)
+  }
+
+  def extractResult(r : ParseResult[_]) = r match {
+    case Success(a, _) => a
+    case NoSuccess(a, _) => a
+  }
+
+  /** the type of input elements defined in the Parsers is <code>Char</code> */
+  override type Elem = Char
+
+  implicit def toString(cs: List[Char]) = cs.mkString
+  
+  //  def   accept[ES](es: ES)(implicit arg0: (ES) ? List[Elem]): Parser[List[Elem]]
+  implicit def toCharList(s: String) = s.toList //
+  implicit def stringToParser(s: String) = accept(s)
+
+  def uriParser = (pages           |
+                   commands        |
+                   submit_comment  |
+                   post_comment    |
+                   delete_comment  |
+                   delete_comments |
+                   edit_comment    |
+                   rep(any) ^^  {s => NoSuchUri(s)})
+
+  def pages = get_method ~> (single_article          |
+                             articles_by_tags        |
+                             articles                |
+                             feeds                   |
+                             review_pending_comments |
+                             review_comment          |
+                             add_comment_form)
+
+
+  def get_method  = "GET "  ^^^ ()
+  def post_method = "POST " ^^^ ()
+
+  def commands =
+    post_method ~ ("/commands" | "/c") ~> ingest_draft
+
+  def submit_comment =
+    post_method ~ "/e/add-comment/" ~> p_plink_title <~ eof ^^ {
+      t => CommentSubmission(t)
+    }
+
+  def edit_comment =
+    post_method ~ "/x/edit-comment/" ~> p_int <~ eof ^^ {
+      n => AlterComment(n)
+    }
+
+  def post_comment =
+    post_method ~ "/x/post-comment" ~ eof ^^^ PostComment
+
+  def delete_comment =
+    post_method ~ "/x/delete-comment" ~ eof ^^^ DeleteComment
+
+  def delete_comments =
+    post_method ~ "/x/delete-comments" ~ eof ^^^ DeleteComments
+
+  def review_pending_comments =
+    "/z/review-comments" ~> page <~ eof ^^ {
+      p => ReviewComments(p)
+    }
+
+  def review_comment =
+    "/z/review-comment/" ~> p_int <~ eof ^^ {
+      n => ReviewComment(n)
+    }
+
+  def add_comment_form =
+    "/c/add-comment/" ~>  p_plink_title <~ eof ^^ {
+      t => CommentFormView(t)
+    }
+
+  def ingest_draft =
+    "/post-draft/" ~> rep(any) ^^ {
+      x => Command(A.Ingest(x))
+    }
+
+  // ----- feeds
+
+  def feeds =
+    ("/feeds" | "/f") ~> (articles_feed  |
+                          comments_feeds |
+                          tag_feed       |
+                          tags_feed      |
+                          article_comments_feed)
+
+  def articles_feed =
+    ("/articles" | "/a") ~> atom_xml ^^^ AtomFeed(F.AllPosts)
+
+  def comments_feeds =
+    all_comments_feed | article_comments_feed
+
+  def all_comments_feed =
+    ("/comments" | "/c") ~> atom_xml ^^^ AtomFeed(F.AllComments)
+
+  def article_comments_feed =
+    ("/comments/p/" | "/c/p/") ~> p_plink_title <~ atom_xml ^^ {
+      t => AtomFeed(F.PostComments(t))
+    }
+
+  def tag_feed =
+    "/tag/" ~> p_tag_name <~ atom_xml ^^ {
+      t => AtomFeed(F.ByTag(t))
+    }
+
+  def tags_feed =
+    ("/tags/" | "/t/") ~> repsep(p_tag_name, ',') <~ atom_xml ^^ {
+      ts => AtomFeed(F.ByTags(ts sortWith (_ < _)))
+    }
+
+  def atom_xml =
+    "/atom.xml" ~> eof ^^^ ()
+
+
+  // ----- articles
+  
+  def articles =
+    ("/articles" | "/a") ~> (all_articles     |
+                             single_article   |
+                             articles_by_date |
+                             articles_by_tag  |
+                             articles_by_tags)
+
+  def all_articles =
+    page ^^ {
+      p => XhtmlView(V.All(p))
+    }
+
+  def single_article =
+    "/p/" ~> p_plink_title <~ eof ^^ {
+      t => XhtmlView(V.ByPermatitle(t))
+    }
+
+  def articles_by_tag =
+    "/tag/" ~> p_tag_name ~ page ^^ {
+      case t ~ p => XhtmlView(V.ByTag(t, p))
+    }
+
+  def articles_by_tags =
+    ("/t/" | "/tags/") ~> repsep(p_tag_name, ',') ~ page ^^ {
+      case ts ~ p => XhtmlView(V.ByTags(ts sortWith (_ < _), p))
+    }
+
+  def articles_by_date_forRef =
+    '/' ~> p_int ~ (page ^^ {case x => } |
+                    '/' ~> p_int ~ (page |
+                                    '/' ~> p_int ~ (page |
+                                                    '/' ~> p_plink_title
+        )
+      )
+    )
+
+  def articles_by_date = articles_by_date_1 | articles_by_date_2 | articles_by_date_3 | articles_by_date_4
+  def articles_by_date_1 = memo('/' ~ p_int) ~ page ^^ {
+    case '/' ~ y ~ p => XhtmlView(V.ByYear(y, p))
+  }
+  def articles_by_date_2 = memo('/' ~ p_int ~ '/' ~ p_int) ~ page ^^ {
+    case '/' ~ y ~ '/' ~ m ~ p => XhtmlView(V.ByMonth(y, m, p))
+  }
+  def articles_by_date_3 = memo('/' ~ p_int ~ '/' ~ p_int ~ '/' ~ p_int) ~ page ^^ {
+    case '/' ~ y ~ '/' ~ m ~ '/' ~ d ~ p => XhtmlView(V.ByDay(y, m, d, p))
+  }
+  def articles_by_date_4 = memo('/' ~ p_int ~ '/' ~ p_int ~ '/' ~ p_int) ~ '/' ~ p_plink_title ^^ {
+    case '/' ~ y ~ '/' ~ m ~ '/' ~ d ~ '/' ~ t => XhtmlView(V.ByYMDPermatitle(y, m, d, t))
+  }
+
+
+  // ----- elements
+  
+  def page = (eof ^^^ None | ("/page/" | "/p/") ~> p_int <~ eof ^^ (Some(_)))
+  def p_int = rep1(digit) ^^ (toString(_).toInt)
+  def p_plink_title = rep1(alphaNum | '-' | '_') ^^ toString
+  def p_tag_name    = rep1(alphaNum | '-' | '_' | '.' ) ^^ toString
+
+  // ----- basic
+  
+  def alphaNum  = elem("digit",  Character.isLetterOrDigit)
+  def digit     = elem("digit",  Character.isDigit)
+  def upper     = elem("upper",  Character.isUpperCase)
+  def lower     = elem("lower",  Character.isLowerCase)
+  def letter    = elem("letter", Character.isLetter)
+  def eof       = elem("end of file", _ == '\032') ^^^ ()
+  def any       = elem("any char",    _ != '\032')
+
+
+  // ----- simple test
+
+  def main(args: Array[String]) {
+    val text = "GET /a/p/a_blog_title"
+    //val text = "GETapaaa"
+    val r = parse(text)
+
+    r match {
+      case Success(x, _) => x
+      case NoSuccess(x, _) => x
+    }
+
+    println(r)
+  }
 }

blogbird/src/main/scala/org/aiotrade/blog/frontend/Views.scala

@@ -51 +51 @@
       case ByTag(t, _) => B.tag_filter(t) (md.all_posts)
       case ByTags(t, _) => B.tags_filter(t) (md.all_posts)
-      case ByYMDPermatitle(_, _, _, t) => md.maybe_post_by_permatitle(t).toList
-      case ByPermatitle(t) => md.maybe_post_by_permatitle(t).toList
+      case ByYMDPermatitle(_, _, _, t) => md.maybe_post_by_permatitle(t) toList
+      case ByPermatitle(t) => md.maybe_post_by_permatitle(t) toList
     }
 
@@ -104 +104 @@
       case _ => this
     }
+
+    def discoverable_feeds = this match {
+      case All(_) => List(F.articles_feed, F.all_comments_feed)
+      case ByYear(_, _) => List(F.articles_feed, F.all_comments_feed)
+      case ByMonth(_, _, _) => List(F.articles_feed, F.all_comments_feed)
+      case ByDay(_, _, _, _) => List(F.articles_feed, F.all_comments_feed)
+      case ByYMDPermatitle(_, _, _, t) => List(F.articles_feed, F.all_comments_feed, F.comments_feed(t))
+      case ByPermatitle(t) => List(F.articles_feed, F.all_comments_feed, F.comments_feed(t))
+      case ByTag(t, _) => List(F.articles_feed, F.all_comments_feed, F.tags_feed(List(t)))
+      case ByTags(ts, _) => List(F.articles_feed, F.all_comments_feed, F.tags_feed(ts))
+    }
   }
+  
   case class All(page_n: Option[Int]) extends View
   case class ByYear(year: Int, page_n: Option[Int]) extends View