code 'color_to_rgb' filter

build.sbt

@@ -36,7 +36,7 @@ libraryDependencies ++= Seq(
 	"xyz.hyperreal" %% "lia" % "0.22.2",
 	"xyz.hyperreal" %% "json" % "0.7",
 	"xyz.hyperreal" %% "args" % "0.1",
-  "xyz.hyperreal" %% "hsl" % "0.2"
+  "xyz.hyperreal" %% "hsl" % "0.3.1"
 )
 
 coverageExcludedPackages := ".*Main;.*nil;.*package;.*Tag;.*Filter"

src/main/scala/ExtraColorFilters.scala

@@ -1,25 +1,36 @@
 //@
 package xyz.hyperreal.liquescent
 
+import xyz.hyperreal.hsl.HSL
 
-object ExtraColorFilters {
 
-  val hslRegex = """hsl\(\s*(\d+)\s*,\s*(\d+)\s*%\s*,\s*(\d+)\s*%\s*\)"""r
-  val hslaRegex = """hsl\(\s*(\d+)\s*,\s*(\d+)\s*%\s*,\s*(\d+)\s*%\s*,\s*(\d+(?:\.\d*)?)\s*\)"""r
+object ExtraColorFilters {
 
   val map =
     List(
 
       new Filter( "color_to_rgb" ) {
-        val colorRegex = "#[0-9a-fA-F]{6}".r.pattern
+        val hslRegex = """hsl\(\s*(\d+)\s*,\s*(\d+)\s*%\s*,\s*(\d+)\s*%\s*\)"""r
+        val hslaRegex = """hsla\(\s*(\d+)\s*,\s*(\d+)\s*%\s*,\s*(\d+)\s*%\s*,\s*(\d+(?:\.\d*)?)\s*\)"""r
+        val colorRegex = "#([0-9a-fA-F]{6})".r
 
         override def parameters = List( List(StringType) )
 
         override def apply( interp: Interpreter, settings: Map[Symbol, Any], args: List[Any], named: Map[String, Any], locals: Map[String, Any] ) =
           args match {
-            case List( s: String ) =>
-              if (colorRegex.matcher( s ).matches)
-                s drop 1 grouped 2 map (Integer.parseInt(_, 16)) mkString ("rgb(", ", ", ")")
+            case List( c: String ) =>
+              c match {
+                case hslRegex( h, s, l ) =>
+                  val (r, g, b) = HSL( h.toDouble/360, s.toDouble/100, l.toDouble/100 ).toRGB
+
+                  s"rgb($r, $g, $b)"
+                case hslaRegex( h, s, l, a ) =>
+                  val (r, g, b) = HSL( h.toDouble/360, s.toDouble/100, l.toDouble/100 ).toRGB
+
+                  s"rgba($r, $g, $b, $a)"
+                case colorRegex( h ) => h grouped 2 map (Integer.parseInt(_, 16)) mkString ("rgb(", ", ", ")")
+                case _ => sys.error( s"color doesn't match known format: $c" )
+              }
           }
       }
 

src/test/scala/ExtraColorFilterTests.scala

@@ -0,0 +1,15 @@
+//@
+package xyz.hyperreal.liquescent
+
+import org.scalatest._
+import prop.PropertyChecks
+
+
+class ExtraColorFilterTests extends FreeSpec with PropertyChecks with Matchers with Testing {
+
+  "color_to_rgb" in {
+		test( "{{ '#7ab55c' | color_to_rgb }}", true ) shouldBe "rgb(122, 181, 92)"
+		test( "{{ 'hsla(100, 38%, 54%, 0.5)' | color_to_rgb }}", true ) shouldBe "rgba(123, 182, 93, 0.5)"
+	}
+
+}