Now provide info for the resource resolver

Author: loverdos

src/main/scala/com/ckkloverdos/resource/ClassLoaderStreamResourceContext.scala

@@ -36,12 +36,12 @@ final class ClassLoaderStreamResourceContext private(
 
   def /(child: String) = new ClassLoaderStreamResourceContext(cl, parent, concatResourcePaths(this.extraPath, child))
 
-  def getLocalResource(path: String) = {
+  def getLocalResourceX(path: String) = {
     val actualPath = concatResourcePaths(extraPath, path)
     logger.debug("Searching for local resource %s (actual: %s) in %s".format(path, actualPath, this))
     cl.getResource(actualPath) match {
       case null     => NoVal
-      case localURL => Maybe(new URLStreamResource(actualPath, localURL))
+      case localURL => Maybe(ResolvedStreamResource(new URLStreamResource(actualPath, localURL), this))
     }
   }
 

src/main/scala/com/ckkloverdos/resource/CompositeStreamResourceContext.scala

@@ -30,8 +30,23 @@ final class CompositeStreamResourceContext(
 
   def /(child: String) = new CompositeStreamResourceContext(parent, others.map(_./(child)): _*)
 
-  def getLocalResource(path: String): Maybe[StreamResource] =
-    others find { rc => rc.getResource(path).isJust } map { _.getResource(path) } getOrElse NoVal
+  def getLocalResourceX(path: String): Maybe[ResolvedStreamResource] = {
+    var _rrcM: Maybe[ResolvedStreamResource] = NoVal
+    var _ctx: StreamResourceContext = null
+    var _found = false
+    val iter = others.iterator
+    while(!_found && iter.hasNext) {
+      _ctx = iter.next()
+      _rrcM = _ctx.getResourceX(path)
+      _found = _rrcM.isJust
+    }
+    
+    if(_found) {
+      _rrcM
+    } else {
+      NoVal
+    }
+  }
 
   override def toString = "CompositeStreamResourceContext(%s, %s)".format(parent, others)
 }

src/main/scala/com/ckkloverdos/resource/EmptyStreamResourceContext.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2011 Christos KK Loverdos
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.ckkloverdos.resource
+
+import com.ckkloverdos.maybe.NoVal
+
+/**
+ * A resource context that provides nothing.
+ *
+ * @author Christos KK Loverdos <loverdos@gmail.com>.
+ */
+object EmptyStreamResourceContext extends StreamResourceContextSkeleton(NoVal) {
+  def /(child: String) = this
+
+  def getLocalResourceX(path: String) = NoVal
+}

src/main/scala/com/ckkloverdos/resource/FileStreamResourceContext.scala

@@ -50,9 +50,9 @@ final class FileStreamResourceContext(
 
   def /(child: String) = new FileStreamResourceContext(new File(this.root, child), parent.map(_./(child)))
 
-  def getLocalResource(path: String) = {
+  def getLocalResourceX(path: String) = {
     new File(root, path) match {
-      case file if file.exists => Maybe(new FileStreamResource(file))
+      case file if file.exists => Maybe(ResolvedStreamResource(new FileStreamResource(file), this))
       case _ => NoVal
     }
   }

src/main/scala/com/ckkloverdos/resource/ResolvedStreamResource.scala

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012 Christos KK Loverdos
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.ckkloverdos.resource
+
+/**
+ * A [[com.ckkloverdos.resource.StreamResource]] with the [[com.ckkloverdos.resource.StreamResourceContext]] that
+ * resolved it.
+ * 
+ * @author Christos KK Loverdos <loverdos@gmail.com>
+ */
+
+case class ResolvedStreamResource(resource: StreamResource, resolver: StreamResourceContext)

src/main/scala/com/ckkloverdos/resource/StreamResourceContext.scala

@@ -32,6 +32,10 @@ trait StreamResourceContext {
   def getResource(path: String): Maybe[StreamResource]
 
   def getLocalResource(path: String): Maybe[StreamResource]
+  
+  def getResourceX(path: String): Maybe[ResolvedStreamResource]
+
+  def getLocalResourceX(path: String): Maybe[ResolvedStreamResource]
 }
 
 object StreamResourceContext {

src/main/scala/com/ckkloverdos/resource/StreamResourceContextSkeleton.scala

@@ -29,19 +29,27 @@ abstract class StreamResourceContextSkeleton(_parent: Maybe[StreamResourceContex
   def parent = _parent
 
   def getResource(path: String) = {
-    getLocalResource(path) match {
-      case j@Just(rc) =>
-        logger.debug("  Found %s".format(rc))
+    getResourceX(path).map(_.resource)
+  }
+
+  def getLocalResource(path: String) = {
+    getLocalResourceX(path).map(_.resource)
+  }
+
+  def getResourceX(path: String) = {
+    getLocalResourceX(path) match {
+      case j@Just(rrc) ⇒
+        logger.debug("  Found %s".format(rrc))
         j
-      case NoVal =>
+      case NoVal ⇒
         logger.debug("  ==> Not found")
         if(parent.isJust) {
           logger.debug("  Trying parent %s".format(parent))
-          parent.flatMap(_.getResource(path))
+          parent.flatMap(_.getResourceX(path))
         } else {
           NoVal
         }
-      case f@Failed(_, _) =>
+      case f@Failed(_, _) ⇒
         logger.warn("Error %s".format(f))
         f
     }

src/test/scala/com/ckkloverdos/resource/ResourceTest.scala

@@ -131,8 +131,8 @@ class ResourceTest {
 
   @Test
   def testPropsBoolean {
-    val key1val = ("key1", "on", true)
-    val key2val = ("key2",  "off", false)
+    val key1val = ("key1", "true", true)
+    val key2val = ("key2",  "false", false)
     val key3val = ("key3", "0", false)
     val all = Seq(key1val, key2val, key3val)
     val keyvals = all map { case (k, v, _) => (k, v) }