master -> Lift 30 merge

CONTRIBUTING.md

@@ -18,6 +18,9 @@ The policy on issues is:
 
 We will accept pull requests into the Lift codebase if the pull requests meet
 the following criteria:
+* The request handles an issue that has been discussed on the Lift mailing list
+  and whose solution has been requested (and in general adheres to the spirit of
+  the issue guidelines above).
 * The request represents one or more of the following:
   * Documentation including ScalaDoc comments in code
   * Example code

README.md

@@ -16,12 +16,16 @@ Because Lift applications are written in [Scala](http://www.scala-lang.org), an
 We will accept pull requests into the [Lift codebase](https://github.com/lift)
 if the pull requests meet the following criteria:
 
-* One or more of the following:
-    * Documentation including ScalaDoc comments in code
-    * Example code
-    * Small changes, enhancements, or bug fixes to Lift's code
-* Each pull request must include a signature at the bottom of the
-  `/contributors.md` file.
+* The request handles an issue that has been discussed on the [Lift mailing list](http://groups.google.com/forum/#!forum/liftweb)
+  and whose solution has been requested (and in general adheres to the spirit of
+  the issue guidelines outlined in [CONTRIBUTING.md](https://github.com/lift/framework/blob/master/CONTRIBUTING.md)).
+* The request represents one or more of the following:
+  * Documentation including ScalaDoc comments in code
+  * Example code
+  * Small changes, enhancements, or bug fixes to Lift’s code
+* The request includes a signature at the bottom of the `/contributors.md` file.
+
+For more details, see [CONTRIBUTING.md](https://github.com/lift/framework/blob/master/CONTRIBUTING.md).
 
 ## Getting Started
 
@@ -59,10 +63,10 @@ Or, you can add Lift to your `pom.xml` like so:
     <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-mapper_${scala.version}</artifactId>
-      <version>2.4</version>
+      <version>2.5.1</version>
     </dependency>
 
-Where `${scala.version}` is `2.8.0`, `2.8.1`, `2.9.1` etc.
+Where `${scala.version}` is `2.9.1` etc. For scala 2.10.x, which is binary compatible, you just use `2.10`, and that will work for `2.10.0` ,`2.10.1` ,`2.10.2`
 
 You can [learn more on the wiki](http://www.assembla.com/wiki/show/liftweb/Using_Maven).
 
@@ -128,7 +132,7 @@ The Lift wiki is hosted on Assembla and can be found at [http://www.assembla.com
 
 ### ScalaDocs
 
-The ScalaDocs for each release of Lift, in additional to the actual JARs, are available on ScalaTools. You can access the source code–based documentation for releases via the site's homepage or by navigating directly to the URL for the specific release. For instance, the Lift 2.4 release can be accessed at [http://scala-tools.org/mvnsites/liftweb-2.4/](http://scala-tools.org/mvnsites/liftweb-2.4/).
+The ScalaDocs for each release of Lift, in additional to the actual JARs, are available on the Liftweb.net site. You can access the source code–based documentation for releases via the site's homepage or by navigating directly to the URL for the specific release. For instance, the Lift 2.5 release can be accessed at [http://liftweb.net/api/25/api/](http://liftweb.net/api/25/api/).
 
 ### Cookbook
 

core/markdown/src/main/scala/net/liftweb/markdown/InlineParsers.scala

@@ -120,8 +120,6 @@ trait InlineParsers extends BaseParsers {
         }
     }
 
-
-
     /**
      *  all markdown inline element parsers or'ed together
      */
@@ -434,4 +432,4 @@ trait InlineParsers extends BaseParsers {
 
     false
   }
-}
+}

core/markdown/src/main/scala/net/liftweb/markdown/Transformer.scala

@@ -59,7 +59,7 @@ class SingleThreadedTransformer extends Transformer
  * val input:String = ...
  * val xhtml:String = new ActuariusTransformer()(input)
  *
- * Note that this markdown parser isn't inherantly thread-safe, as Scala Parser Combinators isn't, so this
+ * Note that this markdown parser isn't inherently thread-safe, as Scala Parser Combinators aren't, so this
  * class instantiates a SingleThreadedTransformer for each thread.
  * You'll need to write your own pooled implementation if this isn't efficient for your usage.
  */

core/markdown/src/test/scala/net/liftweb/markdown/InlineParsersTest.scala

@@ -65,19 +65,18 @@ class InlineParsersTest extends FlatSpec with ShouldMatchers with InlineParsers{
         ("``code ` code``", "<code>code ` code</code>")
     )
 
-  val entityTest = List("Hello &nbsp; World" -> "Hello &nbsp; World",
-    "Hello & World" -> "Hello &amp; World",
-    ("test &egrave; text" ->"test &egrave; text"),
-    "test  &egrave; text" ->"test  &egrave; text",
-      "test&egrave; text" -> "test&egrave; text",
-      "test &egrave;" -> "test &egrave;",
-      "test &omega;" -> "test &omega;",
-      "test &unknown;" -> "test &amp;unknown;",
-      "AT&T" -> "AT&amp;T",
-      "<ATT" -> "&lt;ATT",
-      "test&nbsp;hello" -> "test&nbsp;hello",
-      "test &nbsp; hello&nbsp;;" -> "test &nbsp; hello&nbsp;;")
-
+    val entityTest = List("Hello &nbsp; World" -> "Hello &nbsp; World",
+      "Hello & World" -> "Hello &amp; World",
+      ("test &egrave; text" ->"test &egrave; text"),
+      "test  &egrave; text" ->"test  &egrave; text",
+        "test&egrave; text" -> "test&egrave; text",
+        "test &egrave;" -> "test &egrave;",
+        "test &omega;" -> "test &omega;",
+        "test &unknown;" -> "test &amp;unknown;",
+        "AT&T" -> "AT&amp;T",
+        "<ATT" -> "&lt;ATT",
+        "test&nbsp;hello" -> "test&nbsp;hello",
+        "test &nbsp; hello&nbsp;;" -> "test &nbsp; hello&nbsp;;")
 
     val linkTests = List(
         ("""[link text](http://example.com "link title")""",
@@ -173,7 +172,7 @@ class InlineParsersTest extends FlatSpec with ShouldMatchers with InlineParsers{
 
     val allInlineTests = italicTests ++ boldTests ++ entityTest ++
       codeTests ++ linkTests ++ fastLinkTests ++ imageTests ++ brTests ++
-                         xmlStartTagTests ++ xmlEndTagTests ++ xmlInlineTests ++ dummyTests
+      xmlStartTagTests ++ xmlEndTagTests ++ xmlInlineTests ++ dummyTests
 
     it should "create italic text" in {
         runSucceedingParsingTests(emAsterisk(new InlineContext())|emUnderscore(new InlineContext()) , italicTests)

core/util/src/main/scala/net/liftweb/util/CSSHelpers.scala

@@ -76,9 +76,11 @@ case class CSSParser(prefix: String) extends Parsers  {
             case 'u' if (seqDone == 0) => seqDone = 1;
             case 'r' if (seqDone == 1) => seqDone = 2;
             case 'l' if (seqDone == 2) => seqDone = 3;
+            case ' ' | '\t' | '\n' | '\r' if (seqDone == 3 || seqDone == 4) => seqDone = 4
+            case '(' if (seqDone == 3 || seqDone == 4) => seqDone = 5
             case _ => seqDone = 0
           }
-          seqDone == 3;
+          seqDone == 5;
       }
 
       Success(content toString, rest);
@@ -94,15 +96,16 @@ case class CSSParser(prefix: String) extends Parsers  {
                          c == ';' || c == '.' ||
                          c == '+' || c == '-' ||
                          c == '=' || c == ':' ||
-                         c == ' ' || c == '_').+ ^^ {case l => l.mkString("")}
+                         c == ' ' || c == '_' ||
+                         c == '#').+ ^^ {case l => l.mkString("")}
 
   // the URL might be wrapped in simple quotes
   lazy val seq1 = elem('\'') ~> path <~ elem('\'')
   // the URL might be wrapped in double quotes
   lazy val seq2 = elem('\"') ~> path <~ elem('\"')
   // do the parsing per CSS spec http://www.w3.org/TR/REC-CSS2/syndata.html#uri section 4.3.4
-  lazy val expr = (spaces ~ elem('(') ~ spaces) ~> ( seq1 | seq2 | path ) <~ (spaces <~ elem(')')) ^^ {case s => {
-      "('" + (s.trim.startsWith("/") match {
+  lazy val expr = spaces ~> ( seq1 | seq2 | path ) <~ (spaces <~ elem(')')) ^^ {case s => {
+      "'" + (s.trim.startsWith("/") match {
         case true => prefix + s.trim
         case _ => s.trim
       }) + "')"
@@ -114,9 +117,9 @@ case class CSSParser(prefix: String) extends Parsers  {
   def fixCSS(in: String): Box[String] = phrase(in) match {
     case Success(v, r) => (r atEnd) match {
       case true => Full(v)
-      case _ => Empty // return Empty if the reader is not at end as it implies that parsing ended due to a parser error
+      case _ => common.Failure("Parser did not consume all input.  Parser error?") // return Failure if the reader is not at end as it implies that parsing ended due to a parser error
       }
-    case _ => Empty
+    case x => common.Failure("Parse failed with result %s".format(x))
   }
 
 }

persistence/mapper/src/main/scala/net/liftweb/mapper/MappedForeignKey.scala

@@ -226,7 +226,7 @@ extends MappedLong[T](theOwner) with MappedForeignKey[Long,T,O] with BaseForeign
 
   def foreignMeta = _foreignMeta
 
-  def box: Box[Long] = if (defined_?) Full(is) else Empty
+  def box: Box[Long] = if (defined_?) Full(get) else Empty
 
   type KeyType = Long
   type KeyedForeignType = O

web/webkit/src/main/scala/net/liftweb/http/CometActor.scala

@@ -19,27 +19,17 @@ package http
 
 import net.liftweb.common._
 import net.liftweb.actor._
-import scala.collection.mutable.{ListBuffer}
 import net.liftweb.util.Helpers._
 import net.liftweb.util._
 import net.liftweb.json._
 import scala.xml.{NodeSeq, Text, Elem, Node, Group, Null, PrefixedAttribute, UnprefixedAttribute}
-import scala.collection.immutable.TreeMap
-import scala.collection.mutable.{HashSet, ListBuffer}
+import scala.collection.mutable.ListBuffer
 import net.liftweb.http.js._
 import JsCmds._
 import JE._
-import java.util.concurrent.atomic.AtomicLong
 import java.util.Locale
 
 
-/**
- * This is used as an indicator message for linked actors.
- *
- * @see ActorWatcher
- */
-case object RelinkToActorWatcher
-
 trait DeltaTrait {
   def toJs: JsCmd
 }
@@ -881,7 +871,6 @@ trait CometActor extends LiftActor with LiftCometActor with BindHelpers {
 
 
     case PerformSetupComet2(initialReq) => {
-      // this ! RelinkToActorWatcher
       localSetup()
       captureInitialReq(initialReq)
       performReRender(true)

web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala

@@ -1597,8 +1597,8 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
           css.map(str => CSSHelpers.fixCSS(new BufferedReader(
             new StringReader(str)), prefix openOr (S.contextPath)) match {
             case (Full(c), _) => CSSResponse(c)
-            case (_, input) => {
-              logger.info("Fixing " + cssPath + " failed");
+            case (x, input) => {
+              logger.info("Fixing " + cssPath + " failed with result %s".format(x));
               CSSResponse(input)
             }
           })

web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala

@@ -360,7 +360,7 @@ trait AbstractScreen extends Factory {
         case AVal(v: (T => List[FieldError])) => v
       },
       stuff.toList.collect {
-        case AFilter(v) => v
+        case AFilter(v) => v.asInstanceOf[T => T]
       },
       stuff)
   }
@@ -484,7 +484,7 @@ trait AbstractScreen extends Factory {
       }.toList
 
       override def setFilter = stuff.collect {
-        case AFilter(f) => f
+        case AFilter(f) => f.asInstanceOf[ValueType => ValueType]
       }.toList
 
       override def is = underlying.get
@@ -586,7 +586,7 @@ trait AbstractScreen extends Factory {
       }.toList
 
       override def setFilter = stuff.collect {
-        case AFilter(f) => f
+        case AFilter(f) => f.asInstanceOf[ValueType => ValueType]
       }.toList
 
       override def is = underlying.openOrThrowException("Legacy code").get
@@ -617,7 +617,7 @@ trait AbstractScreen extends Factory {
       case AVal(v: (T => List[FieldError])) => List(v)
       case _ => Nil
     }, stuff.toList.flatMap {
-      case AFilter(v) => List(v)
+      case AFilter(v) => List(v.asInstanceOf[T => T])
       case _ => Nil
     }, stuff).make
 
@@ -755,7 +755,7 @@ trait AbstractScreen extends Factory {
           override lazy val formElemAttrs: Seq[SHtml.ElemAttr] = grabParams(stuff)
 
           override val setFilter = stuff.flatMap {
-            case AFilter(f) => List(f)
+            case AFilter(f) => List(f.asInstanceOf[ValueType => ValueType])
             case _ => Nil
           }.toList
           override val validations = stuff.flatMap {
@@ -792,7 +792,7 @@ trait AbstractScreen extends Factory {
           override lazy val formElemAttrs: Seq[SHtml.ElemAttr] = grabParams(stuff)
 
           override val setFilter = stuff.flatMap {
-            case AFilter(f) => List(f)
+            case AFilter(f) => List(f.asInstanceOf[ValueType => ValueType])
             case _ => Nil
           }.toList
           override val validations = stuff.flatMap {