Merge branch 'develop' of github.com:simon-brooke/adl-support into develop

CHANGELOG.md

@@ -2,23 +2,10 @@
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [Unreleased]
-### Changed
-- Add a new arity to `make-widget-async` to provide a different widget shape.
-
-## [0.1.1] - 2018-06-17
-### Changed
-- Documentation on how to make the widgets.
-
-### Removed
-- `make-widget-sync` - we're all async, all the time.
-
-### Fixed
-- Fixed widget maker to keep working when daylight savings switches over.
 
 ## 0.1.0 - 2018-06-17
 ### Added
-- Files from the new template.
+Initial release.
-- Widget maker public API - `make-widget-sync`.
 
 [Unreleased]: https://github.com/your-name/adl-support/compare/0.1.1...HEAD
 [0.1.1]: https://github.com/your-name/adl-support/compare/0.1.0...0.1.1

LICENSE.md

@@ -1,7 +1,7 @@
 
-The MIT License (MIT)
+# The MIT License (MIT)
 
-Copyright (c) 2018 
+## Copyright (c) Simon Brooke 2018
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -13,10 +13,10 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.**

src/adl_support/core.clj

@@ -18,6 +18,14 @@
 ;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+
+(def ^:dynamic *warn*
+  "The idea here is to have a function with which to show warnings to the user,
+  which can be dynamically bound. Any binding should be a function of one
+  argument, which it should print, log, or otherwise display."
+  (fn [s] (println s)))
+
+
 (defn query-string-to-map
   "A `query-string` - the query-part of a URL - comprises generally
   `<name>=<value>&<name>=<value>...`; reduce such a string to a map.

src/adl_support/utils.clj

@@ -3,9 +3,7 @@
   adl-support.utils
   (:require [clojure.math.numeric-tower :refer [expt]]
             [clojure.pprint :as p]
-            [clojure.string :as s]
+            [clojure.string :as s]))
-            [clojure.tools.logging :as log]
-            [clojure.xml :as x]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;

test/adl_support/utils_test.clj

@@ -4,6 +4,13 @@
 
 ;; Yes, there's MASSES in utils which ought to be tested. I'll add more tests over time.
 
+(deftest singularise-tests
+  (testing "Singularise"
+    (is (= "address" (singularise "addresses")))
+    (is (= "address" (singularise "address")))
+    (is (= "expertise" (singularise "expertise")))))
+
+
 (deftest child-with-tag-tests
   (testing "child-with-tag"
     (let [expected {:tag :prompt