Extracted props into hprops

nkpart · Feb 24, 2010 · 264b2e7 · 264b2e7
1 parent 47a5dba
commit 264b2e7
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 229 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1,6 +1,6 @@
 #Project properties
 #Wed Feb 03 09:29:37 EST 2010
-project.organization=prohax
+project.organization=nkpart
 project.name=sage
 sbt.version=0.6.10
 project.version=0.1

diff --git a/project/build/sage.scala b/project/build/sage.scala
@@ -1,12 +1,12 @@
 import sbt._
 
 class SageProject(info: ProjectInfo) extends DefaultProject(info) {
-
-  Credentials.add("Secure Area", "localhost", "admin", "admin123")
-
-  override def managedStyle = ManagedStyle.Maven
-  val publishTo = "Secure Area" at "http://localhost:8080/"
-
+    // 
+    // Credentials.add("Secure Area", "localhost", "admin", "admin123")
+    // 
+    // override def managedStyle = ManagedStyle.Maven
+    // val publishTo = "Secure Area" at "http://localhost:8080/"
+    // 
 
   val snapshots = "scala-tools snapshots" at "http://www.scala-tools.org/repo-snapshots"
   val scalatest = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT" % "test"
@@ -18,4 +18,6 @@ class SageProject(info: ProjectInfo) extends DefaultProject(info) {
 
   val scalaz_core = "com.googlecode.scalaz" % "scalaz-core_2.8.0.Beta1" % "5.0-SNAPSHOT"
   val scalaz_http = "com.googlecode.scalaz" % "scalaz-http_2.8.0.Beta1" % "5.0-SNAPSHOT"
+
+  val hprops = "nkpart" %% "hprops" % "0.1"
 }
diff --git a/src/main/scala/props/FunctionWs.scala b/src/main/scala/props/FunctionWs.scala
diff --git a/src/main/scala/props/Instances.scala b/src/main/scala/props/Instances.scala
diff --git a/src/main/scala/props/MA.scala b/src/main/scala/props/MA.scala
diff --git a/src/main/scala/props/Property.scala b/src/main/scala/props/Property.scala
diff --git a/src/main/scala/props/PropsDSL.scala b/src/main/scala/props/PropsDSL.scala
diff --git a/src/main/scala/props/package.scala b/src/main/scala/props/package.scala
diff --git a/src/main/scala/sage/EntityBase.scala b/src/main/scala/sage/EntityBase.scala
@@ -1,6 +1,6 @@
 package sage
 
-import props._
+import hprops._
 import scalaz._
 import Scalaz._
 import com.google.appengine.api.datastore._

diff --git a/src/main/scala/sage/EntityProperties.scala b/src/main/scala/sage/EntityProperties.scala
@@ -1,6 +1,6 @@
 package sage
 
-import props._
+import hprops._
 import scalaz._
 import Scalaz._
 import com.google.appengine.api.datastore._

diff --git a/src/main/scala/sage/http/Postable.scala b/src/main/scala/sage/http/Postable.scala
@@ -1,7 +1,7 @@
 package sage
 package http
 
-import props._
+import hprops._
 import scalaz.http.request._
 import scalaz._
 import Scalaz._
@@ -11,7 +11,7 @@ import metascala.HLists._
 trait StringW {
   val str: String
 
-  import props._
+  import hprops._
 
   def as[T](implicit p: Postable[T]) = new ReadUpdate[Request[Stream], T] {
     def get(r: Request[Stream]) = (r |! str).map(_.mkString).toSuccess(missing(str).wrapNel) >>= (v => p.read(v).toSuccess(invalid(str).wrapNel))

diff --git a/src/main/scala/sage/package.scala b/src/main/scala/sage/package.scala
@@ -1,7 +1,7 @@
 import sage.EntityImplicits
 import scalaz._
 import Scalaz._
-import props._
+import hprops._
 
 import metascala.HLists._
 
@@ -10,4 +10,4 @@ package object sage extends
   with FunctionWs 
   with FindDSLImplicits 
   with EntityProperties 
-  with PropsDSL 
+  with HPropsDSL 
diff --git a/src/test/scala/sage/PropertySpec.scala b/src/test/scala/sage/PropertySpec.scala
@@ -1,6 +1,6 @@
 package sage
 
-import props._
+import hprops._
 import scalaz._
 import Scalaz._
 import org.scalatest._

diff --git a/src/test/scala/sage/RequestSpec.scala b/src/test/scala/sage/RequestSpec.scala
@@ -2,7 +2,7 @@ package sage
 
 import metascala.HLists._
 
-import props._
+import hprops._
 import scalaz._
 import Scalaz._
 

diff --git a/src/test/scala/sage/spec1.scala b/src/test/scala/sage/spec1.scala
@@ -5,7 +5,7 @@ import metascala.HLists._
 import scalaz._
 import Scalaz._
 
-import props._
+import hprops._
 import org.scalatest._
 import org.scalatest.matchers.ShouldMatchers