@@ -1,2 +1,6 @@

 .*.sw[a-z]

 *~

+#.*#

+*.fasl

+#*#

+[#]*[#]

@@ -10,6 +10,7 @@

                #:drakma

                #:for

                #:fwoar.lisputils

+	       #:collection-class

                #:lquery

                #:plump

                #:serapeum

@@ -18,9 +19,9 @@

                #:split-sequence)

   :serial t

   :components ((:file "package")

-               (:file "collections")

-               (:file "collections-for")

-               #+sbcl (:file "collections-sbcl-iterators")

+               ;; (:file "collections")

+               ;; (:file "collections-for")

+               ;; #+sbcl (:file "collections-sbcl-iterators")

                (:file "alimenta")  

                (:file "data-class")

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

 ;;;; alimenta.lisp

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

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

 (in-package #:alimenta)

@@ -33,11 +33,13 @@

   (:documentation "Given a lisp object representing a feed, return an xml

                    document"))

+(defgeneric content-el (entity)

+  (:documentation "Return the element that contains the item's content"))

+

 (defclass item (feed-entity)

   ((author :initarg :author :initform nil :accessor author)

    (content :initarg :content :initform nil :accessor content)

    (date :initarg :date :initform nil :accessor date)

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

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

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

@@ -97,6 +99,16 @@

             do (generate-xml item feed-type :partial result)))

     result))

+(defmethod -to-feed ((doc stream) doc-type &key feed-link)

+  (-to-feed (plump:parse doc)

+	    doc-type

+	    :feed-link feed-link))

+

+(defmethod -to-feed ((doc string) doc-type &key feed-link)

+  (-to-feed (plump:parse doc)

+	    doc-type

+	    :feed-link feed-link))

+    

 (defmethod -to-feed :around ((xml-dom plump:node) doc-type &key feed-link)

   "This wraps the particular methods so that _they_ don't have to implement

    item fetching.  NIL passed to the type activates auto-detection"

@@ -144,10 +156,9 @@

   (let ((root-node-name (make-keyword (string-upcase

                                         ($ (inline xml-dom) (children)

                                            (map #'tag-name) (node))))))

-    (setf type

-          (case root-node-name

-            ((:feed) :atom)

-            (t root-node-name)))))

+    (case root-node-name

+      ((:feed) :atom)

+      (t root-node-name))))

 (defgeneric get-random-item (feed)

   (:method ((feed feed))

@@ -117,10 +117,10 @@

   (list*

     'progn

     (loop for (name value &optional doc) in constants

-        collect `(defconstant ,name ,value ,doc))))

+        collect `(defconstant ,name ,value ,@(when doc (list doc))))))

 (defvar *defconstants-really-verbose* nil)

-(defmacro defconstants-really (&body constants)

+#+sbcl (defmacro defconstants-really (&body constants)

   "auto-invoke the continue restart . . ."

   `(handler-bind ((sb-ext:defconstant-uneql

                     (lambda (c)

@@ -132,6 +132,9 @@

                       (continue c))))

      (defconstants ,@constants)))

+#-sbcl (defmacro defconstants-really (&body constants)

+	 `(defconstants ,@constants))

+

 (defmethod generate-xml ((feed feed) (feed-type (eql :atom)) &key partial)

   (let ((feed-root (or ($1 (inline partial) "feed")

                     (plump:make-element (plump:make-root) "feed"))))

@@ -3,6 +3,7 @@

 (defmacro setup-libraries-for-feeds (&body body)

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

+	 (drakma:*drakma-default-external-format* :utf-8)

          (drakma:*text-content-types* 

            (pairlis '("application" "application")

                     '("atom+xml"    "rss+xml")

@@ -39,8 +40,10 @@

 (defun fetch-feed-from-url (url &key type)

   (setup-libraries-for-feeds

-    (let* ((feeds (alimenta.discover:discover-feed (drakma:http-request url :user-agent *user-agent*)))

-           (feeds (if type (remove-if-not (lambda (x) (eql type (car x))) feeds) feeds)))

+    (let* ((feeds (alimenta.discover:discover-feed (drakma:http-request url

+									:user-agent *user-agent*

+									:decode-content t)))

+	   (feeds (if type (remove-if-not (lambda (x) (eql type (car x))) feeds) feeds)))

       (if (not feeds) (no-feed url)

         (fetch-doc-from-url

           (cdar 

@@ -16,7 +16,7 @@

   (:export #:to-feed #:generate-xml #:feed #:title #:link #:items #:feed-link

            #:doc #:source-type #:id #:date #:content #:item #:description

            #:%generate-xml #:%to-feed #:get-items #:make-item #:complex-value

-           #:primary-value #:render #:author))

+           #:primary-value #:render #:author #:content-el))

 (defpackage #:alimenta.html

   (:use #:cl #:should-test #:lquery #:alexandria #:anaphora #:alimenta #:data-class

@@ -29,7 +29,7 @@

   (:export #:language #:copyright #:managing-editor #:webmaster

            #:publication-date #:last-build-date #:categories #:generator #:docs

            #:cloud #:ttl #:image #:rating #:text-input #:skip-hours #:skip-days

-           #:rss-feed #:rss-item))

+           #:rss-feed #:rss-item #:category #:domain))

 (defpackage #:alimenta.atom

   (:use #:cl #:should-test #:lquery #:plump #:alexandria #:anaphora #:alimenta))

@@ -1,7 +1,6 @@

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

 (in-package :alimenta.rss)

-

 (defclass rss-image ()

   ((url :initarg :url :initform nil)

    (title :initarg :title :initform nil)

@@ -11,8 +10,8 @@

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

 (defclass rss-category ()

-  ((category :initarg :category :initform nil)

-   (domain :initarg :domain :initform nil)))

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

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

 (define-data-class rss-feed (doc "channel") (feed)

   language copyright webmaster

@@ -36,7 +35,7 @@

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

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

-  source comments enclosure )

+  source comments enclosure description)

 (defmethod print-object ((self rss-image) stream)

   (print-unreadable-object (self stream :type t :identity t)

@@ -58,7 +57,6 @@

   (loop for char across str

         always (alpha-char-p char)))

-

 (defun extract-date-timezone (date-str)

   (declare (optimize (debug 3)))

   (let ((tz-inited nil))

@@ -179,6 +177,15 @@

          (attr "href" link)))

     xml-root))

+(defmethod content-el ((entity rss-item))

+  (fw.lu:let-each (:be *)

+    (doc entity)

+    ($1 (inline *)

+	(combine "> content::encoded"

+		 "> description"))

+    (or (elt (car *) 0)

+	(elt (cadr *) 0))))

+

 (defmethod make-item (xml-dom (type (eql :rss)))

   (let* ((*lquery-master-document* xml-dom)

          (item-title ($1 "> title" (text)))