marcuskammer/coleslaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental

Browse source
This commit is contained in:
Brit Butler 2014-06-01 17:22:55 -04:00
commit 331cc94b2c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS.md
View file

@ -11,7 +11,7 @@
* **SITE-BREAKING CHANGE**: Coleslaw now supports user-defined routing. * **SITE-BREAKING CHANGE**: Coleslaw now supports user-defined routing.
Instead of hard-coding the paths various content types are stored at, Instead of hard-coding the paths various content types are stored at,
they **must** be specified in the configuration file (.coleslawrc). they **must** be specified in the configuration file (.coleslawrc).
Just copy the `:routing` key from the [example][single_site.rc] to Just copy the `:routing` key from the [example][example.rc] to
get the old behavior. get the old behavior.
* **SITE-BREAKING CHANGE**: Coleslaw's multi-site support has changed. * **SITE-BREAKING CHANGE**: Coleslaw's multi-site support has changed.
Instead of having a single .coleslawrc in the user's home directory Instead of having a single .coleslawrc in the user's home directory
@ -98,4 +98,4 @@
[hacking_guide]: https://github.com/redline6561/coleslaw/blob/master/docs/hacking.md [hacking_guide]: https://github.com/redline6561/coleslaw/blob/master/docs/hacking.md
[theming_guide]: https://github.com/redline6561/coleslaw/blob/master/docs/themes.md [theming_guide]: https://github.com/redline6561/coleslaw/blob/master/docs/themes.md
[single_site.rc]: https://github.com/redline6561/coleslaw/blob/master/examples/single-site.coleslawrc [example.rc]: https://github.com/redline6561/coleslaw/blob/master/examples/example.coleslawrc

7
src/documents.lisp
View file

@ -35,10 +35,9 @@
(error "No routing method found for: ~A" class-name))))) (error "No routing method found for: ~A" class-name)))))
(defmethod page-url :around ((document t)) (defmethod page-url :around ((document t))
(let ((result (call-next-method))) (let* ((result (call-next-method))
(if (pathname-type result) (type (or (pathname-type result) "html")))
(make-pathname :defaults result) (make-pathname :type type :defaults result)))
(make-pathname :type "html" :defaults result))))
(defgeneric render (document &key &allow-other-keys) (defgeneric render (document &key &allow-other-keys)
(:documentation "Render the given DOCUMENT to HTML.")) (:documentation "Render the given DOCUMENT to HTML."))