@@ -20,16 +20,15 @@

                #:split-sequence)

   :serial t

   :components ((:file "package")

-               (:file "alimenta")  

+               (:file "alimenta")

                (:file "data-class")

-               (:file "date-handling")

                (:file "render-protocol")

-               (:file "atom")  

-               (:file "rss")  

+               (:file "atom")

+               (:file "rss")

                (:file "fetching")

                (:file "discovery")))

-(defsystem :alimenta/patmatch 

+(defsystem :alimenta/patmatch

   :description ""

   :author "Ed L <edward@elangley.org>"

   :license "MIT"

deleted file mode 100644

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

-(in-package :collection-class)

-

-(defmethod for:has-more ((iterator collection-iterator))

-  (not (null (for:object iterator))))

-

-(defmethod for:next ((iterator collection-iterator))

-  (let ((collection-items (for:object iterator)))

-    (prog1 (car collection-items)

-      (setf (for:object iterator)

-            (cdr collection-items)))))

-

-(defmethod for:make-iterator ((collection collection) &key)

-  (make-instance 'collection-iterator :object collection))

-

-

deleted file mode 100644

@@ -1,64 +0,0 @@

-(in-package :collection-class)

-

-#+nil

-(defmethod sequence:length ((sequence collection))

-  (length (items sequence)))

-

-#+sbcl

-(defmethod sb-sequence:length ((sequence collection))

-  (length (items sequence)))

-

-#+nil

-(defmethod sequence:elt ((sequence collection) index)

-  (elt (items sequence) index))

-

-#+sbcl

-(defmethod sb-sequence:elt ((sequence collection) index)

-  (elt (items sequence) index))

-

-#+nil

-(defmethod (setf sequence:elt) (new-value (sequence collection) index)

-  (setf (elt (items sequence) index) new-value))

-

-#+sbcl

-(defmethod (setf sb-sequence:elt) (new-value (sequence collection) index)

-  (setf (elt (items sequence) index) new-value))

-

-#+nil

-(defmethod sequence:adjust-sequence ((sequence collection) length &key initial-element initial-contents)

-  (let ((result (duplicate-collection sequence)))

-    (when (or initial-element initial-contents)

-      (setf (items result)

-            (sequence:adjust-sequence (items result) length

-                                      :initial-element initial-element

-                                      :initial-contents initial-contents)))

-    result))

-

-#+sbcl

-(defmethod sb-sequence:adjust-sequence ((sequence collection) length &key initial-element initial-contents)

-  (let ((result (duplicate-collection sequence)))

-    (when (or initial-element initial-contents)

-      (setf (items result)

-            (sb-sequence:adjust-sequence (items result) length

-                                         :initial-element initial-element

-                                         :initial-contents initial-contents)))

-    result))

-

-#+nil

-(defmethod sequence:make-sequence-like ((sequence collection) length &key initial-element initial-contents)

-  (let ((result (duplicate-collection sequence)))

-    (setf (items result)

-          (sequence:make-sequence-like (items result) length

-                                       :initial-element initial-element

-                                       :initial-contents initial-contents))

-    result))

-

-#+sbcl

-(defmethod sb-sequence:make-sequence-like ((sequence collection) length &key initial-element initial-contents)

-  (let ((result (duplicate-collection sequence)))

-    (setf (items result)

-          (sb-sequence:make-sequence-like (items result) length

-                                          :initial-element initial-element

-                                          :initial-contents initial-contents))

-    result))

-

deleted file mode 100644

@@ -1,68 +0,0 @@

-(in-package :collection-class)

-

-(defclass collection (standard-object #+sbcl sequence)

-  ())

-

-(define-condition value-error ()

-  ((value :initarg :value :accessor value)))

-

-(defgeneric push-item (collection item)

-  (:documentation "Push item onto the beginning of the collection"))

-

-(defgeneric items (collection)

-  (:documentation "Get the items from a collection"))

-

-(defgeneric duplicate-collection (collection))

-

-(defgeneric copy-instance (object &rest initargs &key &allow-other-keys)

-  (:documentation "Makes and returns a shallow copy of OBJECT.

-

-                   An uninitialized object of the same class as OBJECT is allocated by

-                   calling ALLOCATE-INSTANCE.  For all slots returned by

-                   CLASS-SLOTS, the returned object has the

-                   same slot values and slot-unbound status as OBJECT.

-

-                   REINITIALIZE-INSTANCE is called to update the copy with INITARGS.")

-  (:method ((object standard-object) &rest initargs &key &allow-other-keys)

-   (let* ((class (class-of object))

-          (copy (allocate-instance class)))

-     (dolist (slot-name (mapcar #'closer-mop:slot-definition-name (closer-mop:class-slots class)))

-       (when (slot-boundp object slot-name)

-         (setf (slot-value copy slot-name)

-               (slot-value object slot-name))))

-     (apply #'reinitialize-instance copy initargs))))

-

-

-; TODO: actually use item-class...

-; TODO: finish initform handling.  Have to figure out how to make initform work with push-item

-(defmacro define-collection ((name item-class &key (initform '(list))) (&rest supers) &body ((&rest slots) &rest other-stuff))

-  (with-gensyms (item-slot-sym)

-    `(progn (defclass ,name (,@supers collection)

-              ((,item-slot-sym :initform ,initform :accessor items)

-               ,@slots)

-              ,@other-stuff)

-            (defmethod duplicate-collection ((collection ,name))

-              (let ((result (copy-instance collection)))

-                (setf (items result)

-                      (copy-seq (items result)))

-                result))

-            (defmethod push-item ((collection ,name) (item ,item-class))

-              (push item (items collection))))))

-

-(defclass collection-iterator (for:iterator)

-  ())

-

-(defmethod initialize-instance :after ((iterator collection-iterator) &key object)

-  (setf (for:object iterator)

-        (items object)))

-

-(defmethod random-item ((collection collection) &optional (random-state *random-state*))

-  (let* ((length (length (items collection)))

-         (selected-index (random length random-state)))

-    (elt (items collection)

-         selected-index)))

-

-(defmethod nth-item ((collection collection) (index integer))

-  (if (>= index 0)

-    (elt (items collection) index)

-    (error 'value-error :value index)))

deleted file mode 100644

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

 ;;;; package.lisp

-(defpackage #:collection-class

-  (:use #:cl #:alexandria #:serapeum)

-  (:export collection value-error push-item define-collection random-item nth-item items))

-

 (defpackage :alimenta.render

   (:use :cl )

   (:export #:render-feed #:render-item #:add-rendered-item))

@@ -46,12 +42,7 @@

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

-

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

-  (asdf:load-system :alimenta)

-  (st:test :package :alimenta)

-  t)

+	         #:skip-feed))

 (defpackage #:alimenta.test-runner

   (:use #:cl #:alimenta #:alimenta.atom #:alimenta.discover #:alimenta.pull-feed))