simon/adl-support
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' (forgot!)

Browse source
This commit is contained in:
Simon Brooke 2025-05-20 09:49:22 +01:00
parent ef00e3b043 e6c332283c
commit c984032874
15 changed files with 90 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -1,17 +1,21 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
## 0.1.4 - 2018-0922 ## 0.1.5 - 2018-0922
### Added ### Added
Mainly documentation and tidy-up; Beta release. Mainly documentation and tidy-up; Beta release.
[0.1.5]: https://github.com/simon_brooke/adl-support/compare/0.1.4...0.1.5
## 0.1.4 - 2018-09-20 ## 0.1.4 - 2018-09-20
This is not anticipated to be the actual Beta release; it's a dummy run to test the release and deployment process. Some required features are still missing. This is not anticipated to be the actual Beta release; it's a dummy run to test the release and deployment process. Some required features are still missing.
[0.1.4]: https://github.com/simon_brooke/adl-support/compare/0.1.0...0.1.4
## 0.1.0 - 2018-06-17 ## 0.1.0 - 2018-06-17
### Added ### Added
Initial release. Initial release.
[Unreleased]: https://github.com/your-name/adl-support/compare/0.1.1...HEAD [Unreleased]: https://github.com/simon_brooke/adl-support/compare/0.1.1...HEAD
[0.1.1]: https://github.com/your-name/adl-support/compare/0.1.0...0.1.1 [0.1.1]: https://github.com/simon_brooke/adl-support/compare/0.1.0...0.1.1

6
README.md
View file

@ -1,6 +1,6 @@
# adl-support # adl-support
A Clojure library designed to support auto-generated [ADL](https://github.com/simon-brooke/adl) code. This library should normally be included into projects generated by ADL, and consequently is licenced under the MIT license, which is less restrictive than the GNU General Public License which I normally use. A Clojure library designed to support auto-generated [ADL](https://git.journeyman.cc/simon/adl) code. This library should normally be included into projects generated by ADL, and consequently is licenced under the MIT license, which is less restrictive than the GNU General Public License which I normally use.
[![Clojars Project](https://img.shields.io/clojars/v/adl-support.svg)](https://clojars.org/adl-support) [![Clojars Project](https://img.shields.io/clojars/v/adl-support.svg)](https://clojars.org/adl-support)
@ -8,6 +8,10 @@ A Clojure library designed to support auto-generated [ADL](https://github.com/si
You don't really use this; code auto-generated by ADL does. Some functions which may be more generally useful are in `adl-support.core`, q.v. You don't really use this; code auto-generated by ADL does. Some functions which may be more generally useful are in `adl-support.core`, q.v.
## Note: GitHub
This project was hosted on GitHub at https://github.com/simon-brooke/adl-support. In accordance with journeyman policy the canonical repository is now [https://git.journeyman.cc/simon/adl-support](https://git.journeyman.cc/simon/adl-support). While the GitHub repository still exists it is no longer maintained and will in due course be colled.
## License ## License
Copyright © 2018 Simon Brooke Copyright © 2018 Simon Brooke

4
docs/adl-support.core.html
View file

File diff suppressed because one or more lines are too long

4
docs/adl-support.filters.html
View file

@ -1,3 +1,7 @@
<!DOCTYPE html PUBLIC "" <!DOCTYPE html PUBLIC ""
""> "">
<<<<<<< HEAD
<html><head><meta charset="UTF-8" /><title>adl-support.filters documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.filters.html#var-*default-international-dialing-prefix*"><div class="inner"><span>*default-international-dialing-prefix*</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-contains"><div class="inner"><span>contains</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-email"><div class="inner"><span>email</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-telephone"><div class="inner"><span>telephone</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.filters</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer filters used in generated templates.</p></div></div><div class="public anchor" id="var-*default-international-dialing-prefix*"><h3>*default-international-dialing-prefix*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>The international dialing prefix to use, if none is specified.</p></div></div></div><div class="public anchor" id="var-contains"><h3>contains</h3><div class="usage"><code>(contains collection value)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-email"><h3>email</h3><div class="usage"><code>(email arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid email address, convert it into a <code>mailto:</code> link, else leave it be.</p></div></div></div><div class="public anchor" id="var-telephone"><h3>telephone</h3><div class="usage"><code>(telephone arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid telephone number, convert it into a <code>tel:</code> link, else leave it be.</p></div></div></div></div></body></html> <html><head><meta charset="UTF-8" /><title>adl-support.filters documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.filters.html#var-*default-international-dialing-prefix*"><div class="inner"><span>*default-international-dialing-prefix*</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-contains"><div class="inner"><span>contains</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-email"><div class="inner"><span>email</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-telephone"><div class="inner"><span>telephone</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.filters</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer filters used in generated templates.</p></div></div><div class="public anchor" id="var-*default-international-dialing-prefix*"><h3>*default-international-dialing-prefix*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>The international dialing prefix to use, if none is specified.</p></div></div></div><div class="public anchor" id="var-contains"><h3>contains</h3><div class="usage"><code>(contains collection value)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-email"><h3>email</h3><div class="usage"><code>(email arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid email address, convert it into a <code>mailto:</code> link, else leave it be.</p></div></div></div><div class="public anchor" id="var-telephone"><h3>telephone</h3><div class="usage"><code>(telephone arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid telephone number, convert it into a <code>tel:</code> link, else leave it be.</p></div></div></div></div></body></html>
=======
<html><head><meta charset="UTF-8" /><title>adl-support.filters documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.7-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.filters.html#var-*default-international-dialing-prefix*"><div class="inner"><span>*default-international-dialing-prefix*</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-contains"><div class="inner"><span>contains</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-email"><div class="inner"><span>email</span></div></a></li><li class="depth-1"><a href="adl-support.filters.html#var-telephone"><div class="inner"><span>telephone</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.filters</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer filters used in generated templates.</p></div></div><div class="public anchor" id="var-*default-international-dialing-prefix*"><h3>*default-international-dialing-prefix*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>The international dialing prefix to use, if none is specified.</p></div></div></div><div class="public anchor" id="var-contains"><h3>contains</h3><div class="usage"><code>(contains collection value)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-email"><h3>email</h3><div class="usage"><code>(email arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid email address, convert it into a <code>mailto:</code> link, else leave it be.</p></div></div></div><div class="public anchor" id="var-telephone"><h3>telephone</h3><div class="usage"><code>(telephone arg)</code></div><div class="doc"><div class="markdown"><p>If <code>arg</code> is, or appears to be, a valid telephone number, convert it into a <code>tel:</code> link, else leave it be.</p></div></div></div></div></body></html>
>>>>>>> develop

4
docs/adl-support.forms-support.html
View file

File diff suppressed because one or more lines are too long

4
docs/adl-support.print-usage.html
View file

@ -1,3 +1,7 @@
<!DOCTYPE html PUBLIC "" <!DOCTYPE html PUBLIC ""
""> "">
<<<<<<< HEAD
<html><head><meta charset="UTF-8" /><title>adl-support.print-usage documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.print-usage.html#var-print-usage"><div class="inner"><span>print-usage</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.print-usage</h1><div class="doc"><div class="markdown"><p>Application Description Language support - print a usage message.</p></div></div><div class="public anchor" id="var-print-usage"><h3>print-usage</h3><div class="usage"><code>(print-usage project-name parsed-options)</code><code>(print-usage project-name parsed-options extra-args)</code></div><div class="doc"><div class="markdown"><p>Print a UN*X style usage message. <code>project-name</code> should be the base name of the executable jar file you generate, <code>parsed-options</code> should be options as parsed by <a href="https://github.com/clojure/tools.cli">clojure.tools.cli</a>. If <code>extra-args</code> is supplied, it should be a map of name, documentation pairs for each additional argument which may be supplied.</p></div></div></div></div></body></html> <html><head><meta charset="UTF-8" /><title>adl-support.print-usage documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.print-usage.html#var-print-usage"><div class="inner"><span>print-usage</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.print-usage</h1><div class="doc"><div class="markdown"><p>Application Description Language support - print a usage message.</p></div></div><div class="public anchor" id="var-print-usage"><h3>print-usage</h3><div class="usage"><code>(print-usage project-name parsed-options)</code><code>(print-usage project-name parsed-options extra-args)</code></div><div class="doc"><div class="markdown"><p>Print a UN*X style usage message. <code>project-name</code> should be the base name of the executable jar file you generate, <code>parsed-options</code> should be options as parsed by <a href="https://github.com/clojure/tools.cli">clojure.tools.cli</a>. If <code>extra-args</code> is supplied, it should be a map of name, documentation pairs for each additional argument which may be supplied.</p></div></div></div></div></body></html>
=======
<html><head><meta charset="UTF-8" /><title>adl-support.print-usage documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.7-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.print-usage.html#var-print-usage"><div class="inner"><span>print-usage</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.print-usage</h1><div class="doc"><div class="markdown"><p>Application Description Language support - print a usage message.</p></div></div><div class="public anchor" id="var-print-usage"><h3>print-usage</h3><div class="usage"><code>(print-usage project-name parsed-options)</code><code>(print-usage project-name parsed-options extra-args)</code></div><div class="doc"><div class="markdown"><p>Print a UN*X style usage message. <code>project-name</code> should be the base name of the executable jar file you generate, <code>parsed-options</code> should be options as parsed by <a href="https://github.com/clojure/tools.cli">clojure.tools.cli</a>. If <code>extra-args</code> is supplied, it should be a map of name, documentation pairs for each additional argument which may be supplied.</p></div></div></div></div></body></html>
>>>>>>> develop

4
docs/adl-support.rest-support.html
View file

File diff suppressed because one or more lines are too long

4
docs/adl-support.tags.html
View file

@ -1,3 +1,7 @@
<!DOCTYPE html PUBLIC "" <!DOCTYPE html PUBLIC ""
""> "">
<<<<<<< HEAD
<html><head><meta charset="UTF-8" /><title>adl-support.tags documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.tags.html#var-add-tags"><div class="inner"><span>add-tags</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-if-member-of-permitted"><div class="inner"><span>if-member-of-permitted</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-parse-arg"><div class="inner"><span>parse-arg</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.tags</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer tags used in generated templates.</p></div></div><div class="public anchor" id="var-add-tags"><h3>add-tags</h3><div class="usage"><code>(add-tags)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-if-member-of-permitted"><h3>if-member-of-permitted</h3><div class="usage"><code>(if-member-of-permitted args context success failure)</code></div><div class="doc"><div class="markdown"><p>If at least one of these <code>args</code> matches some group name in the <code>:user-roles</code> of this <code>context</code>, return this <code>success</code>, else this <code>failure</code>.</p></div></div></div><div class="public anchor" id="var-parse-arg"><h3>parse-arg</h3><div class="usage"><code>(parse-arg arg context)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div></div></body></html> <html><head><meta charset="UTF-8" /><title>adl-support.tags documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.6</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to adl-support</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.tags.html#var-add-tags"><div class="inner"><span>add-tags</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-if-member-of-permitted"><div class="inner"><span>if-member-of-permitted</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-parse-arg"><div class="inner"><span>parse-arg</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.tags</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer tags used in generated templates.</p></div></div><div class="public anchor" id="var-add-tags"><h3>add-tags</h3><div class="usage"><code>(add-tags)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-if-member-of-permitted"><h3>if-member-of-permitted</h3><div class="usage"><code>(if-member-of-permitted args context success failure)</code></div><div class="doc"><div class="markdown"><p>If at least one of these <code>args</code> matches some group name in the <code>:user-roles</code> of this <code>context</code>, return this <code>success</code>, else this <code>failure</code>.</p></div></div></div><div class="public anchor" id="var-parse-arg"><h3>parse-arg</h3><div class="usage"><code>(parse-arg arg context)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div></div></body></html>
=======
<html><head><meta charset="UTF-8" /><title>adl-support.tags documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Adl-support</span> <span class="project-version">0.1.7-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>adl-support</span></div></div></li><li class="depth-2 branch"><a href="adl-support.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="adl-support.filters.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>filters</span></div></a></li><li class="depth-2 branch"><a href="adl-support.forms-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>forms-support</span></div></a></li><li class="depth-2 branch"><a href="adl-support.print-usage.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>print-usage</span></div></a></li><li class="depth-2 branch"><a href="adl-support.rest-support.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>rest-support</span></div></a></li><li class="depth-2 branch current"><a href="adl-support.tags.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>tags</span></div></a></li><li class="depth-2"><a href="adl-support.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="adl-support.tags.html#var-add-tags"><div class="inner"><span>add-tags</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-if-member-of-permitted"><div class="inner"><span>if-member-of-permitted</span></div></a></li><li class="depth-1"><a href="adl-support.tags.html#var-parse-arg"><div class="inner"><span>parse-arg</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">adl-support.tags</h1><div class="doc"><div class="markdown"><p>Application Description Language support - custom Selmer tags used in generated templates.</p></div></div><div class="public anchor" id="var-add-tags"><h3>add-tags</h3><div class="usage"><code>(add-tags)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div><div class="public anchor" id="var-if-member-of-permitted"><h3>if-member-of-permitted</h3><div class="usage"><code>(if-member-of-permitted args context success failure)</code></div><div class="doc"><div class="markdown"><p>If at least one of these <code>args</code> matches some group name in the <code>:user-roles</code> of this <code>context</code>, return this <code>success</code>, else this <code>failure</code>.</p></div></div></div><div class="public anchor" id="var-parse-arg"><h3>parse-arg</h3><div class="usage"><code>(parse-arg arg context)</code></div><div class="doc"><div class="markdown"><p>FIXME: write docs</p></div></div></div></div></body></html>
>>>>>>> develop

4
docs/adl-support.utils.html
View file

File diff suppressed because one or more lines are too long

4
docs/index.html
View file

File diff suppressed because one or more lines are too long

7
project.clj
View file

@ -5,10 +5,10 @@
:url "https://opensource.org/licenses/MIT"} :url "https://opensource.org/licenses/MIT"}
:dependencies [[org.clojure/clojure "1.8.0"] :dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/core.memoize "0.7.1"] [org.clojure/core.memoize "0.8.2"]
[org.clojure/math.numeric-tower "0.0.4"] [org.clojure/math.numeric-tower "0.0.4"]
[org.clojure/tools.logging "0.4.1"] [org.clojure/tools.logging "0.5.0"]
[selmer "1.11.8"]] [selmer "1.12.17"]]
:plugins [[lein-codox "0.10.4"] :plugins [[lein-codox "0.10.4"]
[lein-release "1.0.5"]] [lein-release "1.0.5"]]
@ -18,6 +18,7 @@
:codox {:metadata {:doc "FIXME: write docs" :codox {:metadata {:doc "FIXME: write docs"
:doc/format :markdown} :doc/format :markdown}
:output-path "docs"} :output-path "docs"}
;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the ;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the
;; `develop` branch, then merge the release tag into the `master` branch. ;; `develop` branch, then merge the release tag into the `master` branch.

4
src/adl_support/core.clj
View file

@ -37,7 +37,7 @@
`k` in map `m`, as read by read." `k` in map `m`, as read by read."
[k m] [k m]
(let [v (m k) (let [v (m k)
vr (if vr (when
(string? v) (string? v)
(try (try
(json/read-str v) (json/read-str v)
@ -49,7 +49,7 @@
(number? vr) (number? vr)
;; there's a problem that json/read-str will read "07777 888999" as 7777 ;; there's a problem that json/read-str will read "07777 888999" as 7777
(re-matches #"^[0-9.]+$" v)) {(keyword k) vr} (re-matches #"^[0-9.]+$" v)) {(keyword k) vr}
true :else
{(keyword k) v}))) {(keyword k) v})))

2
src/adl_support/forms_support.clj
View file

@ -92,7 +92,7 @@
"The name to which data for this `auxlist` will be bound in the "The name to which data for this `auxlist` will be bound in the
Selmer params." Selmer params."
[auxlist] [auxlist]
`(safe-name (-> ~auxlist :attrs :property) :clojure)) `(safe-name (str "auxlist-" (-> ~auxlist :attrs :property)) :clojure))
(defmacro all-keys-present? (defmacro all-keys-present?

25
src/adl_support/utils.clj
View file

@ -261,7 +261,7 @@
(s/join (s/join
" " " "
(map (map
#(apply str (cons (Character/toUpperCase (first %)) (rest %))) s/capitalize
(s/split s #"[^a-zA-Z0-9]+"))) (s/split s #"[^a-zA-Z0-9]+")))
s)) s))
@ -276,7 +276,7 @@
(defn safe-name (defn safe-name
"Return a safe name for the object `o`, given the specified `convention`. "Return a safe name for the object `o`, given the specified `convention`.
`o` is expected to be either a string or an element. Recognised values for `o` is expected to be either a string or an element. Recognised values for
`convention` are: #{:c :c-sharp :java :sql}" `convention` are: #{:c :c-sharp :clojure :java :sql}"
([o] ([o]
(cond (cond
(element? o) (element? o)
@ -300,6 +300,7 @@
capitalised (capitalise string)] capitalised (capitalise string)]
(case convention (case convention
(:sql :c) (s/replace string #"[^a-zA-Z0-9_]" "_") (:sql :c) (s/replace string #"[^a-zA-Z0-9_]" "_")
:clojure (s/replace string #"[^a-zA-Z0-9-]" "-")
:c-sharp (s/replace capitalised #"[^a-zA-Z0-9]" "") :c-sharp (s/replace capitalised #"[^a-zA-Z0-9]" "")
:java (let :java (let
[camel (s/replace capitalised #"[^a-zA-Z0-9]" "")] [camel (s/replace capitalised #"[^a-zA-Z0-9]" "")]
@ -579,7 +580,8 @@
(defn list-related-query-name (defn list-related-query-name
"Return the canonical name of the HugSQL query to return all records on "Return the canonical name of the HugSQL query to return all records on
`farside` which match a given record on `nearside`, where `nearide` and `farside` which match a given record on `nearside`, where `nearide` and
`farside` are both entities." `farside` are both entities; and `property` is the nearside property on
which to join."
([property nearside farside as-symbol?] ([property nearside farside as-symbol?]
(let [unique? (= (let [unique? (=
(count (count
@ -590,10 +592,12 @@
farname (if unique? (safe-name farside :sql) (safe-name property :sql)) farname (if unique? (safe-name farside :sql) (safe-name property :sql))
nearname (singularise (safe-name nearside :sql)) nearname (singularise (safe-name nearside :sql))
n (case (-> property :attrs :type) n (case (-> property :attrs :type)
;; TODO: I am deeply susicious of this. It's just improbable that "list" (str "list-" farname "-by-" nearname)
;; the same recipe should work for all three cases. "link" (s/join "-"
("link" "list") (str "list-" farname "-by-" nearname) (list
"entity" (str "list-" farname "-by-" nearname) "list"
(safe-name property :sql) "by" nearname))
"entity" (str "list-" (safe-name nearside :sql) "-by-" (safe-name property :sql))
;; default ;; default
(str "ERROR-bad-property-type-" (str "ERROR-bad-property-type-"
(-> ~property :attrs :type) "-of-" (-> ~property :attrs :type) "-of-"
@ -608,7 +612,12 @@
(symbol (str "db/" n)) (symbol (str "db/" n))
n) n)
(do (do
(*warn* "Argument passed to `list-related-query-name` was a non-entity") (*warn*
(str "Argument "
(cond
(not (entity? nearside)) (or (-> nearside :attrs :name) nearside "nearside")
(not (entity? farside)) (or (-> farside :attrs :name) farside "farside"))
" passed to `list-related-query-name` was a non-entity"))
nil)))) nil))))
([property nearside farside] ([property nearside farside]
(list-related-query-name property nearside farside false))) (list-related-query-name property nearside farside false)))

18
test/adl_support/utils_test.clj
View file

@ -308,7 +308,7 @@
(deftest list-related-query-name-tests (deftest list-related-query-name-tests
(testing "list-related-query-name" (testing "list-related-query-name"
(let [e1 {:tag :entity, (let [genders-entity {:tag :entity,
:attrs {:volatility "6", :magnitude "1", :name "genders", :table "genders"}, :attrs {:volatility "6", :magnitude "1", :name "genders", :table "genders"},
:content [{:tag :documentation, :content [{:tag :documentation,
:content ["All genders which may be assigned to\n electors."]} :content ["All genders which may be assigned to\n electors."]}
@ -321,7 +321,7 @@
:content nil}]}]} :content nil}]}]}
{:tag :list, :attrs {:name "Genders", :properties "all"}} {:tag :list, :attrs {:name "Genders", :properties "all"}}
{:tag :form, :attrs {:name "Gender", :properties "all"}}]} {:tag :form, :attrs {:name "Gender", :properties "all"}}]}
e2 {:tag :entity, electors-entity {:tag :entity,
:attrs {:volatility "6", :magnitude "1", :name "electors", :table "electors"}, :attrs {:volatility "6", :magnitude "1", :name "electors", :table "electors"},
:content [{:tag :documentation, :content [{:tag :documentation,
:attrs nil, :attrs nil,
@ -366,9 +366,9 @@
[{:tag :prompt, [{:tag :prompt,
:attrs {:locale "en_GB.UTF-8", :prompt "Gender"}, :attrs {:locale "en_GB.UTF-8", :prompt "Gender"},
:content nil}]}]} :content nil}]}]}
property (child e2 #(= (-> % :attrs :name) "gender")) property (child electors-entity #(= (-> % :attrs :name) "gender"))
expected "list-electors-by-gender" expected "list-electors-by-gender"
actual (list-related-query-name property e2 e1)] actual (list-related-query-name property electors-entity genders-entity)]
(is (= expected actual) "just checking...")) (is (= expected actual) "just checking..."))
(let [e1 {:tag :entity (let [e1 {:tag :entity
:attrs {:name "dwellings"} :attrs {:name "dwellings"}
@ -394,7 +394,7 @@
expected "list-dwellings-by-address" expected "list-dwellings-by-address"
actual (list-related-query-name property e2 e1)] actual (list-related-query-name property e2 e1)]
(is (= expected actual) "List property"))) (is (= expected actual) "List property")))
(let [e1 {:tag :entity (let [team-entity {:tag :entity
:attrs {:name "teams"} :attrs {:name "teams"}
:content [{:tag :key :content [{:tag :key
:content [{:tag :property :content [{:tag :property
@ -403,7 +403,7 @@
:attrs {:name "members" :type "link" :entity "canvassers"}} :attrs {:name "members" :type "link" :entity "canvassers"}}
{:tag :property {:tag :property
:attrs {:name "organisers" :type "link" :entity "canvassers"}}]} :attrs {:name "organisers" :type "link" :entity "canvassers"}}]}
e2 {:tag :entity canvasser-entity {:tag :entity
:attrs {:name "canvassers"} :attrs {:name "canvassers"}
:content [{:tag :key :content [{:tag :key
:content [{:tag :property :content [{:tag :property
@ -413,17 +413,17 @@
(let [property {:tag :property (let [property {:tag :property
:attrs {:name "members" :type "link" :entity "canvassers"}} :attrs {:name "members" :type "link" :entity "canvassers"}}
expected "list-members-by-team" expected "list-members-by-team"
actual (list-related-query-name property e1 e2)] actual (list-related-query-name property team-entity canvasser-entity)]
(is (= actual expected) "Link property - members")) (is (= actual expected) "Link property - members"))
(let [property {:tag :property (let [property {:tag :property
:attrs {:name "organisers" :type "link" :entity "canvassers"}} :attrs {:name "organisers" :type "link" :entity "canvassers"}}
expected "list-organisers-by-team" expected "list-organisers-by-team"
actual (list-related-query-name property e1 e2)] actual (list-related-query-name property team-entity canvasser-entity)]
(is (= actual expected) "Link property - organisers")) (is (= actual expected) "Link property - organisers"))
(let [property {:tag :property (let [property {:tag :property
:attrs {:name "memberships" :type "link" :entity "teams"}} :attrs {:name "memberships" :type "link" :entity "teams"}}
expected "list-memberships-by-canvasser" expected "list-memberships-by-canvasser"
actual (list-related-query-name property e2 e1)] actual (list-related-query-name property canvasser-entity team-entity)]
(is (= actual expected) "Link property - membersips"))))) (is (= actual expected) "Link property - membersips")))))