Fix #22: area and line js.Function fixed

Selection#datum should accept array and use correct Update type
Implicits added for js.Functions,  so all d3 functions/traits extends js.FunctionN can be used as DatumFunction

Author: spaced

src/main/scala/org/singlespaced/d3js/Ops.scala

@@ -35,6 +35,31 @@ object Ops {
   @inline implicit def fromFunction2To3IntPrimitive[Datum](value: (Datum, Int) => Int): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
     asPrimitive(value)
 
+  @inline implicit def fromJsFunction1To3StringPrimitive[Datum](value: js.Function1[Datum,String]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction1To3DoublePrimitive[Datum](value: js.Function1[Datum,Double]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction1To3IntPrimitive[Datum](value: js.Function1[Datum,Int]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction1To3BooleanPrimitive[Datum](value: js.Function1[Datum,Boolean]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction2To3StringPrimitive[Datum](value: js.Function2[Datum, Int,String]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction2To3DoublePrimitive[Datum](value: js.Function2[Datum, Int, Double]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction2To3BooleanPrimitive[Datum](value: js.Function2[Datum, Int, Boolean]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+  @inline implicit def fromJsFunction2To3IntPrimitive[Datum](value: js.Function2[Datum, Int, Int]): js.Function3[Datum, Int, js.UndefOr[Int], Primitive] =
+    asPrimitive(value)
+
+
   @inline implicit def asPrimitive[Datum, T](value: Datum => T) =
     fromFunction1To3(value.andThen(_.asInstanceOf[Primitive]))
 

src/main/scala/org/singlespaced/d3js/selection.scala

@@ -80,6 +80,7 @@ trait BaseSelection[Datum, T <: BaseSelection[Datum,T]] extends BaseDom[Datum,T]
 
   def datum(): Datum = js.native
   def datum[NewDatum](value: NewDatum): Update[NewDatum] = js.native
+  def datum[NewDatum](value: js.Array[NewDatum]): Update[NewDatum] = js.native
   def datum[NewDatum](value: DatumFunction[NewDatum]): Update[NewDatum] = js.native
 
   def sort(comparator: js.Function2[Datum, Datum, Double] = ???): T = js.native

src/main/scala/org/singlespaced/d3js/svg.scala

@@ -41,7 +41,7 @@ trait SvgObject extends js.Object {
 package svg {
 
 @js.native
-trait Line[T] extends js.Function1[js.Array[T],String] {
+trait Line[T] extends js.Function1[T,String] {
 
   def apply[T]():Line[T] = js.native
 
@@ -187,7 +187,7 @@ trait Brush[T] extends js.Function1[Selection[T] | Transition[T], Unit] {
 
 
 @js.native
-trait Area[T] extends js.Function1[js.Array[T],String] {
+trait Area[T] extends js.Function1[T,String] {
 
   def apply[T]():Area[T] = js.native
 

src/test/scala/org/singlespaced/d3js/SvgAreaTest.scala

@@ -25,18 +25,19 @@ object SvgAreaTest extends TestSuite {
         .x((d:TestDatum,i:Int) =>  d.v.toDouble )
         .y((d:TestDatum,i:Int) =>  d.v.toDouble )
       //assert
-      d3.select(elem).data(data)
+
+      d3.select(elem).datum(data)
         .append("path")
-        .attr("d", result(data))
+        .attr("d", result)
 
       val actual=dom.document.getElementsByTagName("path")
       assert( actual.length == 1)
       assert( actual.item(0).asInstanceOf[dom.Element].getAttribute("d") =="M1,1L4,4L4,4L1,1Z")
+
     }
     'd3_area_radial {
       val area = d3.svg.area.radial().interpolate("basis").tension(0).radius(100)
     }
-
   }
 }
 

src/test/scala/org/singlespaced/d3js/SvgLineTest.scala

@@ -26,9 +26,9 @@ object SvgLineTest extends TestSuite {
         .x((d:TestDatum,i:Int) =>  d.v.toDouble )
         .y((d:TestDatum,i:Int) =>  d.v.toDouble )
       //assert
-      d3.select(elem).data(data)
+      d3.select(elem).datum(data)
         .append("path")
-        .attr("d", result(data))
+        .attr("d", result)
 
       val actual=dom.document.getElementsByTagName("path")
       assert( actual.length == 1)