moved mapper stuff into own module

casbah-core/src/main/scala/MongoCursor.scala

@@ -138,32 +138,3 @@ class MongoTypedCursor[A <: DBObject : Manifest] protected[casbah](val underlyin
   }
   override def toString() =  "MongoCursor{Iterator[_] with %d objects.}".format(count)
 }
-
-package mapper {
-
-  trait MappedIterator[P <: AnyRef] extends MongoCursorWrapper[P] with Iterator[P] {
-    val underlying: DBCursor
-    val mapper: Mapper[P]
-
-    def count = underlying.count
-    override def size = count.intValue
-
-    def next: P = mapper.asObject(underlying.next)
-    def hasNext: Boolean = underlying.hasNext
-  }
-
-  class MongoMappedCursor[P <: AnyRef : Manifest] protected[mapper](val underlying: DBCursor) extends MappedIterator[P] with MapperImplicits[P] {
-    val mapper = Mapper[P]
-
-    def batchSize(n: Int) = underlying.batchSize(n) asScalaMapped
-    def copy() = underlying.copy asScalaMapped
-    def hint(indexKeys: DBObject) = underlying.hint(indexKeys) asScalaMapped
-    def hint(indexName: String) = underlying.hint(indexName) asScalaMapped
-    def limit(n: Int) = underlying.limit(n) asScalaMapped
-    def skip(n: Int) = underlying.skip(n) asScalaMapped
-    def snapshot() = underlying.snapshot() asScalaMapped
-    def sort(orderBy: DBObject) = underlying.sort(orderBy) asScalaMapped
-    override def toString() =  "MongoMappedCursor{Iterator[_] with %d objects.}".format(count)
-  }
-
-}

casbah-core/src/main/scala/MongoDB.scala

@@ -57,8 +57,6 @@ class MongoDB(val underlying: com.mongodb.DB) {
    * @return MongoCollection A wrapped instance of a Mongo DBCollection Class returning DBObject subclasses of type A
    */
   def apply[A <: DBObject](collection: String, clazz: Class[A])(implicit m: scala.reflect.Manifest[A]) = underlying.getCollection(collection).asScalaTyped(m)
-  def mapped[P <: AnyRef : Manifest] =
-    underlying.getCollection(mapper.Mapper[P].coll.getName).asScalaMapped(manifest[P])
   def addUser(username: String, passwd: String) = underlying.addUser(username, passwd.toArray)
   def authenticate(username: String, passwd: String) = underlying.authenticate(username, passwd.toArray)
   def command(cmd: DBObject) = underlying.command(cmd)

src/main/java/com/novus/casbah/mongodb/mapper/annotations/raw/ID.java → casbah-mapper/src/main/java/com/novus/casbah/mapper/annotations/raw/ID.java

@@ -1,4 +1,4 @@
-package com.novus.casbah.mongodb.mapper.annotations.raw;
+package com.novus.casbah.mapper.annotations.raw;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/novus/casbah/mongodb/mapper/annotations/raw/Key.java → casbah-mapper/src/main/java/com/novus/casbah/mapper/annotations/raw/Key.java

@@ -1,4 +1,4 @@
-package com.novus.casbah.mongodb.mapper.annotations.raw;
+package com.novus.casbah.mapper.annotations.raw;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/novus/casbah/mongodb/mapper/annotations/raw/UseTypeHints.java → casbah-mapper/src/main/java/com/novus/casbah/mapper/annotations/raw/UseTypeHints.java

@@ -1,4 +1,4 @@
-package com.novus.casbah.mongodb.mapper.annotations.raw;
+package com.novus.casbah.mapper.annotations.raw;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/scala/mongodb/mapper/Mapper.scala → casbah-mapper/src/main/scala/mapper/Mapper.scala

@@ -1,5 +1,4 @@
 package com.novus.casbah
-package mongodb
 package mapper
 
 import java.lang.reflect.Method

src/main/scala/mongodb/mapper/MongoMappedCollection.scala → casbah-mapper/src/main/scala/mapper/MongoMappedCollection.scala

@@ -1,5 +1,4 @@
 package com.novus.casbah
-package mongodb
 package mapper
 
 import Implicits._

src/main/scala/mongodb/mapper/annotations.scala → casbah-mapper/src/main/scala/mapper/annotations.scala

@@ -1,4 +1,4 @@
-package com.novus.casbah.mongodb.mapper
+package com.novus.casbah.mapper
 
 import scala.reflect.BeanInfo
 import scala.annotation.target.{getter, setter}

project/build/CasbahProject.scala

@@ -5,9 +5,10 @@ class CasbahProject(info: ProjectInfo) extends ParentProject(info) with posterou
   override def parallelExecution = true
 
   lazy val commons = project("casbah-commons", "casbah-commons", new CasbahCommonsProject(_))
-  lazy val core = project("casbah-core", "casbah-core", new CasbahCoreProject(_), query)
+  lazy val core = project("casbah-core", "casbah-core", new CasbahCoreProject(_), commons, query)
   lazy val query = project("casbah-query", "casbah-query", new CasbahQueryProject(_), commons)
   lazy val gridfs = project("casbah-gridfs", "casbah-gridfs", new CasbahGridFSProject(_), core)
+  lazy val mapper = project("casbah-mapper", "casbah-mapper", new CasbahMapperProject(_), core)
 
   class CasbahCommonsProject(info: ProjectInfo) extends DefaultProject(info) {
     override def compileOptions = 
@@ -48,6 +49,14 @@ class CasbahProject(info: ProjectInfo) extends ParentProject(info) with posterou
     val scalatest = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "test"
   }
 
+  class CasbahMapperProject(info: ProjectInfo) extends DefaultProject(info) {
+    override def compileOptions = 
+      super.compileOptions ++ Seq(Unchecked, ExplainTypes, Deprecation)
+    val objenesis = "org.objenesis" % "objenesis" % "1.2"
+    // Testing Deps
+    val specs = "org.scala-tools.testing" %% "specs" % "1.6.5" % "test->default"
+    val scalatest = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "test"
+  }
 
   // Repositories
   val scalaToolsRepo = "Scala Tools Release Repository" at "http://scala-tools.org/repo-releases"