@@ -14,19 +14,25 @@

   (:documentation

    "A simple wrapper that ties a ningle app to a clack handler"))

+(defun redirect (target)

+  (lambda (_)

+    (declare (ignore _))

+    `(302 (:location ,target) ())))

 (defmethod araneus:routes progn ((app rss-reader))

   (araneus:defroutes (app app)

-    (("/") (serapeum:partial 'araneus:run-route (make-instance 'homepage)))

+    (("/") (redirect (format nil "/f/~(~a~)"

+                             (feed-key

+                              (car

+                               (feeds app))))))

     (("/f/:feed") (lambda (params)

                     (optima:match params

                       ((optima.extra:alist (:feed . feed))

-                       (araneus:run-route (feed-page

-                                           (feeds app)

-                                           (serapeum:assocdr feed (feeds app)

-                                                             :test 'string-equal))

-                                          params)))))

-    (("/other") (serapeum:partial 'araneus:run-route 'other))))

+                       (araneus:run-route (feed-page (feeds app)

+                                                     (find feed (feeds app)

+                                                           :key 'feed-key

+                                                           :test 'string-equal))

+                                          params)))))))

 (defun start (app)

   (setf (handler app)

@@ -38,11 +44,39 @@

 (defun unboundp (symbol)

   (not (boundp symbol)))

+(defgeneric feed-key (object))

+(defgeneric feed-url (object))

+

+(fw.lu:defclass+ feed-reference ()

+  ((%key :initarg :key :reader feed-key)

+   (%url :initarg :url :reader feed-url)))

+

+(fw.lu:defclass+ plump-cleaner

+    ((feed-reference (key url)))

+  ())

+

+(defgeneric resolve-feed-reference (reference)

+  (:method ((r feed-reference))

+    (alimenta.pull-feed:pull-feed (feed-url r))))

+

+(defgeneric prepare-feed-item-description (reference item)

+  (:method ((r feed-reference) (item alimenta:item))

+    (alimenta:description item))

+  (:method ((r plump-cleaner) (item alimenta:item))

+    (let ((description (alimenta:description item)))

+      (when description

+        (format t "~&aaaaa~%")

+        (plump:text

+         (plump:parse

+          description))))))

+

 (defun main ()

   (setf *app*

         (if (not (boundp '*app*))

             (start

              (araneus:routes

-              (rss-reader `((:techcrunch . "https://techcrunch.com/feed/")

-                            (:just-thomism . "https://thomism.wordpress.com/feed/")))))

+              (rss-reader (list

+                           (feed-reference :techcrunch      "https://techcrunch.com/feed/")

+                           (plump-cleaner  :coding-horror   "http://feeds.feedburner.com/codinghorror")

+                           (feed-reference :daring-fireball "https://daringfireball.net/feeds/main")))))

             *app*)))

@@ -5,10 +5,13 @@

 (defpackage :fwoar.rss-reader.ui

   (:use :cl :parenscript)

   (:export ui

-           #:homepage

            #:intercooler-debugger))

 (defpackage :fwoar.rss-reader

   (:use :cl )

   (:import-from :fwoar.rss-reader.utils #:defclass+)

-  (:export ))

+  (:export

+   #:feed-reference

+   #:plump-cleaner

+   #:resolve-feed-reference

+   #:prepare-feed-item-description))

@@ -4,18 +4,35 @@

    #:summary))

 (in-package :fwoar.rss-render)

-(defmethod alimenta.render:render-feed (feed (renderer (eql 'summary)))

+(defmacro if-arg-not-nil ((op arg))

+  (alexandria:once-only (arg)

+    `(when ,arg

+       (,op ,arg))))

+

+(defmethod alimenta.render:render-feed ((feed alimenta.rss:rss-feed) (renderer fwoar.rss-reader:feed-reference))

+  (plump:parse

+   (spinneret:with-html-string

+     (:div.feed

+      (:section

+       (:h2.title (if-arg-not-nil

+                      (plump:decode-entities

+                       (alimenta:title feed))))

+       (:p.description (if-arg-not-nil

+                           (plump:decode-entities

+                            (alimenta:description feed)))))

+      (:ul.items)))))

+

+(defmethod alimenta.render:render-feed ((feed alimenta.atom::atom-feed) (renderer fwoar.rss-reader:feed-reference))

   (plump:parse

    (spinneret:with-html-string

      (:div.feed

       (:section

-       (:h2.title (plump:decode-entities

-                   (alimenta:title feed)))

-       (:p.description (plump:decode-entities

-                        (alimenta:description feed))))

+       (:h2.title (if-arg-not-nil

+                      (plump:decode-entities

+                       (alimenta:title feed)))))

       (:ul.items)))))

-(defmethod alimenta.render:render-item (item feed (renderer (eql 'summary)))

+(defmethod alimenta.render:render-item (item feed (renderer fwoar.rss-reader:feed-reference))

   (plump:first-element

    (plump:parse

     (spinneret:with-html-string

@@ -24,10 +41,12 @@

            (plump:decode-entities

             (alimenta:title item)))

        (:p.description

-        (plump:decode-entities

-         (alimenta:description item))))))))

+        (let ((description (fwoar.rss-reader:prepare-feed-item-description renderer item)))

+          (when description

+            (plump:decode-entities

+             description)))))))))

-(defmethod alimenta.render:add-rendered-item (feed-r item-r (renderer (eql 'summary)))

+(defmethod alimenta.render:add-rendered-item (feed-r item-r (renderer fwoar.rss-reader:feed-reference))

   (lquery:$

     (inline feed-r)

     ".items"

@@ -1,23 +1,5 @@

 (in-package :fwoar.rss-reader.ui)

-(defun homepage (content)

-  (spinneret:with-html

-    (:h1 "Hello, World!")

-    (:div.main

-     (:nav

-      :data-ic-target "main"

-      :data-ic-replace-target "true"

-      (:a :data-ic-get-from "/"

-          "home")

-      (:a :data-ic-get-from "/other"

-          "other")

-      (:a :data-ic-get-from "/third"

-          "third")

-      (:a :data-ic-get-from "/fourth"

-          "fourth"))

-     (funcall content))))

-

-

 (defun intercooler-debugger ()

   (ps

     (defun cdnjs-library (name version &key (file name))

@@ -1,5 +1,8 @@

 (in-package :fwoar.rss-reader)

+(defmethod spinneret:html ((object plump:node))

+  (plump:serialize object spinneret:*html*))

+

 (defclass rss-reader-route ()

   ((%feed-list :initarg :feed-list :reader feed-list)))

@@ -54,17 +57,6 @@ the hook that pulls in CSS"

     ((:or ul ol)

      :padding-left 2rem)))

-(defclass+ feed-page ((rss-reader-route (feed-list)) fwoar.default-layout:default-layout)

-  ((%feed :initarg :feed :reader feed)))

-

-(defmethod araneus:controller ((route feed-page) params &key)

-  (funcall (if (equal (serapeum:assocdr "ic-request" params

-                                        :test 'equal)

-                      "true")

-               'partial-request

-               'full-request)

-           (alimenta.pull-feed:pull-feed (feed route))))

-

 (defmacro with-layout ((render-type layout) &body content)

   `(let ((content (lambda ()

                     (spinneret:with-html

@@ -75,11 +67,23 @@ the hook that pulls in CSS"

                 (,layout content)))

        (:partial (funcall content)))))

+(defclass+ feed-page ((rss-reader-route (feed-list)) fwoar.default-layout:default-layout)

+  ((%feed :initarg :feed :reader feed)))

+

+(defmethod araneus:controller ((route feed-page) params &key)

+  (funcall (if (equal (serapeum:assocdr "ic-request" params

+                                        :test 'equal)

+                      "true")

+               'partial-request

+               'full-request)

+           (resolve-feed-reference (feed route))))

+

 (defmethod araneus:view ((_ feed-page) (model intercooler-request))

   (spinneret:with-html

     (:main#content

      (alimenta:render (request model)

                       'fwoar.rss-render:summary))))

+

 (defmethod araneus:view ((route feed-page) (model full-request))

   (spinneret:with-html

     (:h1 "Hello, World!")

@@ -88,36 +92,18 @@ the hook that pulls in CSS"

       :data-ic-push-url "true"

       :data-ic-target "main"

       :data-ic-replace-target "true"

-      (loop for (feed-id) in (feed-list route)

-            collect (:a :data-ic-get-from (format nil "/f/~a" (string-downcase feed-id))

-                        feed-id)))

+      (loop for feed in (feed-list route)

+            collect (:a :data-ic-get-from (format nil "/f/~a" (string-downcase (feed-key feed)))

+                        (feed-key feed))))

      (:main#content

       (alimenta:render (request model)

-                       'fwoar.rss-render:summary)))))

-

-(defclass homepage (rss-reader-route fwoar.default-layout:default-layout)

-  ())

+                       (feed route))))))

 (defmethod fwoar.default-layout:border-color ((layout rss-reader-route))

   "#BDE0F3")

-

-(defmethod araneus:controller ((route homepage) params &key)

-  (format t "~&~s~%" params)

-  (if (equal (serapeum:assocdr "ic-request" params

-                               :test 'equal)

-             "true")

-      :partial

-      :full))

-

-(defmethod araneus:view ((route homepage) model)

-  (with-layout (model fwoar.rss-reader.ui:homepage)

-    (:raw

-     (plump:serialize (alimenta:render (alimenta.pull-feed:pull-feed

-                                        "https://thomism.wordpress.com/feed/")

-                                       'fwoar.rss-render:summary)

-                      nil))))

-

-(araneus:define-controller other (_)

-  (values))

-(araneus:define-view other (_)

-  "<main><h2>???</h2></main>")

+(defmethod fwoar.default-layout:background-color ((layout rss-reader-route))

+  "#3f3f3f")

+(defmethod fwoar.default-layout:text-color ((layout rss-reader-route))

+  "#DCDCCC")

+(defmethod fwoar.default-layout:link-color ((layout rss-reader-route))

+  "#F5F5D6")