Fixes for 0.7 and add some basic tests

README.md

@@ -8,8 +8,8 @@ various web elements on the DOM.
 using WebIO
 using CSSUtil
 
-el1 = node(:div, "Hello world!")
-el2 = node(:div, "Goodbye world!")
+el1 = Node(:div, "Hello world!")
+el2 = Node(:div, "Goodbye world!")
 
 el3 = hbox(el1, el2) # aligns horizontally
 el4 = hline() # draws horizontal line

REQUIRE

@@ -1,5 +1,5 @@
 julia 0.6
-Compat
+Compat 0.61.0 # for uppercasefirst
 Measures
 Colors
 WebIO

src/CSSUtil.jl

@@ -1,6 +1,9 @@
 module CSSUtil
 
-import Base: @md_str
+using Compat
+using Compat.Markdown
+
+import Compat.Markdown: @md_str
 
 export style, empty
 export @md_str
@@ -9,6 +12,13 @@ using WebIO
 using JSON
 import WebIO: render, Node
 
+if isdefined(WebIO, :node) # TODO: remove once a new WebIO tag is in
+    using WebIO: node
+else
+    using WebIO: Node
+    const node = Node
+end
+
 using Measures
 using Colors
 
@@ -28,11 +38,11 @@ function style(elem, p::Pair...)
     render(elem)(style(p...))
 end
 
-function style(::Void, arg::Pair...)
+function style(::Nothing, arg::Pair...)
     style(arg...)
 end
 
-function style(::Void, arg::Dict)
+function style(::Nothing, arg::Dict)
     style(arg)
 end
 

src/layout.jl

@@ -23,7 +23,7 @@ function flex(elem=nothing)
     style(elem, "display"=>"flex")
 end
 
-function container(xs...)
+function container(xs::AbstractVector)
     dom"div"(xs...)
 end
 

src/theme.jl

@@ -3,7 +3,7 @@ export border, borderstyle, bordercolor, borderwidth, hline, vline,
 
 function _border_prefix(side::Union{Symbol, String})
     assertoneof(side, ["top", "bottom", "left", "right"], "side")
-    "border$(ucfirst(side))"
+    "border$(uppercasefirst(side))"
 end
 
 function assertstyle(style)
@@ -39,11 +39,11 @@ end
 """
     hline()
 
-    Draw a horizonal line. 
+    Draw a horizonal line.
 
 Keyword Arguments:
 =================
- - style: Indicates whether line should be solid or dotted. 
+ - style: Indicates whether line should be solid or dotted.
 Defaults to "solid"
 - w: Specifies line width. Defaults to 1px
 - color: specifies color in hex code RGB. Defaults to "#dedede".
@@ -55,11 +55,11 @@ end
 """
     vline()
 
-    Draw a vertical line. 
+    Draw a vertical line.
 
 Keyword Arguments:
 =================
- - style: Indicates whether line should be solid or dotted. 
+ - style: Indicates whether line should be solid or dotted.
 Defaults to "solid"
 - w: Specifies line width. Defaults to 1px
 - color: specifies color in hex code RGB. Defaults to "#dedede".

test/runtests.jl

@@ -2,14 +2,21 @@ using CSSUtil
 using WebIO
 using Compat.Test
 
+if isdefined(WebIO, :node) # TODO: remove once a new WebIO tag is in
+    using WebIO: node
+else
+    using WebIO: Node
+    const node = Node
+end
+
 @testset "hbox" begin
     el1 = node(:div, "Hello world!")
     el2 = node(:div, "Goodbye world!")
     box = hbox(el1, el2)
     @test props(box)[:style]["display"] == "flex"
     @test props(box)[:style]["flex-direction"] == "row"
-    @test el1 ∈ children(box)[1]
-    @test el2 ∈ children(box)[1]
+    @test el1 ∈ children(box)
+    @test el2 ∈ children(box)
 end
 
 @testset "vbox" begin
@@ -18,8 +25,8 @@ end
     box = vbox(el1, el2)
     @test props(box)[:style]["display"] == "flex"
     @test props(box)[:style]["flex-direction"] == "column"
-    @test el1 ∈ children(box)[1]
-    @test el2 ∈ children(box)[1]
+    @test el1 ∈ children(box)
+    @test el2 ∈ children(box)
 end
 
 @testset "hline" begin