@@ -4,7 +4,7 @@

 (in-package #:alimenta)

 (defclass feed-entity ()

-  ((title :initarg :title :initform nil :accessor title)  

+  ((title :initarg :title :initform nil :accessor title)

    (link :initarg :link :initform nil :accessor link)

    (doc :initarg :doc :initform nil :accessor doc)))

@@ -39,7 +39,7 @@

    (id :initarg :id :initform nil :accessor id)

    (links :initform (make-hash-table :test #'equalp) :accessor links)))

-(collection-class:define-collection (feed item) (feed-entity) 

+(collection-class:define-collection (feed item) (feed-entity)

   ((description :initarg :description :initform nil :accessor description)

    (feed-link :initarg :feed-link :initform nil :accessor feed-link)

    (source-type :initarg :source-type :initform nil :accessor source-type)))

@@ -131,7 +131,7 @@

             (error 'type-error "too many arguments")))

       (let ((type-keyword (make-keyword (string-upcase type))))

         (when (slot-boundp self 'links)

-          (multiple-value-bind (old-link old-link-p) (gethash type-keyword links) 

+          (multiple-value-bind (old-link old-link-p) (gethash type-keyword links)

             (when old-link-p

               (cerror "Replace Link ~a:~a with ~a:~a" 'duplicate-link-type :old old-link :new href))))

         (setf (gethash type-keyword links) href)))))

@@ -190,7 +190,7 @@

 ;;  (with-accessors ((items items)) feed

 ;;    (loop for item across (get-items xml-dom type)

 ;;          do (push (make-item xml-dom type) items)

-;;          finally (return items)))) 

+;;          finally (return items))))

 (defun make-feed (&key title link items feed-link description)

   (make-instance 'feed

@@ -322,7 +322,7 @@

               ($ (inline generated-xml) "entry > content" (text) (node)))

       (should be equal +link+

               ($ (inline generated-xml) "entry > link" (attr "href") (node)))

-      ; TODO: deal with dates . . .

+      ;; TODO: deal with dates . . .

       )))

 (defun do-test (&optional (test nil))

@@ -35,13 +35,12 @@

 (defgeneric slot-tags (self))

 (defun process-slots-for-data-class (slots)

-  (mapcar

-    (fw.lu::destructuring-lambda ((slot tag . rest))

-      (let ((tag (etypecase tag

-                   (symbol (string-downcase tag))

-                   (string tag))))

-        (list* slot (make-keyword slot) tag rest)))

-    (fw.lu:ensure-mapping slots)))

+  (mapcar (fw.lu::destructuring-lambda ((slot tag . rest))

+            (let ((tag (etypecase tag

+                         (symbol (string-downcase tag))

+                         (string tag))))

+              (list* slot (make-keyword slot) tag rest)))

+          (fw.lu:ensure-mapping slots)))

 (deftest process-slots-for-data-class ()

   (let ((tc-1 '(a))

@@ -78,7 +77,3 @@

          (defmethod %all-slots ((self ,name) format)

            (pairlis (list ,@(mapcar (fw.lu::alambda (cadr it)) slots))

                     (list ,@(loop for (slot) in slots collect `(,slot self)))))))))

-

-

-

-

@@ -44,11 +44,11 @@

   (:use #:cl #:alimenta #:alexandria #:anaphora #:lquery)

   (:export #:discover-feed))

-(defpackage #:alimenta.pull-feed 

+(defpackage #:alimenta.pull-feed

   (:use #:cl #:alimenta #:alexandria #:anaphora #:lquery)

   (:export #:pull-feed #:fetch-doc-from-url #:fetch-feed-from-url

            #:fetch-error #:feed-ambiguous #:no-feed #:with-user-agent

-	   #:skip-feed)) 

+	   #:skip-feed))

 (defmethod asdf:perform ((o asdf:test-op) (s (eql (asdf:find-system :alimenta))))

   (asdf:load-system :alimenta)

@@ -27,10 +27,10 @@

   (categories "category" :value (get-categories doc  "channel > category"))

   (text-input "textInput")

-  (managing-editor "managingEditor") 

+  (managing-editor "managingEditor")

   (skip-days "skipDays")

-  (skip-hours "skipHours") 

-  (publication-date "publicationDate" :transform get-date) 

+  (skip-hours "skipHours")

+  (publication-date "publicationDate" :transform get-date)

   (last-build-date "lastBuildDate" :transform get-date))

 (define-data-class rss-item (doc "") (item)

@@ -106,7 +106,7 @@

                                 (let-each (:be *)

                                   (chronicity:parse timestamp)

                                   (local-time:timestamp- * minute-offset :minute)

-                                  (local-time:timestamp- * hour-offset   :hour)))       

+                                  (local-time:timestamp- * hour-offset   :hour)))

                   (pop-token () (setf timestamp

                                       (subseq timestamp

                                               0

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

 	  ($ (inline (make-element "title")) (text title)

 	     (inline (make-element "link")) (text link)

 	     (inline (make-element "pubDate")) (text date)

-	     (inline (make-element "description")) (text content))    

+	     (inline (make-element "description")) (text content))

 	  (plump-dom:set-attribute

 	   ($ (inline (make-element "guid")) (text id) (node))

 	   "isPermaLink"

@@ -203,7 +203,7 @@

                       (serialize (parse (or item-content-encoded item-description)) s))))

          (*tag-dispatchers* *html-tags*))

     (make-instance 'rss-item

-                   :content content   

+                   :content content

                    :date item-date

                    :doc xml-dom

                    :id item-guid

@@ -219,10 +219,10 @@

           (get-date "Fri, 09 Jan 2016 23:00:00 -0100"))

   (should be local-time:timestamp=

           (local-time:parse-timestring "2016-01-09T23:00:00.000000-0100")

-          (get-date "Fri, 09 Jan 2016 22:00:00 -0200"))  

+          (get-date "Fri, 09 Jan 2016 22:00:00 -0200"))

   (should be local-time:timestamp=

           (local-time:parse-timestring "2016-01-09T23:00:00.000000-0100")

-          (get-date "Fri, 09 Jan 2016 21:30:00 -0230"))) 

+          (get-date "Fri, 09 Jan 2016 21:30:00 -0230")))

 (defmethod alimenta::-to-feed (xml-dom (type (eql :rss)) &key feed-link)

   ;; TODO: store feed-link

@@ -239,4 +239,3 @@

                      :link doc-link

                      :description doc-description

                      :feed-link doc-feed-link))))

-