Remove local url-encode-value and build-query-string, import from (sigil http)

Message

Sub-modules now import build-query-string directly from (sigil http). Test updated for uppercase hex encoding (%3D vs %3d).

Changed

 src/twitch.sgl           | 41 +----------------------------------------
 src/twitch/analytics.sgl |  1 +
 src/twitch/chat.sgl      |  1 +
 src/twitch/eventsub.sgl  |  1 +
 src/twitch/schedule.sgl  |  1 +
 test/twitch-test.sgl     |  3 ++-
 6 files changed, 7 insertions(+), 41 deletions(-)

Diff

src/twitch.sglmodified

@@ -13,6 +13,7 @@

(sigil string)

(sigil struct)

(sigil json)

+16

(only (sigil http) url-encode-value build-query-string)

(sigil http client))

(export ;; Client

@@ -63,8 +64,6 @@

twitch-put/json

twitch-patch/json

twitch-delete/json

−66

url-encode-value

−67

build-query-string

build-repeated-params

ensure-list

check-twitch-response

@@ -139,44 +138,6 @@

138

(apply string-append (twitch-client-base-url client)

139

(map (lambda (p) (string-append "/" p)) parts)))

140

−142

;; No shared url-encode exists in sigil-http (known gap).

−143

(define (url-encode-value s)

−144

(let ((len (string-length s)))

−145

(let loop ((i 0) (acc '()))

−146

(if (>= i len)

−147

(list->string (reverse acc))

−148

(let ((c (string-ref s i)))

−149

(cond

−150

((or (char-alphabetic? c)

−151

(char-numeric? c)

−152

(char=? c #\-)

−153

(char=? c #\_)

−154

(char=? c #\.)

−155

(char=? c #\~))

−156

(loop (+ i 1) (cons c acc)))

−157

((char=? c #\space)

−158

(loop (+ i 1) (cons #\+ acc)))

−159

(else

−160

(let ((n (char->integer c)))

−161

(loop (+ i 1)

−162

(append (reverse (string->list

−163

(string-append "%"

−164

(if (< n 16) "0" "")

−165

(number->string n 16))))

−166

acc))))))))))

−167

−168

;;; Build a query string from (key . value) pairs.

−169

;;; Pairs with #f values are omitted.

−170

(define (build-query-string params)

−171

(let ((parts (filter (lambda (p) (cdr p)) params)))

−172

(if (null? parts)

−173

""

−174

(string-append "?"

−175

(string-join

−176

(map (lambda (p)

−177

(string-append (car p) "=" (url-encode-value (cdr p))))

−178

parts)

−179

"&")))))

141

142

;;; Build repeated query params for Twitch-style multi-value parameters.

143

;;; e.g., (build-repeated-params "id" '("1" "2")) => "id=1&id=2"

src/twitch/analytics.sglmodified

@@ -10,6 +10,7 @@

(sigil string)

(sigil struct)

(sigil json)

+13

(only (sigil http) build-query-string)

(sigil http client)

(twitch))

src/twitch/chat.sglmodified

@@ -9,6 +9,7 @@

(sigil string)

(sigil struct)

(sigil json)

+12

(only (sigil http) build-query-string)

(sigil http client)

(twitch))

src/twitch/eventsub.sglmodified

@@ -21,6 +21,7 @@

(sigil string)

(sigil struct)

(sigil json)

+24

(only (sigil http) build-query-string)

(sigil http client)

(twitch))

src/twitch/schedule.sglmodified

@@ -12,6 +12,7 @@

(sigil string)

(sigil struct)

(sigil json)

+15

(only (sigil http) build-query-string)

(sigil http client)

(twitch))

test/twitch-test.sglmodified

@@ -9,6 +9,7 @@

(sigil struct)

(sigil json)

(sigil test)

+12

(only (sigil http) url-encode-value build-query-string)

(twitch))

;; ---------------------------------------------------------------

@@ -266,7 +267,7 @@

267

(assert-equal "foo%26bar" (url-encode-value "foo&bar")))

268

269

(test "encode equals sign"

−269

(assert-equal "key%3dvalue" (url-encode-value "key=value")))

+270

(assert-equal "key%3Dvalue" (url-encode-value "key=value")))

271

272

(test "preserve unreserved characters"

273

(assert-equal "a-b_c.d~e" (url-encode-value "a-b_c.d~e"))))