@@ -11,8 +11,14 @@

 (defgeneric belongs-to (feed-entity)

   (:documentation "Returns the person responsible for this feed item"))

+(define-condition feed-type-unsupported (error)

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

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

+

 (defgeneric -to-feed (doc type &key feed-link)

-  (:documentation "Given an xml-document, return a feed object"))

+  (:documentation "Given an xml-document, return a feed object")

+  (:method (doc type &key feed-link)

+    (error 'feed-type-unsupported :type type :feed-link feed-link)))

 (defgeneric render (object renderer)

   (:documentation "Given a lisp object representing a feed, return it rendered

@@ -211,6 +217,12 @@

     (push-item feed it)

     (values feed it)))

+(defun filter-feed (feed function &key key)

+  (setf (items feed)

+	(remove-if-not function (items feed)

+		       :key key))

+  feed)

+

 (defun shorten-link (link)

   (let ((link (cl-ppcre:regex-replace "^https?:" link "")))

     (subseq link 0 (min 30 (length link)))))

@@ -13,10 +13,11 @@

 (defpackage #:alimenta

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

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

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

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

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

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

+           #:primary-value #:render #:author #:content-el #:feed-type-unsupported

+	   #:pop-token #:filter-feed))

 (defpackage #:alimenta.html

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

@@ -41,7 +42,8 @@

 (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)) 

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

+	   #:skip-feed)) 

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

   (asdf:load-system :alimenta)

@@ -144,15 +144,15 @@

   (prog1 partial

     (let ((item-root (make-element ($1 (inline partial) "channel") "item")))

       (flet ((make-element (tag) (make-element item-root tag)))

-        (with-slots (title id date link content) item

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

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

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

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

-          (plump-dom:set-attribute

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

-            "isPermaLink"

-            "false"))))))

+	(with-slots (title id date link content) item

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

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

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

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

+	  (plump-dom:set-attribute

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

+	   "isPermaLink"

+	   "false"))))))

 (defmethod generate-xml ((feed feed) (feed-type (eql :rss)) &rest r)

   (declare (ignore r))