new file mode 100644

@@ -0,0 +1,15 @@

+(defpackage :inangulis.blog

+  (:use :cl :anaphora :alexandria :inangulis.web))

+

+(in-package :inangulis.blog)

+

+(defclass blog-post ()

+  ((id :col-type serial)

+   (title :col-type text)

+   (author :col-type int)

+   (name :initarg :name :col-type text)

+   (moderator :initarg :moderator :initform nil :col-type bool))

+  (:metaclass dao-class)

+  (:keys id))

+

+(define-controller)

@@ -22,8 +22,11 @@

                 #:ningle)

   :serial t

   :components ((:file "package")

-               (:file "tables")

                (:file "web")

+               (:file "utils")

+               (:file "user")

+               (:file "links")

+               (:file "tables")

                (:file "inangulis")))

 ;; vim: set ft=lisp:

@@ -1,68 +1,14 @@

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

-

-;;;; inangulis.lisp

-

 (in-package #:inangulis)

-(defparameter *submissions* nil)

+

 (defparameter *by-distinct* (make-hash-table :test #'equalp))

 (defparameter *users* (make-hash-table :test #'equalp))

-(defparameter *persist* t)

-

-(defmacro cdr-assoc (&whole lis item alist &key key test test-not)

-  `(cdr (assoc ,@(cdr lis))))

-

-(defun str-assoc (param params &key (test #'equal) key)

-  (cdr-assoc param params :test test :key key))

-

-;;; "inangulis" goes here. Hacks and glory await!

-

-(defun current-date-string ()

-  "Returns current date as a string."

-  (local-time:format-timestring nil (local-time:now) 

-                                :format local-time:+rfc-1123-format+))

-

-(defclass user ()

-  ((uid :initarg :uid)

-   (email :initarg :email)

-   (name :initarg :name)

-   (moderator :initarg :moderator :initform nil)))

-

-(defun user-alist (user)

-  (with-slots ((email inangulis.tables::email)

-               (name inangulis.tables::name)

-               (moderator inangulis.tables::moderator)) user

-    `(("name" . ,name)

-      ("email" . ,email)

-      ("moderator" . ,moderator))))

 (defmethod print-object ((obj user) s)

   (print-unreadable-object (obj s :type t :identity t)

     (with-slots (uid email name moderator) obj

       (format s "U: ~s E: ~s N: ~s M: ~s" uid email name moderator))))

-(defun make-submission (headline url &key (approved ""))

-  (alet 'inangulis.tables:submission

-    (make-instance it :headline headline :url url :approved approved :date (current-date-string))))

-

-(defun submission-alist (submission)

-  `(("headline". ,(s-headline submission))

-    ("url" . ,(s-url submission))

-    ("date" . ,(s-url submission))

-    ("approved" . ,(s-approved submission))))

-

-(defun get-by-key (headline url)

-  (car (postmodern:select-dao 'inangulis.tables::submission (:and (:= 'headline headline) (:= 'url url)))))

-

-

-(defun alist-submission (alist &key nil-if-exists)

-  (let* ((headline (cdr-assoc :headline alist :test #'string-equal))

-         (url (cdr-assoc :url alist :test #'string-equal))

-         (approved (or (cdr-assoc :approved alist :test #'string-equal) ""))   

-         (result (make-submission headline url :approved approved)))

-    (with-slots ((headline inangulis.tables:headline) (url inangulis.tables:url)) result

-      (aif (get-by-key headline url)

-        (unless nil-if-exists it)

-        result))))

 (defun get-moderated (feeds)

@@ -95,22 +41,8 @@

      (declare (ignorable ,@args))

      ,@body))

-(defmacro with-db (&body b)

-  `(postmodern:with-connection (ubiquitous:value 'db)

-     ,@b))

-

-(defmacro with-submissions (&body b)

-  `(with-db

-     (let ((*submissions* (postmodern:select-dao 'inangulis.tables::submission t "date desc")))

-       ,@b)))

-

-

-(defun submit (params)

-  (awhen (alist-submission params :nil-if-exists t)

-    (postmodern:insert-dao it)

-    (push it *submissions*)))

 (defun get-feed-guid (item)

   (with-slots (alimenta:title alimenta:link) item

@@ -125,28 +57,6 @@

     (pomo:with-transaction ()

       (call-next-method))))

-;; View Controllers

-(define-controller murmur (params)

-  (sleep 0.01)

-  (submit params))

-

-(define-view murmur (model)

-  '(302 (:location "/") ("Done"))) 

-  

-(define-controller curate (params)

-  (let ((*submissions* (postmodern:select-dao 'inangulis.tables::submission t "date desc")))

-    (cl-oid-connect.utils:require-login

-      (alet (alist-submission params)

-        (let ((approval (string-downcase (str-assoc "approved" params :test #'equalp))))

-          (setf (s-approved it)

-                (if (equal approval "+") "approved"

-                  (if (equal approval "-") "rejected")))

-          (when *persist*

-            (postmodern:update-dao it)))))))

-

-(define-view curate (params)

-  '(302 (:location "/") ("Done")))

-

 (define-view login-page (model)

   `(200

     ()

@@ -171,7 +81,7 @@

   (let ((feed (alimenta::make-feed :title "In Angulis" :link "http://in-angulis.com/feed"

                                    :description "Locus in quo sunt illi qui murmurant in angulis")))

     (prog1 feed

-      (pomo:do-select-dao (('inangulis.tables::submission submission)

+      (pomo:do-select-dao (('inangulis.links:submission submission)

                            (:raw (if moderated (pomo:sql (:= 'approved "approved")) "'t'"))

                            (:desc 'date))

         (alimenta::add-item-to-feed feed

@@ -186,21 +96,6 @@

 (define-view get-feed (feed)

   `(200 (:content-type "application/rss+xml") (,(plump:serialize (alimenta:generate-xml feed) nil))))

-(mustache-view root (user . links) #p"static/index.mustache.html"

-  :links (mapcar #'submission-alist links)

-  :user (when user (user-alist user)))

-

-(define-controller root (params)

-  (setf *tmp* ningle.context:*request*)

-  (with-submissions

-    (ningle:with-context-variables (session)

-      (handler-case

-        (cl-oid-connect.utils:ensure-logged-in

-          (cl-oid-connect.utils:redirect-if-necessary session

-            (cons (gethash :app-user session)

-                  *submissions*)))

-        (cl-oid-connect.utils:user-not-logged-in (c) (cons nil *submissions*))))))

-

 (defmethod controller :around ((name (eql 'headlines)) params &key (moderated t moderated-p))

   (unless moderated-p

     (awhen (str-assoc "moderated" params :test #'string-equal)

@@ -214,8 +109,8 @@

   (let (result)

     (ningle.context:with-context-variables (session)

       (let* ((app-user (gethash :app-user session))

-             (moderator-p (and app-user (slot-value app-user 'inangulis.tables::moderator))))

-        (pomo:do-select-dao (('inangulis.tables::submission submission)

+             (moderator-p (and app-user (slot-value app-user 'inangulis.user::moderator))))

+        (pomo:do-select-dao (('inangulis.links:submission submission)

                              (:raw (cond 

                                      ((and moderator-p (not moderated-p)) "'t'")

                                      (moderated (pomo:sql (:= 'approved "approved")))

@@ -246,12 +141,12 @@

   (declare (ignore args))

   (let ((id (cdr (assoc :id userinfo))))

     (with-db

-      (aif (car (postmodern:select-dao 'inangulis.tables::user (:= 'uid id)))

+      (aif (car (postmodern:select-dao 'inangulis.user:user (:= 'uid id)))

         it

-        (alet (make-instance 'inangulis.tables::user)

-          (with-slots ((uid inangulis.tables::uid)

-                       (name inangulis.tables::name)

-                       (email inangulis.tables::email)) it

+        (alet (make-instance 'inangulis.user:user)

+          (with-slots ((uid inangulis.user::uid)

+                       (name inangulis.user::name)

+                       (email inangulis.user::email)) it

             (prog1 it

               (setf uid id

                     name (cdr (assoc :name userinfo))

new file mode 100644

@@ -0,0 +1,114 @@

+(in-package :inangulis.links)

+

+(defparameter *submissions* nil)

+

+(defclass submission ()

+  ((headline  :initarg :headline  :col-type text :initform ""  :accessor s-headline)

+   (url       :initarg :url       :col-type text :initform ""  :accessor s-url)

+   (date      :initarg :date      :col-type timestamptz :initform "" :accessor s-date)

+   (submitter :initarg :submitter :col-type (or s-sql:db-null integer) :accessor s-submitter)

+   (curator   :initarg :curator   :col-type (or s-sql:db-null integer) :accessor s-curator)

+   (approved  :initarg :approved  :col-type text :initform "" :accessor s-approved))

+  (:metaclass pomo:dao-class)

+  (:keys headline url))

+

+(pomo:deftable submission

+  (pomo:!dao-def) 

+  (pomo:!foreign "public.user" "submitter" "id" :on-delete :set-null :on-update :cascade)

+  (pomo:!foreign "public.user" "curator" "id" :on-delete :set-null :on-update :cascade))

+

+#|

+ |(pomo:with-connection (ubiquitous:value :db)

+ |   (pomo:create-table 'submission))

+ |#

+

+(defun make-submission (headline url &key (approved ""))

+  (alet 'submission

+    (make-instance it :headline headline :url url :approved approved :date (current-date-string))))

+

+(defun get-by-key (headline url)

+  (car (postmodern:select-dao 'submission (:and (:= 'headline headline) (:= 'url url)))))

+

+(defun alist-submission (alist &key nil-if-exists)

+  (let* ((headline (cdr-assoc :headline alist :test #'string-equal))

+         (url (cdr-assoc :url alist :test #'string-equal))

+         (approved (or (cdr-assoc :approved alist :test #'string-equal) ""))   

+         (result (make-submission headline url :approved approved)))

+    (with-slots ((headline inangulis.links:headline) (url inangulis.links:url)) result

+      (aif (get-by-key headline url)

+        (unless nil-if-exists it)

+        result))))

+

+(defmethod s-date ((object submission))

+  (with-slots (date) object

+    (local-time:format-timestring nil date :format local-time:+rfc-1123-format+)))

+

+(defmethod print-object ((obj submission) s)

+  (print-unreadable-object (obj s :type t :identity t)

+    (with-slots (headline url approved) obj

+      (format s "H: ~s U: ~s A: ~s" headline url approved))))

+

+(defmacro with-submissions (&body b)

+  `(with-db

+     (let ((*submissions* (postmodern:select-dao 'submission t "date desc")))

+       ,@b)))

+

+(defun submission-alist (submission)

+  (slots-to-pairs submission

+                  (headline

+                    url

+                    date

+                    approved)))

+

+

+(mustache-view root (user . links) #p"static/index.mustache.html"

+  :links (mapcar #'submission-alist links)

+  :user (when user (inangulis.user:user-alist user)))

+

+(define-controller root (params)

+  (with-submissions

+    (ningle:with-context-variables (session)

+      (handler-case

+        (cl-oid-connect.utils:ensure-logged-in

+          (cl-oid-connect.utils:redirect-if-necessary session

+            (cons (gethash :app-user session)

+                  *submissions*)))

+        (cl-oid-connect.utils:user-not-logged-in (c) (cons nil *submissions*))))))

+

+(defun submit (params)

+  (ningle:with-context-variables (session)

+    (let* ((app-user (gethash :app-user session)))

+      (awhen (alist-submission params :nil-if-exists t)

+        (when app-user

+          (setf (s-submitter it)

+                (slot-value app-user 'inangulis.user:id)))

+        (postmodern:insert-dao it)

+        (push it *submissions*))))) 

+

+;; View Controllers

+(define-controller murmur (params)

+  (sleep 0.01)

+  (submit params))

+

+(define-view murmur (model)

+  '(302 (:location "/") ("Done"))) 

+

+(defmethod controller :around ((name (eql 'curate)) params &key)

+  (cl-oid-connect.utils:require-login

+    (call-next-method)))

+

+(define-controller curate (params)

+    (let* ((session (ningle:context :session))

+           (app-user (gethash :app-user session))

+           (approval (string-downcase (str-assoc "approved" params :test #'equalp)))

+           (submission (alist-submission params)))

+      (setf1 ((s-curator submission) (slot-value app-user 'inangulis.user:id))

+             ((s-approved submission) (ccase (elt approval 0)

+                                     (#\+ "approved")

+                                     (#\- "rejected"))))

+      (postmodern:update-dao submission)))

+

+(define-view curate (params)

+  '(302 (:location "/") ("Done")))

+

+

@@ -1,8 +1,11 @@

 ;;;; package.lisp

 (defpackage #:inangulis.tables

-  (:use #:cl #:anaphora #:postmodern)

-  (:export #:submission #:headline #:url #:date #:approved))

+  (:use #:cl #:anaphora #:postmodern))

+

+(defpackage #:inangulis.utils

+  (:use #:cl #:anaphora)

+  (:export #:with-db #:cdr-assoc #:str-assoc #:current-date-string))

 (defpackage #:inangulis.web

   (:use #:cl)

@@ -10,9 +13,20 @@

            #:controller #:view #:run-route #:mustache-view #:render-mustache

            #:setf1))

+(defpackage #:inangulis.user

+  (:use #:cl #:anaphora #:alexandria #:inangulis.web)

+  (:export #:user #:user-alist #:id #:uid #:name #:email #:moderator))

+

+(defpackage #:inangulis.links

+  (:use #:cl #:anaphora #:alexandria #:inangulis.web #:inangulis.utils #:fwoar.lisputils)

+  (:export #:root #:murmur #:curate *submissions* #:submission #:s-headline #:s-url

+           #:s-date #:s-submitter #:s-curator #:s-approved #:headline #:url #:date #:submitter

+           #:curator #:approved))

+

 (defpackage #:inangulis

-  (:use #:cl #:anaphora #:inangulis.tables #:inangulis.web))

+  (:use #:cl #:anaphora #:inangulis.tables #:inangulis.web #:inangulis.links

+        #:inangulis.user #:inangulis.links #:inangulis.utils))

 (defpackage #:inangulis-user

-  (:use #:cl #:inangulis.tables #:inangulis.web #:inangulis))

+  (:use #:cl #:inangulis.utils #:inangulis.user #:inangulis.links #:inangulis.tables #:inangulis.web #:inangulis))

@@ -1,5 +1,6 @@

 /*@import(url(/static/css/baseline.css));*/

 /*@import url("/css/formalize.css");*/

+/*// TODO: embed newer version*/

 @import url(https://fonts.googleapis.com/css?family=Alegreya+Sans|MedievalSharp&subset=latin,latin-ext);

 input {

@@ -34,15 +35,22 @@ h1 {

   letter-spacing: 6px;

   padding: 0.5em;

   margin: 0px;

-  margin-top: 0.5em;

-  margin-bottom: 1em;

+  padding-top: 2.75em;

+  /*margin-left: 1em;*/

+  padding-bottom: 1em;

+  margin-bottom: 0.5em;

   font-size: 3em;

   background: white;

+  font-weight: normal;

   width: 100%;

   z-index: 100;

   text-align: center;

   font-variant: small-caps;

-  font-family: 'MedievalSharp'

+  font-family: 'MedievalSharp';

+

+  color: #000;

+  background: #eee;

+

 }

 main {

@@ -261,6 +269,6 @@ main > h2 {

   position:relative;

   left: -6.25vw;

   width: 87.5vw;

-  margin-top: 1.5em;

+  margin-top: 4.5em;

   letter-spacing: 1px;

 }

@@ -33,7 +33,7 @@

     <form action="/murmuro" id="submission" name="submission" method="POST">

       <input type="text" name="headline" placeholder="Headline" v-model="newLink.headline">

       <input type="text" name="url" placeholder="URL" v-model="newLink.url">

-      <input type="submit" value="Go" title='Murmuro'>

+      <input type="submit" value="Submit" title='Murmuro'>

     </form>

     {{#user}}

@@ -3,42 +3,4 @@

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

   (local-time:set-local-time-cl-postgres-readers))

-(defclass user ()

-  ((id :col-type serial)

-   (uid :initarg :uid :col-type text)

-   (email :initarg :email :col-type text)

-   (name :initarg :name :col-type text)

-   (moderator :initarg :moderator :initform nil :col-type bool))

-  (:metaclass dao-class)

-  (:keys id))

-(deftable user

-  (!dao-def))

-

-(defclass submission ()

-  ((headline :initarg :headline :col-type text :initform ""  :accessor inangulis::s-headline)

-   (url      :initarg :url      :col-type text :initform ""  :accessor inangulis::s-url)

-   (date     :initarg :date     :col-type timestamptz :initform "")

-   (approved :initarg :approved :col-type text :initform "" :accessor inangulis::s-approved))

-  (:metaclass dao-class)

-  (:keys headline url))

-

-(deftable submission

-  (!dao-def))

-

-;; (ubiquitous:restore :inangulis)

-

-;; (with-connection (ubiquitous:value 'db)

-;;   (create-table 'user))

-

-;; (with-connection (ubiquitous:value 'db)

-;;   (create-table 'submission))

-

-(defmethod inangulis::s-date ((object submission))

-  (with-slots (date) object

-    (local-time:format-timestring nil date :format local-time:+rfc-1123-format+)))

-

-(defmethod print-object ((obj submission) s)

-  (print-unreadable-object (obj s :type t :identity t)

-    (with-slots (headline url approved) obj

-      (format s "H: ~s U: ~s A: ~s" headline url approved))))

new file mode 100644

@@ -0,0 +1,18 @@

+(in-package :inangulis.user)

+

+(defclass user () 

+  ((id :col-type serial)

+   (uid :initarg :uid :col-type text)

+   (email :initarg :email :col-type text)

+   (name :initarg :name :col-type text)

+   (moderator :initarg :moderator :initform nil :col-type bool))

+  (:metaclass pomo:dao-class)

+  (:keys id))

+

+(pomo:deftable user

+  (pomo:!dao-def))

+

+(defun user-alist (user)

+  (with-slots (email name moderator) user

+    (pairlis '("name" "email" "moderator")

+             `(,name  ,email  ,moderator))))

new file mode 100644

@@ -0,0 +1,18 @@

+(in-package #:inangulis.utils)

+

+(defmacro with-db (&body b)

+  `(postmodern:with-connection (ubiquitous:value :db)

+     ,@b))

+

+(defmacro cdr-assoc (&whole lis item alist &key key test test-not)

+  `(cdr (assoc ,@(cdr lis))))

+

+(defun str-assoc (param params &key (test #'equal) key)

+  (cdr-assoc param params :test test :key key))

+

+(defun current-date-string ()

+  "Returns current date as a string."

+  (local-time:format-timestring nil (local-time:now) 

+                                :format local-time:+rfc-1123-format+))

+

+