Fixing formlet additions
This commit is contained in:
Jay McCarthy
parent
e6219740b8
commit
9a31ac5363
|
|
@ -152,64 +152,163 @@
|
|||
(test-process (make-input* (lambda (n) n)) empty)
|
||||
empty)
|
||||
|
||||
; XXX input process
|
||||
; XXX input output
|
||||
|
||||
; text
|
||||
(test-equal? "text-input"
|
||||
(->cons (test-process (text-input) (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
; XXX output
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input))
|
||||
'((input ((name "input_0") (type "text")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:value #"test"))
|
||||
'((input ((name "input_0") (type "text") (value "test")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:size 20))
|
||||
'((input ((name "input_0") (type "text") (size "20")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:max-length 20))
|
||||
'((input ((name "input_0") (type "text") (maxlength "20")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:read-only? #t))
|
||||
'((input ((name "input_0") (type "text") (readonly "true")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:read-only? #f))
|
||||
'((input ((name "input_0") (type "text")))))
|
||||
(test-equal? "text-input"
|
||||
(test-display (text-input #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "text") (test "Test")))))
|
||||
|
||||
; password
|
||||
(test-equal? "password-input"
|
||||
(->cons (test-process (password-input) (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
; XXX output
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input))
|
||||
'((input ((name "input_0") (type "password")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:value #"test"))
|
||||
'((input ((name "input_0") (type "password") (value "test")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:size 20))
|
||||
'((input ((name "input_0") (type "password") (size "20")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:max-length 20))
|
||||
'((input ((name "input_0") (type "password") (maxlength "20")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:read-only? #t))
|
||||
'((input ((name "input_0") (type "password") (readonly "true")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:read-only? #f))
|
||||
'((input ((name "input_0") (type "password")))))
|
||||
(test-equal? "password-input"
|
||||
(test-display (password-input #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "password") (test "Test")))))
|
||||
|
||||
; TEXTAREA element
|
||||
(test-equal? "textarea-input"
|
||||
(binding:form-value (test-process (textarea-input) (list (make-binding:form #"input_0" #"value"))))
|
||||
#"value")
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input))
|
||||
'((textarea ([name "input_0"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:rows 80))
|
||||
'((textarea ([name "input_0"] [rows "80"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:cols 80))
|
||||
'((textarea ([name "input_0"] [cols "80"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:cols 80 #:rows 70))
|
||||
'((textarea ([name "input_0"] [rows "70"] [cols "80"]) "")))
|
||||
|
||||
; checkbox
|
||||
(test-equal? "checkbox"
|
||||
(->cons (test-process (checkbox #"start" #t) (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
; XXX output
|
||||
(test-equal? "checkbox"
|
||||
(test-display (checkbox #"start" #t))
|
||||
'((input
|
||||
((name "input_0") (type "checkbox") (value "start") (checked "true")))))
|
||||
(test-equal? "checkbox"
|
||||
(test-display (checkbox #"start" #f))
|
||||
'((input ((name "input_0") (type "checkbox") (value "start")))))
|
||||
(test-equal? "checkbox"
|
||||
(test-display (checkbox #"start" #t #:attributes '([test "Test"])))
|
||||
'((input
|
||||
((name "input_0")
|
||||
(type "checkbox")
|
||||
(value "start")
|
||||
(checked "true")
|
||||
(test "Test")))))
|
||||
|
||||
; XXX radio process
|
||||
; XXX radio output
|
||||
; radio
|
||||
(test-equal? "radio"
|
||||
(->cons (test-process (radio #"start" #t) (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "radio"
|
||||
(test-display (radio #"start" #t))
|
||||
'((input ((name "input_0") (type "radio") (checked "true")))))
|
||||
(test-equal? "radio"
|
||||
(test-display (radio #"start" #f))
|
||||
'((input ((name "input_0") (type "radio")))))
|
||||
(test-equal? "radio"
|
||||
(test-display (radio #"start" #t #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "radio") (checked "true") (test "Test")))))
|
||||
|
||||
; XXX submit process
|
||||
; XXX submit output
|
||||
; submit
|
||||
(test-equal? "submit"
|
||||
(->cons (test-process (submit #"start") (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "submit"
|
||||
(test-display (submit #"start"))
|
||||
'((input ((name "input_0") (type "submit") (value "start")))))
|
||||
(test-equal? "submit"
|
||||
(test-display (submit #"start" #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "submit") (value "start") (test "Test")))))
|
||||
|
||||
; XXX reset process
|
||||
; XXX reset output
|
||||
; reset
|
||||
(test-equal? "reset"
|
||||
(->cons (test-process (reset #"start") (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "reset"
|
||||
(test-display (reset #"start"))
|
||||
'((input ((name "input_0") (type "reset") (value "start")))))
|
||||
(test-equal? "reset"
|
||||
(test-display (reset #"start" #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "reset") (value "start") (test "Test")))))
|
||||
|
||||
; XXX file-upload process
|
||||
; XXX file-upload output
|
||||
; file-upload
|
||||
(test-equal? "file-upload"
|
||||
(->cons (test-process (file-upload) (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "file-upload"
|
||||
(test-display (file-upload))
|
||||
'((input ((name "input_0") (type "file")))))
|
||||
(test-equal? "file-upload"
|
||||
(test-display (file-upload #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "file") (test "Test")))))
|
||||
|
||||
; XXX hidden process
|
||||
; XXX hidden output
|
||||
|
||||
; BUTTON element
|
||||
; XXX test-process
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me"))
|
||||
'((button ((name "input_0") (type "button")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #t))
|
||||
'((button ((name "input_0") (type "button") (disabled "true")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #f))
|
||||
'((button ((name "input_0") (type "button")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:value #"b1"))
|
||||
'((button ((name "input_0") (type "button") (value "b1")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #t #:value #"b2"))
|
||||
'((button
|
||||
((name "input_0") (type "button") (disabled "true") (value "b2"))
|
||||
"click me")))
|
||||
; hidden
|
||||
(test-equal? "hidden"
|
||||
(->cons (test-process (hidden #"start") (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "hidden"
|
||||
(test-display (hidden #"start"))
|
||||
'((input ((name "input_0") (type "hidden") (value "start")))))
|
||||
(test-equal? "hidden"
|
||||
(test-display (hidden #"start" #:attributes '([test "Test"])))
|
||||
'((input ((name "input_0") (type "hidden") (value "start") (test "Test")))))
|
||||
|
||||
; IMG elements
|
||||
; XXX test-process
|
||||
(test-equal? "img"
|
||||
(->cons (test-process (img #"start" #"a") (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "img"
|
||||
(test-display (img #"pic" #"http://h.d.com/1"))
|
||||
'((img ((name "input_0") (src "http://h.d.com/1") (alt "pic")))))
|
||||
(test-equal? "img"
|
||||
(test-display (img #"pic" #"http://h.d.com/1" #:attributes '([test "Test"])))
|
||||
'((img ((name "input_0") (src "http://h.d.com/1") (alt "pic") (test "Test")))))
|
||||
(test-equal? "img"
|
||||
(test-display (img #"pic" #"http://h.d.com/1" #:height 12))
|
||||
'((img ((name "input_0") (src "http://h.d.com/1") (alt "pic") (height "12")))))
|
||||
|
|
@ -238,22 +337,30 @@
|
|||
(usemap "#map")
|
||||
(width "50")))))
|
||||
|
||||
; TEXTAREA element
|
||||
(test-equal? "textarea-input"
|
||||
(binding:form-value (test-process (textarea-input) (list (make-binding:form #"input_0" #"value"))))
|
||||
#"value")
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input))
|
||||
'((textarea ([name "input_0"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:rows 80))
|
||||
'((textarea ([name "input_0"] [rows "80"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:cols 80))
|
||||
'((textarea ([name "input_0"] [cols "80"]) "")))
|
||||
(test-equal? "textarea-input"
|
||||
(test-display (textarea-input #:cols 80 #:rows 70))
|
||||
'((textarea ([name "input_0"] [rows "70"] [cols "80"]) "")))
|
||||
; BUTTON element
|
||||
(test-equal? "button"
|
||||
(->cons (test-process (button #"start" #"a") (list (make-binding:form #"input_0" #"value"))))
|
||||
(cons #"input_0" #"value"))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me"))
|
||||
'((button ((name "input_0") (type "button")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:attributes '([test "Test"])))
|
||||
'((button ((name "input_0") (type "button") (test "Test")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #t))
|
||||
'((button ((name "input_0") (type "button") (disabled "true")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #f))
|
||||
'((button ((name "input_0") (type "button")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:value #"b1"))
|
||||
'((button ((name "input_0") (type "button") (value "b1")) "click me")))
|
||||
(test-equal? "button"
|
||||
(test-display (button #"button" #"click me" #:disabled #t #:value #"b2"))
|
||||
'((button
|
||||
((name "input_0") (type "button") (disabled "true") (value "b2"))
|
||||
"click me")))
|
||||
|
||||
; multiselect
|
||||
(test-equal? "multiselect-input"
|
||||
|
|
@ -269,7 +376,41 @@
|
|||
(test-process (multiselect-input (list 1 2 3))
|
||||
empty)
|
||||
empty)
|
||||
; XXX output
|
||||
(test-equal? "multiselect-input"
|
||||
(test-display (multiselect-input (list 1 2 3)))
|
||||
'((select
|
||||
((multiple "true") (name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "multiselect-input"
|
||||
(test-display (multiselect-input (list 1 2 3) #:multiple? #t))
|
||||
'((select
|
||||
((multiple "true") (name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "multiselect-input"
|
||||
(test-display (multiselect-input (list 1 2 3) #:multiple? #f))
|
||||
'((select
|
||||
((name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "multiselect-input"
|
||||
(test-display (multiselect-input (list 1 2 3) #:selected? even?))
|
||||
'((select
|
||||
((multiple "true") (name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1") (selected "true")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "multiselect-input"
|
||||
(test-display (multiselect-input (list 1 2 3) #:display number->string))
|
||||
'((select
|
||||
((multiple "true") (name "input_0"))
|
||||
(option ((value "0")) "1")
|
||||
(option ((value "1")) "2")
|
||||
(option ((value "2")) "3"))))
|
||||
|
||||
; select
|
||||
(test-equal? "select-input"
|
||||
|
|
@ -286,7 +427,27 @@
|
|||
(lambda ()
|
||||
(test-process (select-input (list 1 2 3))
|
||||
empty)))
|
||||
; XXX output
|
||||
(test-equal? "select-input"
|
||||
(test-display (select-input (list 1 2 3)))
|
||||
'((select
|
||||
((name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "select-input"
|
||||
(test-display (select-input (list 1 2 3) #:selected? even?))
|
||||
'((select
|
||||
((name "input_0"))
|
||||
(option ((value "0")) 1)
|
||||
(option ((value "1") (selected "true")) 2)
|
||||
(option ((value "2")) 3))))
|
||||
(test-equal? "select-input"
|
||||
(test-display (select-input (list 1 2 3) #:display number->string))
|
||||
'((select
|
||||
((name "input_0"))
|
||||
(option ((value "0")) "1")
|
||||
(option ((value "1")) "2")
|
||||
(option ((value "2")) "3"))))
|
||||
|
||||
(test-equal? "required"
|
||||
(test-process (required (text-input)) (list (make-binding:form #"input_0" #"value")))
|
||||
|
|
|
|||
|
|
@ -131,9 +131,10 @@
|
|||
#:type "file"
|
||||
#:attributes attrs))
|
||||
|
||||
(define (hidden #:attributes [attrs empty])
|
||||
(define (hidden value #:attributes [attrs empty])
|
||||
(input
|
||||
#:type "hidden"
|
||||
#:value value
|
||||
#:attributes attrs))
|
||||
|
||||
(define (button type text
|
||||
|
|
@ -266,7 +267,7 @@
|
|||
(#:attributes (listof (list/c symbol? string?)))
|
||||
. ->* .
|
||||
(formlet/c (or/c false/c binding?)))]
|
||||
[hidden (()
|
||||
[hidden ((bytes?)
|
||||
(#:attributes (listof (list/c symbol? string?)))
|
||||
. ->* .
|
||||
(formlet/c (or/c false/c binding?)))]
|
||||
|
|
@ -277,7 +278,7 @@
|
|||
#:width (or/c false/c exact-nonnegative-integer?)
|
||||
#:attributes (listof (list/c symbol? string?)))
|
||||
. ->* .
|
||||
(formlet/c string?))]
|
||||
(formlet/c (or/c false/c binding?)))]
|
||||
[button ((bytes? bytes?)
|
||||
(#:disabled boolean?
|
||||
#:value (or/c false/c bytes?)
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ These @tech{formlet}s are the main combinators for form input.
|
|||
This @tech{formlet} renders using an INPUT element with the FILE type and the attributes given in the arguments.
|
||||
}
|
||||
|
||||
@defproc[(hidden [#:attributes attrs (listof (list/c symbol? string?)) empty])
|
||||
@defproc[(hidden [value bytes?] [#:attributes attrs (listof (list/c symbol? string?)) empty])
|
||||
(formlet/c (or/c false/c binding?))]{
|
||||
This @tech{formlet} renders using an INPUT element with HIDDEN type and the attributes given in the arguments.
|
||||
}
|
||||
|
|
@ -353,7 +353,7 @@ These @tech{formlet}s are the main combinators for form input.
|
|||
[#:usemap map (or/c false/c bytes?) #f]
|
||||
[#:width width (or/c false/c exact-nonnegative-integer?) #f]
|
||||
[#:attributes attrs (listof (list/c symbol? string?)) empty])
|
||||
(formlet/c string?)]{
|
||||
(formlet/c (or/c false/c binding?))]{
|
||||
This @tech{formlet} renders using an IMG element with the attributes given in the arguments.
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user