Fix ASSET-WRITE-DATE for .less files.
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313
diff --git a/asset.lisp b/asset.lisp
index a543410..32a62b0 100644
--- a/asset.lisp
+++ b/asset.lisp
@@ -111,17 +111,20 @@
(defmethod asset-class-extensions ((asset asset))
(asset-class-extensions (class-of asset)))
-;; Extension -> asset class
+;; Extension -> asset classes
-(defun extension-asset-class (extension
- &optional (class (find-class 'asset)))
+(defun extension-asset-classes (extension
+ &optional (class (find-class 'asset)))
(declare (type extension extension)
(type class class))
(when extension
- (labels ((matching-asset-class (c)
- (if (find extension (asset-class-extensions c))
- c
- (some #'matching-asset-class
- (closer-mop:class-direct-subclasses c)))))
- (or (matching-asset-class class)
- class))))
+ (labels ((add (classes a)
+ (reduce #'add (closer-mop:class-direct-subclasses a)
+ :initial-value (cons a classes)))
+ (matching-class (a)
+ (if (find extension (asset-class-extensions a))
+ (add nil a)
+ (some #'matching-class
+ (closer-mop:class-direct-subclasses a)))))
+ (or (matching-class class)
+ `(,class)))))
diff --git a/css.lisp b/css.lisp
index 523b46b..21d8127 100644
--- a/css.lisp
+++ b/css.lisp
@@ -26,7 +26,7 @@
'.css)
(defmethod asset-class-extensions ((class (eql 'css-asset)))
- '(.css .less))
+ '(.css))
(defmethod asset-include ((output stream)
(context (eql :html))
@@ -38,69 +38,6 @@
" output)
(values))
-;; Compile
-
-(defmethod json:encode-json ((object pathname) &optional stream)
- (json:encode-json (namestring object) stream))
-
-(defun less (src-path parser-options css-options &optional out)
- (let* ((fmt "~
-var path = require('path'),
- fs = require('fs'),
- sys = require('util'),
- os = require('os');
-var less = require('less');
-var src = ~A;
-var parser_opts = ~A;
-var css_opts = ~A;
-
-var print_error = function (e) {
- less.writeError(e);
- process.exit(2);
-}
-var print_tree = function (e, tree) {
- if (e)
- print_error(e);
- try {
- var css = tree.toCSS(css_opts);
- process.stdout.write(css);
- } catch (e) {
- print_error(e);
- }
-}
-var parse_data = function (e, data) {
- if (e)
- print_error(e);
- try {
- new(less.Parser)(parser_opts).parse(data, print_tree)
- } catch (e) {
- print_error(e);
- }
-}
-try {
- fs.readFile(path.resolve(process.cwd(), src), 'utf8', parse_data);
-} catch (e) {
- print_error(e);
-}
-")
- (js (format nil fmt
- (json:encode-json-to-string src-path)
- (json:encode-json-plist-to-string parser-options)
- (json:encode-json-plist-to-string css-options))))
- #+nil(format *error-output* "~%~A~%" js)
- (exec-js:from-string js :safely nil :out out)))
-
-(defmethod process-asset ((asset css-asset)
- (output stream))
- (let ((true-assets-dirs (cache-1 (eq *assets-dirs*)
- (mapcar #'truename (assets-dirs))))
- (path (truename (asset-source-path asset))))
- (less path
- (list :paths true-assets-dirs :filename path)
- (list :yuicompress (not *debug*))
- output))
- (values))
-
(defmethod include-asset ((asset css-asset)
(output stream))
(format output "@import url('~A');~%" (asset-url asset)))
diff --git a/find.lisp b/find.lisp
index 939c0c9..838633d 100644
--- a/find.lisp
+++ b/find.lisp
@@ -113,22 +113,26 @@
`(let (,name ,ext)
(cl-ppcre:register-groups-bind (n e)
("^\\s*(.*?)(?:\\.([^./]+))?\\s*$" ,spec)
- (setf ,name n ,ext (intern-extension e)))
+ (setf ,name n ,ext (when e (intern-extension e))))
(let ((,name ,name) (,ext ,ext))
,@body)))
(defun find-assets-from-spec (spec &optional class assets)
- (let ((new-assets (if class
- (find-assets class nil spec nil assets)
- assets)))
- (if (eq assets new-assets)
+ (labels ((assets-matching (class name ext)
+ (if class
+ (let ((new (find-assets class nil name
+ (asset-class-extensions class)
+ assets)))
+ (unless (eq new assets)
+ new))
+ (when ext
+ (some (lambda (class) (assets-matching class name ext))
+ (extension-asset-classes ext))))))
+ (or (assets-matching class spec nil)
(with-asset-spec spec (name ext)
- (find-assets (or class (extension-asset-class ext))
- nil name ext assets)
- (when (eq assets new-assets)
- (find-assets (or class (extension-asset-class ext))
- nil name nil assets)))
- new-assets)))
+ (when ext
+ (assets-matching class name ext)))
+ assets)))
(defun find-assets-from-specs (specs &optional class assets)
(reduce (lambda (assets spec)
diff --git a/less.lisp b/less.lisp
new file mode 100644
index 0000000..79cf8cd
--- /dev/null
+++ b/less.lisp
@@ -0,0 +1,114 @@
+;;
+;; LowH Triangle Assets - Asset pipeline
+;;
+;; Copyright 2012 Thomas de Grivel <billitch@gmail.com>
+;;
+;; Permission to use, copy, modify, and distribute this software for any
+;; purpose with or without fee is hereby granted, provided that the above
+;; copyright notice and this permission notice appear in all copies.
+;;
+;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+;; WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+;; MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+;; ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+;; WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+;; ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+;; OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+;;
+
+(in-package :lowh.triangle.assets)
+
+;; Compile
+
+(defmethod json:encode-json ((object pathname) &optional stream)
+ (json:encode-json (namestring object) stream))
+
+(defun less (src-path parser-options css-options &optional out)
+ (let* ((fmt "~
+var path = require('path'),
+ fs = require('fs'),
+ sys = require('util'),
+ os = require('os');
+var less = require('less');
+var src = ~A;
+var parser_opts = ~A;
+var css_opts = ~A;
+
+var print_error = function (e) {
+ less.writeError(e);
+ process.exit(2);
+}
+var print_tree = function (e, tree) {
+ if (e)
+ print_error(e);
+ try {
+ var css = tree.toCSS(css_opts);
+ process.stdout.write(css);
+ } catch (e) {
+ print_error(e);
+ }
+}
+var parse_data = function (e, data) {
+ if (e)
+ print_error(e);
+ try {
+ new(less.Parser)(parser_opts).parse(data, print_tree)
+ } catch (e) {
+ print_error(e);
+ }
+}
+try {
+ fs.readFile(path.resolve(process.cwd(), src), 'utf8', parse_data);
+} catch (e) {
+ print_error(e);
+}
+")
+ (js (format nil fmt
+ (json:encode-json-to-string src-path)
+ (json:encode-json-plist-to-string parser-options)
+ (json:encode-json-plist-to-string css-options))))
+ #+nil(format *error-output* "~%~A~%" js)
+ (exec-js:from-string js :safely nil :out out)))
+
+;; LESS
+
+(defclass less-asset (css-asset)
+ ((less-sources :type list)))
+
+(defmethod asset-class-extensions ((class (eql 'less-asset)))
+ '(.less))
+
+(defun less-imports (asset)
+ (let ((imports))
+ (regex-lines "(?:^|\\b)@import\\s+\"([^\"]+)\"\\s*;"
+ (pathname (asset-source-path asset))
+ :match (lambda (whole i)
+ (declare (ignore whole))
+ (pushnew i imports :test #'string=)))
+ imports))
+
+(defgeneric less-sources (asset))
+
+(defmethod less-sources ((asset less-asset))
+ (if (slot-boundp asset 'less-sources)
+ (slot-value asset 'less-sources)
+ (setf (slot-value asset 'less-sources)
+ (mapcan (lambda (import)
+ (let ((asset (find-asset import 'less-asset)))
+ (cons asset (less-sources asset))))
+ (less-imports asset)))))
+
+(defmethod asset-write-date ((asset less-asset))
+ (loop for a in (less-sources asset)
+ maximize (file-write-date (asset-source-path a))))
+
+(defmethod process-asset ((asset less-asset)
+ (output stream))
+ (let ((true-assets-dirs (cache-1 (eq *assets-dirs*)
+ (mapcar #'truename (assets-dirs))))
+ (path (truename (asset-source-path asset))))
+ (less path
+ (list :paths true-assets-dirs :filename path)
+ (list :yuicompress (not *debug*))
+ output))
+ (values))
diff --git a/lowh.triangle.assets.asd b/lowh.triangle.assets.asd
index 4f6ae1c..4291b4c 100644
--- a/lowh.triangle.assets.asd
+++ b/lowh.triangle.assets.asd
@@ -28,7 +28,8 @@
"cl-json"
"exec-js"
"lowh.triangle.files"
- "lowh.triangle.uri")
+ "lowh.triangle.uri"
+ "str")
:components
((:file "package")
(:file "config" :depends-on ("package"))
@@ -45,4 +46,5 @@
(:file "preprocess" :depends-on ("find"))
(:file "image" :depends-on ("asset" "html"))
(:file "css" :depends-on ("preprocess" "html"))
+ (:file "less" :depends-on ("css"))
(:file "js" :depends-on ("preprocess" "html"))))
diff --git a/package.lisp b/package.lisp
index 1d92baf..aee5eca 100644
--- a/package.lisp
+++ b/package.lisp
@@ -28,7 +28,7 @@
(defpackage :lowh.triangle.assets
(:nicknames :L>assets)
- (:use :cl :alexandria :L>ext :L>files :L>uri)
+ (:use :cl :alexandria :L>ext :L>files :L>uri :str)
(:export
;; Config
#:*debug*