Merge pull request #193 from zamzterz/redis-scheme-db-number

Parse the database number from the path of the connection URI.

Author: debasishg

src/main/scala/com/redis/RedisClient.scala

@@ -13,6 +13,14 @@ object RedisClient {
   case object SUM extends Aggregate
   case object MIN extends Aggregate
   case object MAX extends Aggregate
+
+  private def extractDatabaseNumber(connectionUri: java.net.URI): Int = {
+    Option(connectionUri.getPath).map(path =>
+      if (path.isEmpty) 0
+      else Integer.parseInt(path.tail)
+    )
+      .getOrElse(0)
+  }
 }
 
 trait Redis extends IO with Protocol {
@@ -102,13 +110,14 @@ class RedisClient(override val host: String, override val port: Int,
   def this(connectionUri: java.net.URI) = this(
     host = connectionUri.getHost,
     port = connectionUri.getPort,
+    database = RedisClient.extractDatabaseNumber(connectionUri),
     secret = Option(connectionUri.getUserInfo)
       .flatMap(_.split(':') match {
         case Array(_, password, _*) ⇒ Some(password)
         case _ ⇒ None
       })
   )
-  override def toString = host + ":" + String.valueOf(port)
+  override def toString = host + ":" + String.valueOf(port) + "/" + database
 
   def pipeline(f: PipelineClient => Any): Option[List[Any]] = {
     send("MULTI")(asString) // flush reply stream

src/test/scala/com/redis/RedisClientSpec.scala

@@ -0,0 +1,31 @@
+package com.redis
+
+import java.net.URI
+
+import org.scalatest.FunSpec
+import org.scalatest.Matchers
+import org.scalatest.junit.JUnitRunner
+import org.junit.runner.RunWith
+
+@RunWith(classOf[JUnitRunner])
+class RedisClientSpec extends FunSpec
+  with Matchers {
+
+  describe("constructor") {
+    it("should parse the db-number from the path of connection uri") {
+      val client = new RedisClient(new URI("redis://localhost:6379/4"))
+      client.database shouldBe 4
+    }
+
+    it("should default to db 0 for connection uri without db-number") {
+      val client = new RedisClient(new URI("redis://localhost:6379"))
+      client.database shouldBe 0
+    }
+  }
+
+  describe("toString") {
+    it("should include the db-number") {
+      new RedisClient("localhost", 6379, 1).toString shouldBe "localhost:6379/1"
+    }
+  }
+}