Fixes for 0.7 and add some basic tests (#6)

* Add some basic tests.

Node -> node.

* v0.7 compatibility

* CI updates.

* Address comments.

* Address more comments.

Author: tkoolen

.travis.yml

@@ -1,19 +1,21 @@
-# Documentation: http://docs.travis-ci.com/user/languages/julia/
+## Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
 os:
   - linux
   - osx
 julia:
-  - release
+  - 0.6
+  - 0.7
+  - 1.0
   - nightly
+matrix:
+  allow_failures:
+  - julia: nightly
+branches:
+  only:
+    - master
+    - /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
 notifications:
   email: false
-# uncomment the following lines to override the default test script
-#script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'Pkg.clone(pwd()); Pkg.build("CSSUtil"); Pkg.test("CSSUtil"; coverage=true)'
 after_success:
-  # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("CSSUtil")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-  # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("CSSUtil")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+- julia coverage.jl

README.md

@@ -1,15 +1,15 @@
 # CSSUtil
 
 CSSUtil provides utilities to create and align
-various web elements on the DOM. 
+various web elements on the DOM.
 
-## Example Usage 
+## Example Usage
 ```julia
 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,6 @@
 julia 0.6
+Compat 0.61.0 # for uppercasefirst
 Measures
 Colors
-WebIO
+WebIO 0.2.6 # for node
 JSON

coverage.jl

@@ -0,0 +1,4 @@
+import Pkg
+Pkg.add("Coverage")
+using Coverage
+Codecov.submit(Codecov.process_folder())

src/CSSUtil.jl

@@ -1,13 +1,16 @@
 module CSSUtil
 
-import Base: @md_str
+using Compat
+using Compat.Markdown
+
+import Compat.Markdown: @md_str
 
 export style, empty
 export @md_str
 
 using WebIO
 using JSON
-import WebIO: render, Node
+import WebIO: render
 
 using Measures
 using Colors
@@ -28,11 +31,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,10 +23,12 @@ function flex(elem=nothing)
     style(elem, "display"=>"flex")
 end
 
-function container(xs...)
+function container(xs::AbstractVector)
     dom"div"(xs...)
 end
 
+container(xs...) = container([xs...])
+
 """
     hbox(el...)
 

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

@@ -1,5 +1,35 @@
 using CSSUtil
-using Base.Test
+using WebIO
+using Compat.Test
 
-# write your own tests here
-@test 1 == 1
+@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)
+    @test el2 ∈ children(box)
+end
+
+@testset "vbox" begin
+    el1 = node(:div, "Hello world!")
+    el2 = node(:div, "Goodbye world!")
+    box = vbox(el1, el2)
+    @test props(box)[:style]["display"] == "flex"
+    @test props(box)[:style]["flex-direction"] == "column"
+    @test el1 ∈ children(box)
+    @test el2 ∈ children(box)
+end
+
+@testset "hline" begin
+    line = hline()
+    @test haskey(props(line)[:style], "borderBottom")
+    @test props(line)[:style]["align-self"] == "stretch"
+end
+
+@testset "vline" begin
+    line = vline()
+    @test haskey(props(line)[:style], "borderLeft")
+    @test props(line)[:style]["align-self"] == "stretch"
+end