v0.27.0 - support for custom HTML elements

Project.toml

@@ -1,7 +1,7 @@
 name = "Genie"
 uuid = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
 authors = ["Adrian Salceanu <[email protected]>"]
-version = "0.26.2"
+version = "0.27.0"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

src/Configuration.jl

@@ -3,7 +3,7 @@ Core genie configuration / settings functionality.
 """
 module Configuration
 
-const GENIE_VERSION = v"0.26.2"
+const GENIE_VERSION = v"0.27.0"
 
 import Logging
 import Genie

src/renderers/Html.jl

@@ -32,10 +32,11 @@ const NORMAL_ELEMENTS = [ :html, :head, :body, :title, :style, :address, :articl
                           :q, :rp, :rt, :rtc, :ruby, :s, :samp, :small, :spam, :strong, :sub, :sup, :time,
                           :u, :var, :wrb, :audio, :map, :void, :embed, :object, :canvas, :noscript, :script,
                           :del, :ins, :caption, :col, :colgroup, :table, :tbody, :td, :tfoot, :th, :thead, :tr,
-                          :button, :datalist, :fieldset, :form, :label, :legend, :meter, :optgroup, :option,
+                          :button, :datalist, :fieldset, :label, :legend, :meter,
                           :output, :progress, :select, :textarea, :details, :dialog, :menu, :menuitem, :summary,
                           :slot, :template, :blockquote, :center]
 const VOID_ELEMENTS   = [:base, :link, :meta, :hr, :br, :area, :img, :track, :param, :source, :input]
+const CUSTOM_ELEMENTS = [:form, :select]
 const BOOL_ATTRIBUTES = [:checked, :disabled, :selected]
 
 export HTMLString, html
@@ -625,6 +626,10 @@ function register_elements() :: Nothing
     register_void_element(elem)
   end
 
+  for elem in CUSTOM_ELEMENTS
+    Core.eval(@__MODULE__, """include("html/$elem.jl")""" |> Meta.parse)
+  end
+
   nothing
 end
 

src/renderers/html/form.jl

@@ -0,0 +1,17 @@
+function form(f::Function, args...; attrs...) :: HTMLString
+  normal_element(f, "form", [args...], attr(attrs...))
+end
+
+function form(children::Union{String,Vector{String}} = "", args...; attrs...) :: HTMLString
+  normal_element(children, "form", [args...], attr(attrs...))
+end
+
+function attr(attrs...)
+  attrs = Pair{Symbol,Any}[attrs...]
+
+  for p in attrs
+    p[1] == :enctype && return attrs
+  end
+
+  push!(attrs, :enctype => "multipart/form-data")
+end

src/renderers/html/select.jl

@@ -0,0 +1,39 @@
+Base.@kwdef struct option
+  disabled::Bool = false
+  selected::Bool = false
+  value::String = ""
+  text::String = value
+end
+
+
+function Base.string(o::option) :: HTMLString
+  attributes = String[]
+
+  o.disabled && push!(attributes, "disabled")
+  o.selected && push!(attributes, "selected")
+  push!(attributes, "value=\"$(o.value)\"")
+
+  "<option $(join(attributes, " "))>$(o.text)</option>"
+end
+
+
+function select(options::Vector{option}, args...; attrs...) :: HTMLString
+  children = String[]
+
+  for o in options
+    push!(children, string(o))
+  end
+
+  normal_element(children, "select", [args...], Pair{Symbol,Any}[attrs...])
+end
+
+
+function optgroup(options::Vector{option}, args...; attrs...) :: HTMLString
+  children = String[]
+
+  for o in options
+    push!(children, string(o))
+  end
+
+  normal_element(children, "optgroup", [args...], Pair{Symbol,Any}[attrs...])
+end