From eda8f09f1dee8fdcd5ef12fe5fc55295907eece1 Mon Sep 17 00:00:00 2001
From: Maciej Pasternacki <maciej@pasternacki.net>
Date: Sun, 26 Oct 2008 17:00:11 +0100
Subject: [PATCH] - Trane-common depends on puri.

---
 src/common.lisp  | 14 +++++++++++++-
 trane-common.asd |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/common.lisp b/src/common.lisp
index 9958e07..6b7acc5 100644
--- a/src/common.lisp
+++ b/src/common.lisp
@@ -6,7 +6,7 @@
 
 ;; Package for internal use in libraries and projects
 (defpackage #:trane-common
-  (:use #:common-lisp #:iterate)
+  (:use #:common-lisp #:iterate #:puri)
   (:export #:id #:slug #:slug-dao #:slugify
            #:dirtiness-mixin #:dirty-p #:mark-as-dirty #:update-dao-if-dirty
            #:*config* #:*init-functions* #:on-init
@@ -160,6 +160,18 @@ lists of statements."
       v))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; URIs
+
+(defmethod uri ((u keyword))
+  "URI on keybord -> look up from config."
+  (parse-uri (py-configparser:get-option *config* "uri"
+                                         (string-downcase (string u)))))
+
+;; Allow merging any URI designators
+(defmethod merge-uris (u b &optional p)
+  (merge-uris (uri u) (uri b) p))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Hunchentoot
 
 (on-init
diff --git a/trane-common.asd b/trane-common.asd
index 92f5bbf..23c90a9 100644
--- a/trane-common.asd
+++ b/trane-common.asd
@@ -14,7 +14,7 @@
   :author "Maciej Pasternacki <maciej@pasternacki.net>"
   :licence "BSD sans advertising clause, see file COPYING for details"
   :components ((:module #:src :components ((:file "common"))))
-  :depends-on (#:postmodern #:hunchentoot #:iterate #:py-configparser #:cl-base64 #:md5))
+  :depends-on (#:postmodern #:hunchentoot #:puri #:iterate #:py-configparser #:cl-base64 #:md5))
 
 ;;; Needs to be loaded AFTER cl-postgres and postmodern.  LAME!
 (defmethod perform :after ((op load-op)
-- 
2.11.4.GIT