[Git][clojure-team/compojure-clojure][upstream] New upstream version 1.7.2
Thomas Goirand (@zigo)
gitlab at salsa.debian.org
Mon Jul 20 03:40:36 BST 2026
Thomas Goirand pushed to branch upstream at Debian Clojure Maintainers / compojure-clojure
Commits:
bd362255 by Thomas Goirand at 2026-07-20T04:38:29+02:00
New upstream version 1.7.2
- - - - -
11 changed files:
- + .github/workflows/test.yml
- .gitignore
- − .travis.yml
- CHANGELOG.md
- + CONTRIBUTING.md
- − LICENSE.html
- + LICENSE.txt
- README.md
- project.clj
- src/compojure/core.clj
- test/compojure/core_test.clj
Changes:
=====================================
.github/workflows/test.yml
=====================================
@@ -0,0 +1,29 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout at v5
+
+ - name: Prepare java
+ uses: actions/setup-java at v5
+ with:
+ distribution: 'zulu'
+ java-version: '11'
+
+ - name: Install clojure tools
+ uses: DeLaGuardo/setup-clojure at 13.4
+ with:
+ lein: 2.12.0
+
+ - name: Cache clojure dependencies
+ uses: actions/cache at v4
+ with:
+ path: ~/.m2/repository
+ key: cljdeps-${{ hashFiles('project.clj') }}
+ restore-keys: cljdeps-
+
+ - name: Run tests
+ run: lein test-all
=====================================
.gitignore
=====================================
@@ -8,3 +8,4 @@ pom.xml.asc
*.class
/.lein-*
/.nrepl-port
+/.clj-kondo
\ No newline at end of file
=====================================
.travis.yml deleted
=====================================
@@ -1,2 +0,0 @@
-language: clojure
-script: lein test-all
=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,38 @@
+## 1.7.2 (2025-09-15)
+
+* Updated Medley dependency to 1.9.0 (see #222)
+* Updated Ring dependency to 1.15.1
+* Updated Ring-Codec dependency to 1.3.0
+* Updated tools.macro dependency to 0.2.1
+
+## 1.7.1 (2024-01-31)
+
+* Updated Ring dependency to 1.11.0
+* Updated minimum Clojure version to 1.9.0
+
+## 1.7.0 (2022-05-21)
+
+* Added `:compojure/route-context` key to requests (see #212)
+* Updated Ring dependency to 1.9.3
+* Updated Ring-Codec dependency to 1.2.0
+
+## 1.6.3 (2022-05-12)
+
+* Updated Medley dependency to 1.4.0 (see #206)
+
+## 1.6.2 (2020-08-04)
+
+* Fixed exception when coercion in context fails (see #184)
+* Updated Ring dependency to 1.8.1
+* Updated Ring-Codec dependency to 1.1.2
+* Updated Medley dependency to 1.3.0
+
+## 1.6.1 (2018-04-15)
+
+* Updated Ring dependency to 1.6.3
+* Updated Ring-Codec dependency to 1.1.0
+* Updated Clout dependency to 2.2.1
+
## 1.6.0 (2017-05-03)
* Update Ring dependency to 1.6.0
=====================================
CONTRIBUTING.md
=====================================
@@ -0,0 +1,32 @@
+# Contributing Guidelines
+
+**Do** follow [the seven rules of a great Git commit message][1].
+
+**Do** follow [the Clojure Style Guide][2].
+
+**Do** include tests for your change when appropriate.
+
+**Do** ensure that the CI checks pass.
+
+**Do** squash the commits in your PR to remove corrections
+irrelevant to the code history, once the PR has been reviewed.
+
+**Do** feel free to pester the project maintainers about the PR if it
+hasn't been responded to. Sometimes notifications can be missed.
+
+**Don't** include more than one feature or fix in a single PR.
+
+**Don't** include changes unrelated to the purpose of the PR. This
+includes changing the project version number, adding lines to the
+`.gitignore` file, or changing the indentation or formatting.
+
+**Don't** open a new PR if changes are requested. Just push to the
+same branch and the PR will be updated.
+
+**Don't** overuse vertical whitespace; avoid multiple sequential blank
+lines.
+
+**Don't** docstring private vars or functions.
+
+[1]: https://chris.beams.io/posts/git-commit/#seven-rules
+[2]: https://github.com/bbatsov/clojure-style-guide
=====================================
LICENSE.html deleted
=====================================
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
=====================================
LICENSE.txt
=====================================
@@ -0,0 +1,204 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program.
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly
+ perform, distribute and sublicense the Contribution of such Contributor,
+ if any, and such derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of
+ the Contribution and the Program if, at the time the Contribution is
+ added by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license
+ shall not apply to any other combinations which include the Contribution.
+ No hardware per se is licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the patent
+ or other intellectual property rights of any other entity. Each
+ Contributor disclaims any liability to Recipient for claims brought by
+ any other entity based on infringement of intellectual property rights or
+ otherwise. As a condition to exercising the rights and licenses granted
+ hereunder, each Recipient hereby assumes sole responsibility to secure
+ any other intellectual property rights needed, if any. For example, if a
+ third party patent license is required to allow Recipient to distribute
+ the Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+
+3. REQUIREMENTS
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+ i) effectively disclaims on behalf of all Contributors all
+ warranties and conditions, express and implied, including warranties
+ or conditions of title and non-infringement, and implied warranties
+ or conditions of merchantability and fitness for a particular
+ purpose;
+ ii) effectively excludes on behalf of all Contributors all liability
+ for damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable
+ manner on or through a medium customarily used for software
+ exchange.
+
+When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the
+ Program.
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must: a)
+promptly notify the Commercial Contributor in writing of such claim, and b)
+allow the Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
=====================================
README.md
=====================================
@@ -1,20 +1,22 @@
-# Compojure
-
-[](https://travis-ci.org/weavejester/compojure)
+# Compojure [](https://github.com/weavejester/compojure/actions/workflows/test.yml)
Compojure is a small routing library for [Ring][1] that allows web
applications to be composed of small, independent parts.
## Installation
-Add the following dependency to your `project.clj` file:
+Add the following dependency to your deps.edn file:
+
+ compojure/compojure {:mvn/version "1.7.2"}
+
+Or to your Leiningen project file:
- [compojure "1.6.0"]
+ [compojure "1.7.2"]
## Documentation
* [Wiki](https://github.com/weavejester/compojure/wiki)
-* [API Docs](http://weavejester.github.com/compojure)
+* [API Docs](http://weavejester.github.io/compojure)
## Community
@@ -43,6 +45,6 @@ Also refer to the [Getting Started][2] page on the wiki.
## License
-Copyright © 2017 James Reeves
+Copyright © 2025 James Reeves
Distributed under the Eclipse Public License, the same as Clojure.
=====================================
project.clj
=====================================
@@ -1,24 +1,26 @@
-(defproject compojure "1.6.0"
+(defproject compojure "1.7.2"
:description "A concise routing library for Ring"
:url "https://github.com/weavejester/compojure"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
- :dependencies [[org.clojure/clojure "1.7.0"]
- [org.clojure/tools.macro "0.1.5"]
- [clout "2.1.2"]
- [medley "1.0.0"]
- [ring/ring-core "1.6.0"]
- [ring/ring-codec "1.0.1"]]
- :plugins [[lein-codox "0.10.3"]]
+ :dependencies [[org.clojure/clojure "1.9.0"]
+ [org.clojure/tools.macro "0.2.1"]
+ [clout "2.2.1"]
+ [dev.weavejester/medley "1.9.0"]
+ [ring/ring-core "1.15.1"]
+ [ring/ring-codec "1.3.0"]]
+ :plugins [[lein-codox "0.10.8"]]
:codox
{:output-path "codox"
:metadata {:doc/format :markdown}
:source-uri "http://github.com/weavejester/compojure/blob/{version}/{filepath}#L{line}"}
:aliases
- {"test-all" ["with-profile" "default:+1.8" "test"]}
+ {"test-all" ["with-profile" "default:+1.10:+1.11:+1.12" "test"]}
:profiles
{:dev {:jvm-opts ^:replace []
- :dependencies [[ring/ring-mock "0.3.0"]
- [criterium "0.4.4"]
+ :dependencies [[ring/ring-mock "0.6.2"]
+ [criterium "0.4.6"]
[javax.servlet/servlet-api "2.5"]]}
- :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
+ :1.10 {:dependencies [[org.clojure/clojure "1.10.0"]]}
+ :1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
+ :1.12 {:dependencies [[org.clojure/clojure "1.12.2"]]}})
=====================================
src/compojure/core.clj
=====================================
@@ -251,7 +251,7 @@
(defn- remove-suffix [path suffix]
(subs path 0 (- (count path) (count suffix))))
-(defn- context-request [request route]
+(defn- context-request [request route route-context]
(if-let [params (clout/route-matches route request)]
(let [uri (:uri request)
path (:path-info request uri)
@@ -261,7 +261,8 @@
(-> request
(assoc-route-params (decode-route-params params))
(assoc :path-info (if (= subpath "") "/" subpath)
- :context (remove-suffix uri subpath))))))
+ :context (remove-suffix uri subpath))
+ (update :compojure/route-context str route-context)))))
(defn- context-route [route]
(let [re-context {:__path-info #"|/.*"}]
@@ -279,20 +280,23 @@
:else
`(clout/route-compile (str ~route ":__path-info") ~re-context))))
-(defn ^:no-doc make-context [route make-handler]
+(defn ^:no-doc make-context [route path make-handler]
(letfn [(handler
([request]
- ((make-handler request) request))
+ (when-let [context-handler (make-handler request)]
+ (context-handler request)))
([request respond raise]
- ((make-handler request) request respond raise)))]
+ (if-let [context-handler (make-handler request)]
+ (context-handler request respond raise)
+ (respond nil))))]
(if (#{":__path-info" "/:__path-info"} (:source route))
handler
(fn
([request]
- (if-let [request (context-request request route)]
+ (if-let [request (context-request request route path)]
(handler request)))
([request respond raise]
- (if-let [request (context-request request route)]
+ (if-let [request (context-request request route path)]
(handler request respond raise)
(respond nil)))))))
@@ -308,6 +312,7 @@
[path args & routes]
`(make-context
~(context-route path)
+ ~path
(fn [request#]
(let-request [~args request#]
(routes ~@routes)))))
=====================================
test/compojure/core_test.clj
=====================================
@@ -61,6 +61,16 @@
(is (nil? ((GET "/foo/:x" [x :<< coercions/as-int] (str x))
(mock/request :get "/foo/bar")))))
+ (testing "nil coercions in contexts"
+ (is (not (nil? ((context "/foo/:x" [x] (GET "/" [] (str x)))
+ (mock/request :get "/foo/bar")))))
+ (is (not (nil? ((context "/foo/:x" [x :<< coercions/as-int] (GET "/" [] (str x)))
+ (mock/request :get "/foo/100")))))
+ (is (not (nil? ((context "/foo/:x" [x :<< #(Boolean/valueOf %)] (GET "/" [] (str x)))
+ (mock/request :get "/foo/false")))))
+ (is (nil? ((context "/foo/:x" [x :<< coercions/as-int] (GET "/" [] (str x)))
+ (mock/request :get "/foo/bar")))))
+
(testing "map arguments"
((GET "/foo" {params :params}
(is (= params {:x "a", :y "b"}))
@@ -186,6 +196,23 @@
"/foo/10/b%20r" "/b%20r"
"/bar/10" nil)))
+ (testing ":compojure/route-context key"
+ (let [handler (context "/foo/:id" [_] :compojure/route-context)]
+ (are [url route-context] (= (handler (mock/request :get url)) route-context)
+ "/foo/10" "/foo/:id"
+ "/foo/10/bar" "/foo/:id"
+ "/foo/10/b%20r" "/foo/:id"
+ "/bar/10" nil)))
+
+ (testing ":compojure/route-context key in nested context"
+ (let [handler (context "/foo/:foo-id" [_]
+ (context "/bar/:bar-id" [_] :compojure/route-context))]
+ (are [url route-context] (= (handler (mock/request :get url)) route-context)
+ "/foo/1/bar/2" "/foo/:foo-id/bar/:bar-id"
+ "/foo/1/bar/2/baz" "/foo/:foo-id/bar/:bar-id"
+ "/foo/1/bar/2/b%20r" "/foo/:foo-id/bar/:bar-id"
+ "/bar/10" nil)))
+
(testing "routes"
(let [handler (context "/foo/:id" [id]
(GET "/" [] "root")
@@ -397,7 +424,25 @@
exception (promise)]
(route request response exception)
(is (not (realized? exception)))
- (is (nil? @response))))))
+ (is (nil? @response)))))
+
+ (testing "with coercion"
+ (let [route (context "/:id" [id :<< coercions/as-int]
+ (GET "/" [] (str id)))]
+ (testing "matching request"
+ (let [request (mock/request :get "/123")
+ response (promise)
+ exception (promise)]
+ (route request response exception)
+ (is (not (realized? exception)))
+ (is (= (:body @response) "123"))))
+ (testing "not-matching request"
+ (let [request (mock/request :get "/foo")
+ response (promise)
+ exception (promise)]
+ (route request response exception)
+ (is (not (realized? exception)))
+ (is (nil? @response)))))))
(testing "wrap-routes"
(let [route (wrap-routes
View it on GitLab: https://salsa.debian.org/clojure-team/compojure-clojure/-/commit/bd362255fa3bc50aaafc849fd416a7f39f402515
--
View it on GitLab: https://salsa.debian.org/clojure-team/compojure-clojure/-/commit/bd362255fa3bc50aaafc849fd416a7f39f402515
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260720/771aa8c4/attachment.htm>
More information about the pkg-java-commits
mailing list