Commit a7f069c19c0d425b471131c9650313db572b21f2
2013-11-04T08:36:31
move #'str to L>uri
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/assets.lisp b/assets.lisp
index 40f8781..6d7ddd2 100644
--- a/assets.lisp
+++ b/assets.lisp
@@ -36,21 +36,6 @@
(setf (car ,cache) ,key
(cdr ,cache) (progn ,@body))))))))
-(defun str (&rest objects)
- (cond ((endp objects)
- (str ""))
- ((= 1 (length objects))
- (let ((obj (first objects)))
- (typecase obj
- (null "")
- (symbol (str (string-downcase (symbol-name obj))))
- (string obj)
- (pathname (format nil "~A" obj))
- (t (string obj)))))
- (t
- (apply #'concatenate 'string
- (mapcar 'str objects)))))
-
;; Config
(defvar *debug* nil)
diff --git a/lowh.triangle.assets.asd b/lowh.triangle.assets.asd
index af346e4..6bc3d53 100644
--- a/lowh.triangle.assets.asd
+++ b/lowh.triangle.assets.asd
@@ -24,7 +24,8 @@
:description "Asset pipeline"
:depends-on ("alexandria"
"cl-fad"
- "lowh.triangle.files")
+ "lowh.triangle.files"
+ "lowh.triangle.uri")
:components
((:file "package")
(:file "extensions" :depends-on ("package"))
diff --git a/package.lisp b/package.lisp
index 024ce4a..1910668 100644
--- a/package.lisp
+++ b/package.lisp
@@ -20,7 +20,7 @@
(defpackage :lowh.triangle.assets
(:nicknames :L>assets)
- (:use :cl :alexandria :L>files)
+ (:use :cl :alexandria :L>files :L>uri)
(:export
;; Config
#:*debug*
@@ -28,8 +28,6 @@
#:*asset-path-prefix*
#:*assets-dirs* #:assets-dir
#:*precompiled-assets* #:precompiled-asset
- ;; Strings
- #:str
;; Observers
#:asset-path #:asset-url
#:assets-dirs