steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urls.encoding: more cleanup.

db4
John Benediktsson 2014-11-30 21:33:48 -08:00
parent b00e5a855b
commit 6f1e819e04
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
basis/urls/encoding/encoding.factor
View File

@ -80,24 +80,13 @@ PRIVATE>
<PRIVATE
: add-query-param ( value key assoc -- )
[
at [
{
{ [ dup string? ] [ swap 2array ] }
{ [ dup array? ] [ swap suffix ] }
{ [ dup not ] [ drop ] }
} cond
] when*
] 2keep set-at ;
: assoc-strings ( assoc -- assoc' )
[
{
{ [ dup not ] [ ] }
{ [ dup array? ] [ [ present ] map ] }
[ present 1array ]
{ [ dup string? ] [ swap 2array ] }
{ [ dup array? ] [ swap suffix ] }
{ [ dup not ] [ drop ] }
} cond
] assoc-map ;
] change-at ;
PRIVATE>
@ -113,8 +102,10 @@ PRIVATE>
: assoc>query ( assoc -- str )
[
assoc-strings [
[ url-encode-full ] dip
[ [ url-encode-full "=" glue , ] with each ] [ , ] if*
[
[ url-encode-full ] dip [
dup array? [ 1array ] unless
[ present url-encode-full "=" glue , ] with each
] [ , ] if*
] assoc-each
] { } make "&" join ;