From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uCOyNZf14mb2JgEAqHPOHw:P1 (envelope-from ) for ; Thu, 12 Sep 2024 14:07:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id uCOyNZf14mb2JgEAqHPOHw (envelope-from ) for ; Thu, 12 Sep 2024 16:07:20 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kRvipBva; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=xEpGCRCX; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=FyCJ2mgz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fastmail.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726150039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=gUVE1rwJA8ooR/t15teVs7M1xtLhmFOnxkr+NBMCF6M=; b=dU6RvPrWkO0tWlPPtuXqX+/6dRHjssNGtgdrSnfckJZM26W3LFVbB39/O3nf3p2zsb85AE qOkE/4kDsZCUnxNtHw0AxE4pBm1Vr5JtaPjf0KW32jH35Dy0XG5FuskXjc+sQGStp0ft+r x3CbXalzn09kHZegum6pxrx8xPHCq/XZKLebzpS2AYILHrlZ3XSywsV3cdwPSatWWyiPJf BIv8qYla8SYfXcQk6XoEdtLkGuykoc1aAHjKc+arIwafKlwHv1gmpN0OTNytDjnHk7jcyz uQVFVB2MTZ1rUXgfiqzmmHnx6qbWru4aLlqBgB8kwOiItk0G/FshYFmRP60r2A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726150039; a=rsa-sha256; cv=none; b=BhR3fH4cjf4NNnwlCzAln4obDIgk3hIFp14MiV14zjBA1/0NO6wN3lU+gf83n70kX2cO4p WMAUSNJ1JiCN1OCkNz9PT5KqMdxXuyYdwnpakVx/L8sIQgrBwGY/BdmpypKrDDivmhn994 QRoeRt3EP351T1THVoidAtBR0xdxlk2KoAH3p3LhJ+3lkza9jXhbTqgKy1DgUvqWs5ea31 3y2o/OhOtfMdj19lZIo7CjF6+NZDAXVCxLMAGDAyUhDZY0Q4oz0sF6ayOLhVMbOU0PpcO9 gdJqKQzACqeCQoSH9BAgeyKoNkKfAnJbl/k4E3c27fJ0L/8aUrEABT0jwAghoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kRvipBva; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=xEpGCRCX; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=FyCJ2mgz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fastmail.net (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9A69782775 for ; Thu, 12 Sep 2024 16:07:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sokTI-0007RO-B6; Thu, 12 Sep 2024 10:06:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sokTG-0007Qw-Ec for guix-patches@gnu.org; Thu, 12 Sep 2024 10:06:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sokTF-0003DM-Uv for guix-patches@gnu.org; Thu, 12 Sep 2024 10:06:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=gUVE1rwJA8ooR/t15teVs7M1xtLhmFOnxkr+NBMCF6M=; b=kRvipBvalFY3qc+K3os8xMQt6gionC5FxtLRj04kYKs9Jei7Iy13IOkXJBMqsC+mxjXKOctYExXsD626fz54eSkGrdit1DsnD6D4EvroqmMQTNOYEek5oTAvH0KKJ0luMfS7+PXDqURGX+bBFX4beqa4cwgnVv4Jp9lGQE6XHh3t7jwqIFq99R0+lp13ApMve2a6zyQauJFSJCNzsvUaoo7CvtqLgse5pm/1e62kSjLI48zmoHcP/teYtbwKN3Y+g6Mnljy8moOb57BSB3rWx9DtDy/zb774Kqa6reF0IWGV6B4k5W26YsJF+dbqTHB1QbzwKFHHbmEcRMzfmEwaug==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sokTN-0003zm-N6 for guix-patches@gnu.org; Thu, 12 Sep 2024 10:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73198] [PATCH 2/3] gnu: Update cl-lack to 0.3.0. References: In-Reply-To: Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Sep 2024 14:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73198@debbugs.gnu.org Received: via spool by 73198-submit@debbugs.gnu.org id=B73198.172614999415304 (code B ref 73198); Thu, 12 Sep 2024 14:07:01 +0000 Received: (at 73198) by debbugs.gnu.org; 12 Sep 2024 14:06:34 +0000 Received: from localhost ([127.0.0.1]:41578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sokSv-0003yl-26 for submit@debbugs.gnu.org; Thu, 12 Sep 2024 10:06:33 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:59389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sokSs-0003yY-I2 for 73198@debbugs.gnu.org; Thu, 12 Sep 2024 10:06:31 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id 9A45711400F4; Thu, 12 Sep 2024 10:06:17 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Thu, 12 Sep 2024 10:06:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm1; t=1726149977; x=1726236377; bh=gUVE1rwJA8ooR/t15teVs7M1xtLhmFOn xkr+NBMCF6M=; b=xEpGCRCXSpO3rWlAGaoycaUHcWuz0qz5Qmc6HLztelr31Lgw saSv5BpWcq7YvNkinnLFDSioPeHWZm3EWIHWgEakKYTTqjIP7JiLPT1/T7ujSKV/ AkJnsraj/vsoDo/6xeivP4aesL2UMxdXSCx09cEtawmHiOT4xjp2ioghs9tG9fEi m0PKJYLHilUxzdvQHvsqL8Ajo8wnSBJvnB+ZQ+FBsK7QzA2M+uyyDIQnG5gTwB85 iDl19Z9C24yYUNHNkdsp9Xe1atEs9U7O8RpT0SZsgtK12RZwuq9tVPPhZH9ory0E d61jpikbB/G/qumrKCrrE2KWIxywivoqwK33Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1726149977; x=1726236377; bh=gUVE1rwJA8ooR/t15teVs7M1xtLhmFOnxkr +NBMCF6M=; b=FyCJ2mgzNq8zmPE3iOpj7Zc7rBlPywgvJwoF64FmfW4Heh2JkBk 8VCzfWyY+JWqtp8fAE5GWRa1D1C9rHwPvKIHQtaPI6lKtl813zwMvJsrgHftDZig ETaYkPIUW2iXTwHMIVuWNFq9VzdH50bDPzIT/GmRGifLfkzjl0G8zHET0hVv0bDz Py8a8CNKbcq9/JUc3+y1GBcvylu8njQ80VDWCL1khInRi4BJB9k1WakpKuMOo/J9 9/0mnY/Kb7I4uVsVU7gZCYYLl+5U/bJS09S+5SRLS0+0tQVATWTZcUiGZPeEpcpa RswBqWiTqYKB0DoRDOOHE38LRlk0LNnK5Zw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejfedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkgggtsehttdertddttddtnecuhfhrohhmpefmohhnrhgrugcujfhinhhsvghnuceokhho nhhrrggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvghtqeenucggtffrrghtthgvrh hnpeehveegfeeiuefhtdejtedutedtvdfggfejvddujeefhedtgfevgeetudffleejuden ucffohhmrghinhepghhithhhuhgsrdgtohhmpdhsvghsshhiohhnrdhsthhorhgvnecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepkhhonhhrrggu rdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvghtpdhnsggprhgtphhtthhopedvpdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopegstggtsehkhhhinhhsvghnrdhfrghsthhm rghilhdrnhgvthdprhgtphhtthhopeejfeduleekseguvggssghughhsrdhgnhhurdhorh hg X-ME-Proxy: Feedback-ID: i184641e2:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 12 Sep 2024 10:06:16 -0400 (EDT) From: Konrad Hinsen Date: Thu, 12 Sep 2024 16:06:15 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -10.52 X-Migadu-Queue-Id: 9A69782775 X-Spam-Score: -10.52 X-TUID: lXJN+0d8Gb4L * gnu/packages/lisp-xyz.scm (sbcl-lack cl-lack ecl-lack): Update to 0.3.0. * gnu/packages/patches/lack.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I4285cf208b76d6f461735fff04293833ef163e08 --- gnu/local.mk | 1 + gnu/packages/lisp-xyz.scm | 50 +++++-- gnu/packages/patches/lack.patch | 243 ++++++++++++++++++++++++++++++++ 3 files changed, 280 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/lack.patch diff --git a/gnu/local.mk b/gnu/local.mk index ed630041ff..580b42333a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1588,6 +1588,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ + %D%/packages/patches/lack.patch \ %D%/packages/patches/libcall-ui-make-it-installable.patch \ %D%/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch \ %D%/packages/patches/libcss-check-format.patch \ diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fcc2e2ad63..d026d04485 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18514,11 +18514,11 @@ (define-public cl-kons-9 ;; (sbcl-package->ecl-package sbcl-kons-9)) (define-public sbcl-lack - (let ((commit "abff8efeb0c3a848e6bb0022f2b8b7fa3a1bc88b") + (let ((commit "35d3a8e03cab9204eec88c7dfe4d5366fc2ea922") (revision "1")) (package (name "sbcl-lack") - (version (git-version "0.1.0" revision commit)) + (version (git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -18527,28 +18527,50 @@ (define-public sbcl-lack (commit commit))) (file-name (git-file-name "lack" version)) (sha256 - (base32 "1avh4ygcj9xcx4m17nj0wnxxaisk26w4ljs2bibzxaln24x7pi85")))) + (base32 "1yrhhzn8ywdjxwpaxzlnsm2lslhy45r89brn8gh5n08mdyjlp4l2")) + (patches (search-patches "lack.patch")))) (build-system asdf-build-system/sbcl) (native-inputs - (list sbcl-prove)) + (list sbcl-prove + sbcl-cl-cookie + sbcl-dexador + sbcl-hunchentoot)) (inputs - `(("circular-streams" ,sbcl-circular-streams) - ("http-body" ,sbcl-http-body) - ("ironclad" ,sbcl-ironclad) - ("local-time" ,sbcl-local-time) - ("quri" ,sbcl-quri) - ("trivial-mimes" ,sbcl-trivial-mimes))) + (list sbcl-alexandria + sbcl-anypool + sbcl-bordeaux-threads + sbcl-circular-streams + sbcl-cl-base64 + sbcl-cl-isaac + sbcl-cl-redis + sbcl-dbi + sbcl-http-body + sbcl-ironclad + sbcl-local-time + sbcl-quri + sbcl-trivial-mimes + sbcl-trivial-rfc-1123)) (arguments '(#:asd-systems '("lack" + "lack-app-directory" + "lack-app-file" + "lack-component" + "lack-middleware-accesslog" + "lack-middleware-auth-basic" + "lack-middleware-backtrace" + "lack-middleware-csrf" + "lack-middleware-dbpool" + "lack-middleware-mount" + "lack-middleware-session" + "lack-middleware-static" "lack-request" "lack-response" - "lack-component" + "lack-session-store-dbi" + "lack-session-store-redis" "lack-util" "lack-util-writer-stream" "lack-middleware-backtrace" - "lack-middleware-static") - ;; XXX: Component :CLACK not found - #:tests? #f)) + "lack-middleware-static"))) (home-page "https://github.com/fukamachi/lack") (synopsis "Lack, the core of Clack") (description diff --git a/gnu/packages/patches/lack.patch b/gnu/packages/patches/lack.patch new file mode 100644 index 0000000000..c9abfb3d6f --- /dev/null +++ b/gnu/packages/patches/lack.patch @@ -0,0 +1,243 @@ +Remove tests that cannot be run. Some depend on clack, which in turn +depends on lack. Others refer to systems that don't exist +(names starting with "t-"). + +--- a/lack-component.asd ++++ b/lack-component.asd +@@ -2,7 +2,6 @@ + :version "0.2.0" + :author "Eitaro Fukamachi" + :license "MIT" +- :components ((:file "src/component")) +- :in-order-to ((test-op (test-op "t-lack-component")))) ++ :components ((:file "src/component"))) + + (register-system-packages "lack-component" '(:lack.component)) +diff --git a/lack-middleware-accesslog.asd b/lack-middleware-accesslog.asd +index c593988..21a4e70 100644 +--- a/lack-middleware-accesslog.asd ++++ b/lack-middleware-accesslog.asd +@@ -6,7 +6,6 @@ + "local-time") + :components ((:module "src" + :components +- ((:file "middleware/accesslog")))) +- :in-order-to ((test-op (test-op "t-lack-middleware-accesslog")))) ++ ((:file "middleware/accesslog"))))) + + (register-system-packages "lack-middleware-accesslog" '(:lack.middleware.accesslog)) +diff --git a/lack-middleware-auth-basic.asd b/lack-middleware-auth-basic.asd +index 9206d22..6862f33 100644 +--- a/lack-middleware-auth-basic.asd ++++ b/lack-middleware-auth-basic.asd +@@ -6,7 +6,6 @@ + "split-sequence") + :components ((:module "src" + :components +- ((:file "middleware/auth/basic")))) +- :in-order-to ((test-op (test-op "t-lack-middleware-auth-basic")))) ++ ((:file "middleware/auth/basic"))))) + + (register-system-packages "lack-middleware-auth-basic" '(:lack.middleware.auth.basic)) +diff --git a/lack-middleware-backtrace.asd b/lack-middleware-backtrace.asd +index 8df7f9f..cf73f81 100644 +--- a/lack-middleware-backtrace.asd ++++ b/lack-middleware-backtrace.asd +@@ -3,7 +3,6 @@ + :author "Eitaro Fukamachi" + :license "MIT" + :depends-on ("uiop") +- :components ((:file "src/middleware/backtrace")) +- :in-order-to ((test-op (test-op "t-lack-middleware-backtrace")))) ++ :components ((:file "src/middleware/backtrace"))) + + (register-system-packages "lack-middleware-backtrace" '(:lack.middleware.backtrace)) +diff --git a/lack-middleware-csrf.asd b/lack-middleware-csrf.asd +index 105d3bb..fcf46f7 100644 +--- a/lack-middleware-csrf.asd ++++ b/lack-middleware-csrf.asd +@@ -6,7 +6,6 @@ + "lack-util") + :components ((:module "src" + :components +- ((:file "middleware/csrf")))) +- :in-order-to ((test-op (test-op "t-lack-middleware-csrf")))) ++ ((:file "middleware/csrf"))))) + + (register-system-packages "lack-middleware-csrf" '(:lack.middleware.csrf)) +diff --git a/lack-middleware-session.asd b/lack-middleware-session.asd +index 92b1568..bed4c89 100644 +--- a/lack-middleware-session.asd ++++ b/lack-middleware-session.asd +@@ -19,7 +19,6 @@ + :pathname "session" + :components + ((:file "state") +- (:file "state/cookie")))))) +- :in-order-to ((test-op (test-op "t-lack-middleware-session")))) ++ (:file "state/cookie"))))))) + + (register-system-packages "lack-middleware-session" '(:lack.middleware.session)) +diff --git a/lack-middleware-static.asd b/lack-middleware-static.asd +index a0ce627..107a386 100644 +--- a/lack-middleware-static.asd ++++ b/lack-middleware-static.asd +@@ -7,7 +7,6 @@ + "alexandria") + :components ((:module "src" + :components +- ((:file "middleware/static")))) +- :in-order-to ((test-op (test-op "t-lack-middleware-static")))) ++ ((:file "middleware/static"))))) + + (register-system-packages "lack-middleware-static" '(:lack.middleware.static)) +diff --git a/lack-request.asd b/lack-request.asd +index 5efa05c..240b421 100644 +--- a/lack-request.asd ++++ b/lack-request.asd +@@ -9,7 +9,6 @@ + :components ((:module "src" + :components + ((:file "request" :depends-on ("media-type")) +- (:file "media-type")))) +- :in-order-to ((test-op (test-op "t-lack-request")))) ++ (:file "media-type"))))) + + (register-system-packages "lack-request" '(:lack.request)) +diff --git a/lack-session-store-dbi.asd b/lack-session-store-dbi.asd +index 00e7d1e..825a96c 100644 +--- a/lack-session-store-dbi.asd ++++ b/lack-session-store-dbi.asd +@@ -7,7 +7,6 @@ + "marshal" + "trivial-utf-8" + "cl-base64") +- :components ((:file "src/middleware/session/store/dbi")) +- :in-order-to ((test-op (test-op "t-lack-session-store-dbi")))) ++ :components ((:file "src/middleware/session/store/dbi"))) + + (register-system-packages "lack-session-store-dbi" '(:lack.session.store.dbi)) +diff --git a/lack-session-store-redis.asd b/lack-session-store-redis.asd +index 96b0504..57e4046 100644 +--- a/lack-session-store-redis.asd ++++ b/lack-session-store-redis.asd +@@ -7,7 +7,6 @@ + "marshal" + "cl-base64" + "trivial-utf-8") +- :components ((:file "src/middleware/session/store/redis")) +- :in-order-to ((test-op (test-op "t-lack-session-store-redis")))) ++ :components ((:file "src/middleware/session/store/redis"))) + + (register-system-packages "lack-session-store-redis" '(:lack.session.store.redis)) +diff --git a/lack-util.asd b/lack-util.asd +index 0391a1b..1318c04 100644 +--- a/lack-util.asd ++++ b/lack-util.asd +@@ -5,7 +5,6 @@ + :depends-on ((:feature (:or :windows :mswindows :win32 :cormanlisp) "ironclad") + (:feature (:not (:or :windows :mswindows :win32 :cormanlisp)) "cl-isaac") + "bordeaux-threads") +- :components ((:file "src/util")) +- :in-order-to ((test-op (test-op "t-lack-util")))) ++ :components ((:file "src/util"))) + + (register-system-packages "lack-util" '(:lack.util)) +diff --git a/lack.asd b/lack.asd +index e213c10..dde71cf 100644 +--- a/lack.asd ++++ b/lack.asd +@@ -43,8 +43,6 @@ + "lack/middleware/auth/basic" + "lack/session/store/redis" + "lack/session/store/dbi" +- "clack" +- "clack-test" + "hunchentoot" + "dexador" + "cl-cookie" +@@ -60,7 +58,6 @@ + :serial t + :components ((:file "builder") + (:file "util") +- (:file "request") + (:file "component") + (:file "media-type") + (:module "middleware" +diff --git a/tests/request.lisp b/tests/request.lisp +deleted file mode 100644 +index 3fd26e0..0000000 +--- a/tests/request.lisp ++++ /dev/null +@@ -1,71 +0,0 @@ +-(defpackage #:lack/tests/request +- (:use #:cl +- #:rove +- #:lack/request +- #:clack.test +- #:flexi-streams) +- (:import-from #:dexador) +- (:import-from #:alexandria +- #:alist-hash-table)) +-(in-package #:lack/tests/request) +- +-(defparameter *request* +- (make-request `(:content-type "application/x-www-form-urlencoded; charset=utf-8" +- :content-length 20 +- :uri-scheme :http +- :query-string "ediweitz=weitzedi&name=eitaro&q=C%2B%2B" +- :raw-body +- ,(flex:make-flexi-stream +- (flex:make-in-memory-input-stream +- #(110 97 109 101 61 230 183 177 231 148 186 232 139 177 229 164 170 233 131 142)) +- :external-format :utf-8) +- :headers ,(alexandria:alist-hash-table +- '(("referer" . "http://github.com/fukamachi/clack") +- ("user-agent" . "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US)") +- ("accept" . "text/html") +- ("cookie" . "hoge=1;fuga=semi;colon")) +- :test 'equal)))) +- +-(deftest lack-request +- (ok (typep *request* 'request)) +- +- (ok (request-env *request*) "request-env") +- +- (ok (equal (request-content-type *request*) "application/x-www-form-urlencoded; charset=utf-8") +- "request-content-type") +- +- (ok (equalp (request-query-parameters *request*) +- '(("ediweitz" . "weitzedi") ("name" . "eitaro") ("q" . "C++"))) +- "request-query-parameters") +- +- (ok (equalp (request-body-parameters *request*) +- `(("name" . ,(flex:octets-to-string +- #(230 183 177 231 148 186 232 139 177 229 164 170 233 131 142) +- :external-format :utf-8)))) +- "request-body-parameters") +- +- (ok (equalp (request-cookies *request*) +- '(("hoge" . "1") ("fuga" . "semi") ("colon"))) +- "request-cookies") +- +- (ok (request-accepts-p *request* "text/html")) +- +- (ng (request-accepts-p *request* "application/json")) +- +- (testing-app "make-request" +- (lambda (env) +- (make-request env) +- `(200 nil (,(third (assoc "file" (request-body-parameters (make-request env)) :test #'string=))))) +- (multiple-value-bind (body status) +- (dex:post (localhost) +- :content +- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg")))) +- (ok (eql status 200)) +- (ok (equal body "jellyfish.jpg"))) +- +- (multiple-value-bind (body status) +- (dex:post (localhost) +- :content +- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg")))) +- (ok (eql status 200)) +- (ok (equal body "jellyfish.jpg"))))) -- 2.45.2