Spark + Zeppelin fixes. (#68)

* fix #66 plot not resizing;
* fix #67 Spark broken
* fixed zep generator display implicit wrong
* sortOrder shorthand syntax

Author: aishfenton

build.sbt

@@ -176,7 +176,7 @@ lazy val spark = project.
   settings(commonSettings: _*).
   settings(
     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-sql" % "[1.5,)" % "provided"
+      "org.apache.spark" %% "spark-sql" % "[2.0,)" % "provided"
     )
   )
 

core/src/main/scala/vegas/package.scala

@@ -47,7 +47,12 @@ package object vegas {
   val TimeUnit = Spec.TimeUnitEnums
   val Nice = Spec.NiceTimeEnums
 
-  val SortOrder = Spec.SortOrderEnums
+  object SortOrder {
+    val Ascending = Spec.SortOrderEnums.Ascending
+    val Asc = Spec.SortOrderEnums.Ascending
+    val Descending = Spec.SortOrderEnums.Descending
+    val Desc = Spec.SortOrderEnums.Descending
+  }
 
   val Category10 = "category10"
   val Category20 = "category20"

core/src/main/scala/vegas/render/StaticHTMLRenderer.scala

@@ -56,8 +56,10 @@ case class StaticHTMLRenderer(specJson: String) extends BaseHTMLRenderer {
       |  <script>
       |    if (typeof resizeIFrame != 'function') {
       |      function resizeIFrame(el, k) {
-      |        el.style.height = el.contentWindow.document.body.scrollHeight + 'px';
-      |        if (k <= 7) { setTimeout(function() { resizeIFrame(el, k+1) }, 1000) };
+      |        $$(el.contentWindow.document).ready(function() {
+      |          el.style.height = el.contentWindow.document.body.scrollHeight + 'px';
+      |        });
+      |        if (k <= 10) { setTimeout(function() { resizeIFrame(el, k+1) }, 1000 + (k * 250)) };
       |      }
       |    }
       |    $$().ready( function() { resizeIFrame($$('#${frameName}').get(0), 1); });

core/src/test/scala/vegas/fixtures/VegasPlots.scala

@@ -50,8 +50,8 @@ object VegasPlots {
     Vegas("Plot to show Binning options").
       withURL(Movies).
       mark(Bar).
-      encodeX("Worldwide_Gross", Quantitative, bin=Bin(maxbins=20.0), sortOrder=SortOrder.Descending).
-      encodeY(field="*", Quantitative, aggregate=AggOps.Count)
+      encodeX("Worldwide_Gross", Quant, bin=Bin(maxbins=20.0), sortOrder=SortOrder.Desc).
+      encodeY(field="*", Quant, aggregate=AggOps.Count)
 
   val ColoredTextScatterPlot =
     Vegas("Plot to show usage of encodeText").

core/src/test/scala/vegas/util/NotebookGenerator.scala

@@ -119,12 +119,14 @@ class JupyterGenerator extends NotebookGenerator {
 class ZeppelinGenerator extends NotebookGenerator {
 
   def preamble(version: String) =
-    ("", s"""com.github.aishfenton:vegas-spark_2.10:${version}""") ::
+    ("", s"""
+     |%dep
+     |z.load("com.github.aishfenton:vegas-spark_2.11:${version}")""".stripMargin) ::
     ("", """
      |import vegas._
      |import vegas.data.External._
      |import vegas.render.HTMLRenderer._
-     |implicit val displayer: String => Unit = (s) => s"%html + $s" """.stripMargin) ::
+     |implicit val displayer: String => Unit = (s) => println(s"%html $s")""".stripMargin) ::
     Nil
 
   def mkNotebook(plots: List[(String, String)]) = {