Update API code to support 'custom' code

   * When JIDO_API_CUSTOM is set
   * Fix typos
   * Try building with PicoLisp 16.6
   * Update documentation

.travis.yml

@@ -4,7 +4,7 @@ cache: apt
 
 before_script:
   - make
-  - wget http://software-lab.de/picoLisp-3.1.11.tgz -O /tmp/picolisp.tgz
+  - wget http://software-lab.de/picoLisp-16.6.tgz -O /tmp/picolisp.tgz
   - cd /tmp; tar -xf /tmp/picolisp.tgz
   - cd /tmp/picoLisp/src64 && make
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.11.0 (2016-08-29)
+
+  * Add 'JIDO_API_CUSTOM' env variable for loading custom API code, docs, html
+
 ## 1.10.2 (2016-04-30)
 
   * Update API Documentation to be much more clear and better organized

Makefile

@@ -38,7 +38,7 @@ html:
 		jade -o . -P -E html ui/index.jade
 
 javascript:
-		coffee --no-header -c -o docs/ ui/ui.coffee
+		cat ui/license.coffee ui/generic.coffee ui/ui.coffee | coffee --no-header -c -s > docs/ui.js
 
 js: javascript
 

README.md

@@ -68,6 +68,10 @@ The name of the stunnel binary. On CentOS it's `stunnel`, but on Debian it's `st
 
 The full path to the Admin application. In most cases it refers to `/opt/jidoteki/admin/`, but it may be different depending on the application.
 
+### JIDO_API_CUSTOM
+
+When this is set (ex: `JIDO_API_CUSTOM=yourapp`), the API will load `custom.l` from the `yourapp/api/v1/core/` directory.
+
 # API Endpoints
 
 See the [API Documentation](docs/API.md).
@@ -80,7 +84,7 @@ If you want to improve this application, please make a pull-request.
 
 ## HTML and JavaScript
 
-The HTML and JavaScript files are written in CoffeeScript and Jade, respectively.
+The HTML and JavaScript files are written in Jade and CoffeeScript, respectively.
 
 `npm install -g jade coffeescript minify`
 

api/v1/core/api.l

@@ -8,7 +8,8 @@
 
 (setq
   *PR_SET_NAME    15
-  *JIDO_API_PORT  (if (format (sys "JIDO_API_PORT")) @ 8080) )
+  *JIDO_API_PORT  (if (format (sys "JIDO_API_PORT")) @ 8080)
+  *JIDO_API_FILE  (if (sys "JIDO_API_CUSTOM") (pack @ "/index.html") "index.html") )
 
 (mime "md" "text/markdown; charset=UTF-8" 60)
 
@@ -29,7 +30,7 @@
     (api-stop)
     (https-start)
     (prinl "HTTP listening on port: " *JIDO_API_PORT)
-    (server *JIDO_API_PORT "index.html") ]
+    (server *JIDO_API_PORT *JIDO_API_FILE) ]
 
 (de api-stop ()
   (https-stop) )

app.l

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Alexander Williams, Unscramble <license@unscramble.jp>
+# Copyright (c) 2015-2016 Alexander Williams, Unscramble <license@unscramble.jp>
 
 # Jidoteki Admin API
 
@@ -16,12 +16,13 @@
 (setq
   *API_VERSION  (if (format (sys "JIDO_API_VERSION")) @ 1)
   *API_PATH     (pack "api/v" *API_VERSION)
+  *API_DOC      (if (sys "JIDO_API_CUSTOM") (pack @ "/docs/API.md") "docs/API.md")
   *Admin_path   (if (sys "JIDO_ADMIN_PATH") @ "/opt/jidoteki/admin/")
   *Upload_path  (pack *Admin_path "home/sftp/uploads/") )
 
 # Load core
 (chdir (pack *API_PATH "/core")
-  (load "allowed.l" "api.l" "auth.l" "helpers.l") )
+  (load "allowed.l" "api.l" "auth.l" "helpers.l" (when (sys "JIDO_API_CUSTOM") (pack "../../../" @ "/" *API_PATH "/core/custom.l"))) )
 
 (api-start)
 

docs/API.md

@@ -956,4 +956,4 @@ Content-Type: application/json
 
 ----
 
-**Powered by [Jidoteki](https://jidoteki.com) - [Copyright notices](NOTICE) - `v1.10.2`**
+**Powered by [Jidoteki](https://jidoteki.com) - [Copyright notices](/docs/NOTICE) - `v1.11.0`**

docs/index.l

@@ -8,7 +8,7 @@
   (use Size Date Body
     (let (Pre (pack (in "docs/strapdown-prefix.html" (till (eof))))
           Suf (pack (in "docs/strapdown-suffix.html" (till (eof))))
-          Doc (pack (in "docs/API.md" (till (eof)))) )
+          Doc (pack (in *API_DOC (till (eof)))) )
 
       (json-string (pack Pre "^J" Doc "^J" Suf))
       (response-generic 200 Size Date Body '(("Content-Type" . "text/html") ]