Commit 5dec5935 authored by Vladimir Sedach's avatar Vladimir Sedach

Changed package names to uri-template2

parent f533aa18
......@@ -3,6 +3,8 @@
* Forked uri-template2:
uri-template2 is licensed under GPLv3 or later
Changed ASDF system name, package names to uri-template2
2019-08-01 Vladimir Sedach <vas@oneofus.la>
* Release 1.3.1:
......
......@@ -18,7 +18,7 @@
;;; along with uri-template2. If not, see
;;; <https://www.gnu.org/licenses/>.
(in-package #:uri-template)
(in-package #:uri-template2)
(defvar uri-decode? t
"Controls whether URI decoding/unescaping is done on the templated value when destructuring.
......
......@@ -20,7 +20,7 @@
(in-package #:cl)
(defpackage #:uri-template
(defpackage #:uri-template2
(:use #:cl #:cl-ppcre #:named-readtables)
(:export
;; common
......@@ -53,7 +53,7 @@
#:%uri-directory
#:%uri-file))
(in-package #:uri-template)
(in-package #:uri-template2)
(defreadtable uri-template
(:merge :standard)
......
......@@ -18,7 +18,7 @@
;;; along with uri-template2. If not, see
;;; <https://www.gnu.org/licenses/>.
(in-package #:uri-template)
(in-package #:uri-template2)
(parenscript:defpsmacro maybe-uri-encode (x)
(if uri-encode? `(encode-u-r-i-component ,x) x))
......
(in-package #:cl)
(defpackage #:uri-template.test
(:use #:cl #:uri-template #:named-readtables #:fiveam)
(:export #:run-tests))
(in-package #:uri-template.test)
(defreadtable uri-template.test
(:merge :standard uri-template:uri-template))
......@@ -18,8 +18,12 @@
;;; along with uri-template2. If not, see
;;; <https://www.gnu.org/licenses/>.
(in-package #:uri-template.test)
(in-readtable uri-template.test)
(defpackage #:uri-template2/test
(:use #:cl #:uri-template2 #:named-readtables #:fiveam))
(in-package #:uri-template2/test)
(in-readtable uri-template)
(in-suite* :uri-template2)
......@@ -57,7 +61,7 @@
'("https" "www.google.com" "/dir/1/2/search.html" "/dir/1/2/" "search.html" "arg=0-a&arg1=1-b&amp;arg3-c" "hash"))))
(test destructuring3
(is (equal (uri-template:uri-template-bind (#U/apps/{app-name}/{table-template}/{table-id})
(is (equal (uri-template-bind (#U/apps/{app-name}/{table-template}/{table-id})
"/apps/EVWeb/Fixed%20Cost/20"
(list app-name table-template table-id %uri-path))
'("EVWeb" "Fixed Cost" "20" "/apps/EVWeb/Fixed Cost/20"))))
......
......@@ -18,7 +18,7 @@
;;; along with uri-template2. If not, see
;;; <https://www.gnu.org/licenses/>.
(in-package #:uri-template)
(in-package #:uri-template2)
(defvar uri-encode? t
"Controls whether URI encoding/escaping is done on the templated value.
......
......@@ -18,6 +18,5 @@
:license "GPL-3.0-or-later"
:depends-on ("uri-template2" "fiveam")
:serial t
:components ((:file "test-package")
(:file "uri-template-test"))
:components ((:file "test"))
:perform (test-op (o c) (symbol-call :fiveam '#:run! :uri-template2)))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment