Assorted cleanups.

src/content.lisp

@@ -25,6 +25,14 @@
   "Create an instance of CONTENT-TYPE with the given ARGS."
   (apply 'make-instance content-type args))
 
+(defun tag-p (tag obj)
+  "Test if OBJ is tagged with TAG."
+  (member tag (content-tags obj) :test #'tag-slug=))
+
+(defun month-p (month obj)
+  "Test if OBJ was written in MONTH."
+  (search month (content-date obj)))
+
 (defgeneric discover (content-type)
   (:documentation "Load all content of the given CONTENT-TYPE from disk."))
 

src/feeds.lisp

@@ -4,24 +4,16 @@
   "Make a RFC1123 pubdate representing the current time."
   (local-time:format-rfc1123-timestring nil (local-time:now)))
 
-(defun first-10 (list)
-  "Get up to the first 10 items in LIST."
-  (subseq list 0 (min (length list) 10)))
-
-(defun make-tag-feed (tag posts)
-  "Make an RSS feed for the given TAG and POSTS."
-  (flet ((valid-p (obj) (member tag (content-tags obj) :test #'tag-slug=)))
-    (make-instance 'tag-index :id (format nil "~A-rss.xml" (tag-slug tag))
-                   :posts (first-10 (remove-if-not #'valid-p posts)))))
-
 (defun render-feed (posts &key path template tag)
-  "Given a PATH, TEMPLATE, and possibly a TAG, render the appropriate feed."
-  (let ((template (theme-fn template "feeds"))
-        (index (if tag
-                   (make-tag-feed tag posts)
-                   (make-instance 'index :id path
-                                  :posts (first-10 posts)))))
-    (write-page (page-path index) (render-page index template))))
+  (flet ((first-10 (list) (subseq list 0 (min (length list) 10)))
+         (tag-posts (list) (remove-if-not (lambda (x) (tag-p tag x)) list)))
+    (let ((template (theme-fn template "feeds"))
+          (index (if tag
+                     (make-instance 'tag-index :id path
+                                    :posts (first-10 (tag-posts posts)))
+                     (make-instance 'index :id path
+                                    :posts (first-10 posts)))))
+      (write-page (page-path index) (render-page index template)))))
 
 (defun render-feeds (tag-feeds)
   "Render the default RSS and ATOM feeds along with any TAG-FEEDS."
@@ -30,5 +22,6 @@
                     (:path "feed.atom" :template :atom-feed)))
       (apply #'render-feed posts feed))
     (dolist (feed tag-feeds)
-      (apply #'render-feed posts (list :tag (make-tag feed)
+      (apply #'render-feed posts (list :path (format nil "~A-rss.xml" feed)
+                                       :tag (make-tag feed)
                                        :template :rss-feed)))))

src/indices.lisp

@@ -28,7 +28,7 @@
 
 (defun all-months ()
   "Retrieve a list of all months with published content."
-  (let ((months (mapcar (lambda (x) (get-month (content-date x)))
+  (let ((months (mapcar (lambda (x) (subseq (content-date x) 0 7))
                         (hash-table-values *content*))))
     (sort (remove-duplicates months :test #'string=) #'string>)))
 
@@ -38,23 +38,17 @@
          (tags (remove-duplicates dupes :test #'string= :key #'tag-slug)))
     (sort tags #'string< :key #'tag-name)))
 
-(defun get-month (timestamp)
-  "Extract the YYYY-MM portion of TIMESTAMP."
-  (subseq timestamp 0 7))
-
 (defun index-by-tag (tag content)
   "Return an index of all CONTENT matching the given TAG."
-  (flet ((valid-p (obj) (member tag (content-tags obj) :test #'tag-slug=)))
-    (make-instance 'tag-index :id (tag-slug tag)
-                   :posts (remove-if-not #'valid-p content)
-                   :title (format nil "Posts tagged ~a" (tag-name tag)))))
+  (make-instance 'tag-index :id (tag-slug tag)
+                 :posts (remove-if-not (lambda (x) (tag-p tag x)) content)
+                 :title (format nil "Posts tagged ~a" (tag-name tag))))
 
 (defun index-by-month (month content)
   "Return an index of all CONTENT matching the given MONTH."
-  (flet ((valid-p (obj) (search month (content-date obj))))
-    (make-instance 'date-index :id month
-                               :posts (remove-if-not #'valid-p content)
-                               :title (format nil "Posts from ~a" month))))
+  (make-instance 'date-index :id month
+                 :posts (remove-if-not (lambda (x) (month-p month x)) content)
+                 :title (format nil "Posts from ~a" month)))
 
 (defun index-by-n (i content &optional (step 10))
   "Return the index for the Ith page of CONTENT in reverse chronological order."