@@ -1,3 +1,3 @@

 [submodule "colors"]

         path = colors

-        url = gitolite@localhost:u/edwlan/colorscheme

+        url = gitolite@git.elangley.org:u/edwlan/colorscheme

@@ -1,6 +1,3 @@

-(ql:quickload :parenscript)

-(ql:quickload :cl-markup)

-

 (defpackage :angular

   (:use :parenscript :cl)

   (:export main))

@@ -1,12 +1,6 @@

 (in-package :cl-user)

-(ql:quickload :clack-middleware-postmodern)

-(ql:quickload '(:fwoar.lisputils :araneus :cl-markup :colors :lquery :plump :postmodern

-                :sxql :clack-middleware-postmodern :dexador :spinneret :ubiquitous :iterate

-                :jonathan :cl-actors :simple-tasks :cl-oid-connect :fwoar.lisputils

-                :serapeum))

-

-(declaim (optimize (speed 0) (safety 3) (debug 2)))

+(declaim (optimize (speed 0) (safety 3) (debug 3)))

 (define-modify-macro aconsf (key value)

                      (lambda (place k v)

@@ -18,10 +12,10 @@

         "application" "rss+xml")

 (aconsf drakma:*text-content-types*

         "text" "rss+xml")

+(aconsf drakma:*text-content-types*

+        "application" "xml")

 ;(load "utils.lisp")

-(load "package.lisp")

-(load "rss.lisp")

 (in-package plump-dom)

@@ -32,8 +26,6 @@

 (in-package :whitespace)

-(use-package :fwoar.lisputils)

-(use-package :araneus)

 (ubiquitous:restore :whitespace)

@@ -59,10 +51,9 @@

   `(let ((plump:*tag-dispatchers* plump:*xml-tags*))

      ,@body))

-(load "base-template.lisp")

-

 (defmacro defun-from-value (name value)

-  `(setf (symbol-function ',name) ,value))

+  `(eval-when (:compile-toplevel :load-toplevel :execute)

+     (setf (symbol-function ',name) ,value)))

 (defun-from-value jsonapi-encoder

                   (jonathan.helper:compile-encoder () (success result)

@@ -191,7 +182,6 @@

         (declare (ignorable main-right-margin)) ; TODO: use this!!!

         `(200 (:content-type "text/css") (,ss))))))

-(load "route-atoms.lisp")

 (define-view json-feed (the-feeds)

   `(200 (:content-type "application/json" :cache-control "private, max-age=300")

@@ -2,20 +2,24 @@

 (in-package :cl-user)

 (defpackage :whitespace.tables

+  (:shadowing-import-from :iterate :with)

   (:use #:cl #:alexandria #:postmodern #:annot.class #:iterate #:fwoar.lisputils))

 (defpackage :whitespace.feeds.autodiscovery

+  (:shadowing-import-from :iterate :with)

   (:use #:cl #:alexandria #:postmodern #:lquery #:cl-syntax #:cl-annot.syntax #:cl-annot.class

         #:whitespace.tables #:iterate #:fwoar.lisputils)

   (:import-from anaphora it)

   (:export :discover-feeds))

 (defpackage :whitespace.feeds.opml

+  (:shadowing-import-from :iterate :with)

   (:use #:cl #:alexandria #:postmodern #:lquery #:cl-syntax #:cl-annot.syntax #:cl-annot.class

         #:whitespace.tables #:iterate #:fwoar.lisputils)

   (:import-from anaphora it))

 (defpackage :whitespace.feeds.rss

+  (:shadowing-import-from :iterate :with)

   (:use #:cl #:alexandria #:postmodern #:lquery #:cl-syntax #:cl-annot.syntax #:cl-annot.class

         #:whitespace.tables #:iterate #:fwoar.lisputils #:whitespace.feeds.autodiscovery)

   (:import-from anaphora it)

@@ -24,6 +28,6 @@

            :make-rss-feed :make-rss-item))

 (defpackage :whitespace

-  (:use #:cl #:anaphora #:fwoar.lisputils #:whitespace.feeds.rss #:whitespace.tables))

+  (:use #:cl #:anaphora #:araneus #:fwoar.lisputils #:whitespace.feeds.rss #:whitespace.tables))

@@ -1,3 +1,4 @@

+;; --*- lisp -*--

 (in-package :angular)

 ;:action "/feeds/add?api=yes" :name "add-form" :id "add-form" :method "post" 

@@ -1,3 +1,4 @@

+;; --*- lisp -*--

 (in-package :ps_translator)

 (macros 

@@ -1,7 +1,3 @@

-(declaim (optimize (safety 3) (speed 0) (debug 3)))

-

-(load "tables.lisp")

-

 (in-package :cl-user)

 (cl-annot.syntax:enable-annot-syntax)

@@ -92,7 +88,7 @@

 (defun make-rss-item (item fallback-date)

   (lquery:initialize item)

-  (flet ((dehtml (h) (plump:text (plump:parse h)))

+  (flet (#+null (dehtml (h) (plump:text (plump:parse h)))

          (get-category-names (it) ;;; TODO: simplify this---Ask Shinmera on IRC

            (if (not (equalp #() it))

              (map 'vector

@@ -101,11 +97,11 @@

              #())))

     (let* ((content-encoded (lquery:$ (children) (tag-name "content:encoded")))

-           (description-element (default-when content-encoded (emptyp content-encoded)

+           (description-element (default-unless content-encoded (emptyp content-encoded)

                                   (lquery:$ (children "description"))))

            (description (normalize-html

-                          (default-when description-element (emptyp description-element)

+                          (default-unless description-element (emptyp description-element)

                             (extract-text "description")))))

       ;(enclosure) --- TODO: implement comment / enclosure handling

@@ -128,7 +124,7 @@

          (link (if (string= link "") (lquery:$ "channel" (children) (tag-name "atom:link") (attr :href) (node)) link))

          (items (lquery:$ "item"))

          (last-build (or (lquery:$ "lastBuildDate" (text) (node)) ""))

-         (pub-date (default-when last-build (string= last-build "")

+         (pub-date (default-unless last-build (string= last-build "")

                      (lquery:$ "pubDate" (text) (node))))

          (fallback-date (if (string= pub-date "") "2015-01-01 0:0:0+00" pub-date)))

     (format t "fallback-date: ~a~%" fallback-date)

@@ -156,7 +152,7 @@

 (defmacro get-id-for-object ((table key-column &optional (id-column :id)) key &body body)

   "Anaphoric macro: binds id to the id it retrieves!"

   (once-only (id-column key)

-    `(let ((id (anaphora:awhen (postmodern:query (:select ,id-column :from ',table :where (:= ',key-column ,key)))

+    `(let ((id (alexandria:when-let ((it (postmodern:query (:select ,id-column :from ',table :where (:= ',key-column ,key)))))

                  (caar it))))

        ,@body)))

@@ -180,14 +176,14 @@

 (defun get-and-possibly-store-feed (rss-feed)

   "Given an rss-feed, return the db's feed-id, persisting it if it doesn't already exist."

   (postmodern:ensure-transaction

-    (anaphora:aif (postmodern:select-dao 'rss_feed_store (:= 'link (rss-feed-link rss-feed)))

+    (alexandria:if-let ((it (postmodern:select-dao 'rss_feed_store (:= 'link (rss-feed-link rss-feed)))))

       (car anaphora:it) ;; The postmodern query returns a nested list

       (store-feed-dao (serialize rss-feed)))))

 (defun store-feed (doc)

-  (postmodern:with-transaction ()

-    (let ((rss-feed (make-rss-feed doc)))

-      (values rss-feed

+  (let ((rss-feed (make-rss-feed doc)))

+    (values rss-feed

+            (postmodern:with-transaction ()

               (get-and-possibly-store-feed rss-feed)))))

 ; TODO: this should eventually take a username/userobject rather than ids . . .

@@ -224,7 +220,7 @@

     result))

 (defun deserialize (&optional user-info)

-  (default-when #() (not (null user-info))

+  (default-unless #() (not (null user-info))

     (let ((feeds

             (postmodern:query-dao 'rss_feed_store

                                   (:select 'rss_feed_store.*

@@ -85,8 +85,8 @@

 (defmacro defserializer ((specializes) &body slots)

   (with-gensyms (obj o-t p-t)

     `(defmethod serialize ((,obj ,specializes) &optional (,o-t #'identity) (,p-t #'%default-pair-transform))

-      (transform-result (,o-t ,p-t)

-        (slots-to-pairs ,obj ,slots)))))

+       (transform-result (,o-t ,p-t)

+                         (slots-to-pairs ,obj ,slots)))))

 (defmethod serialize ((obj sequence) &optional (o-t #'identity) (p-t #'%default-pair-transform))

   (iterate (for item in-sequence obj)

@@ -1,4 +1,4 @@

-(ql:quickload :parenscript)

+;;(ql:quickload :parenscript)

 (defpackage :ps_translator

   (:use :parenscript :cl)

@@ -23,10 +23,10 @@

               ,@code))))

 (defmacro+ps def-event (target event args &body run)

- `($ (,target)

-          (,event

-            (lambda ,args

-              ,@run))))

+  `($ (,target)

+      (,event

+       (lambda ,args

+         ,@run))))

 (defun translate-file (infile outfile)

   (let ((*JS-TARGET-VERSION* 1.9))

@@ -0,0 +1,39 @@

+;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; Package: ASDF-USER -*-

+(in-package :asdf-user)

+

+(load "colors/colors.asd")

+

+(defsystem :whitespace

+  :description ""

+  :author "Ed L <edward@elangley.org>"

+  :license "MIT"

+  :depends-on (#:alexandria

+               #:uiop

+               #:serapeum

+               :clack-middleware-postmodern

+               :fwoar-lisputils

+               :araneus

+               :cl-markup

+               :parenscript

+               :colors

+               :lquery

+               :plump

+               :postmodern

+               :sxql

+               :clack-middleware-postmodern

+               :dexador

+               :spinneret

+               :ubiquitous

+               :iterate

+               :jonathan

+               :cl-actors

+               :simple-tasks

+               :cl-oid-connect

+               :serapeum)

+  :serial t

+  :components ((:file "package")

+               (:file "tables")

+               (:file "rss")

+               (:file "base-template")

+               (:file "route-atoms")

+               (:file "angular")))