merging pathnames, lass sheet tweak

1 files changed, 12 insertions, 8 deletions

diff --git a/flexo.lisp b/flexo.lisp
index 480ba05..12a5b8e 100644
--- a/flexo.lisp
+++ b/flexo.lisp
@@ -332,7 +332,7 @@ artifact tables have changed."
   `(make-instance
     'lass-sheet
     :url ,url
-    :text (lass:compile-and-write ,@lass-code)))
+    :text (lass:compile-and-write '(:let () ,@lass-code))))
 
 (defmacro define-lass-sheet (name url &body lass-code)
   "Defines a thunk named NAME that, when called, creates an instance
@@ -402,15 +402,19 @@ artifact tables have changed."
   (:documentation "Publish the given artifact in the given location."))
 
 (defmethod publish ((artifact file-artifact) (location pathname))
-  (uiop:copy-file (filepath artifact)
-                  (uiop:merge-pathnames* (artifact-url-path artifact) location)))
+  (let ((path (uiop:merge-pathnames* (artifact-url-path artifact) location)))
+    (ensure-directories-exist path)
+    (uiop:copy-file (filepath artifact)  path)))
 
 (defmethod publish ((generated template-generated-text) (location pathname))
-  (alexandria:write-string-into-file
-   (generated-text generated)
-   (uiop:merge-pathnames* (artifact-url-path generated) location)
-   :if-exists :supersede
-   :external-format :utf8))
+  (let ((path
+          (uiop:merge-pathnames* (artifact-url-path generated) location)))
+    (ensure-directories-exist path)
+    (alexandria:write-string-into-file
+     (generated-text generated)
+     path
+     :if-exists :supersede
+     :external-format :utf8)))
 
 (defun publish-site (site location)
   "SITE is a hashtable keyed by url paths whose values are ARTIFACT