Changed ids underlying type to String and made Ids and Names — value-classes

1 files changed, 20 insertions, 14 deletions

diff --git a/src/main/scala/xyz/driver/core/core.scala b/src/main/scala/xyz/driver/core/core.scala
index b7fbeb6..fa0028b 100644
--- a/src/main/scala/xyz/driver/core/core.scala
+++ b/src/main/scala/xyz/driver/core/core.scala
@@ -3,10 +3,13 @@ package xyz.driver
 import scalaz.Equal
 
 package object core {
+
   import scala.language.reflectiveCalls
 
   def make[T](v: => T)(f: T => Unit): T = {
-    val value = v; f(value); value
+    val value = v
+    f(value)
+    value
   }
 
   def using[R <: { def close() }, P](r: => R)(f: R => P): P = {
@@ -17,30 +20,33 @@ package object core {
       resource.close()
     }
   }
+}
 
-  object tagging {
-    private[core] trait Tagged[+V, +Tag]
+package core {
+
+  final case class Id[+Tag](value: String) extends AnyVal {
+    def length: Int               = value.length
+    override def toString: String = value
   }
-  type @@[+V, +Tag] = V with tagging.Tagged[V, Tag]
 
-  type Id[+Tag] = Long @@ Tag
   object Id {
-    def apply[Tag](value: Long) = value.asInstanceOf[Id[Tag]]
+    implicit def idEqual[T]: Equal[Id[T]]       = Equal.equal[Id[T]](_ == _)
+    implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by[Id[T], String](_.value)
   }
-  implicit def idEqual[T]: Equal[Id[T]]       = Equal.equal[Id[T]](_ == _)
-  implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by(i => i: Long)
 
-  type Name[+Tag] = String @@ Tag
-  object Name {
-    def apply[Tag](value: String) = value.asInstanceOf[Name[Tag]]
+  final case class Name[+Tag](value: String) extends AnyVal {
+    def length: Int               = value.length
+    override def toString: String = value
   }
 
-  implicit def nameEqual[T]: Equal[Name[T]]       = Equal.equal[Name[T]](_ == _)
-  implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(n => n: String)
+  object Name {
+    implicit def nameEqual[T]: Equal[Name[T]]       = Equal.equal[Name[T]](_ == _)
+    implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(_.value)
+  }
 
   object revision {
     final case class Revision[T](id: String)
 
     implicit def revisionEqual[T]: Equal[Revision[T]] = Equal.equal[Revision[T]](_.id == _.id)
   }
-}
+}
\ No newline at end of file