@@ -30,7 +30,10 @@ install:

     else

       curl https://raw.githubusercontent.com/luismbo/cl-travis/master/install.sh | sh;

     fi     

-  - 'pushd $HOME/quicklisp/local-projects && git clone http://git.elangley.org/git/u/edwlan/fwoar.lisputils.git && git clone http://git.elangley.org/git/u/edwlan/vector-update-stream.git; popd'

+  - 'pushd $HOME/quicklisp/local-projects &&

+     git clone http://git.elangley.org/git/u/edwlan/fwoar.lisputils.git &&

+     git clone http://git.elangley.org/git/u/edwlan/vector-update-stream.git;

+     popd'

 # this serves as an example of how to use the 'cl' script (provided by

 # CIM) to test your Lisp project. Here, we're using the RT framework

@@ -1,13 +1,14 @@

 (fwoar.sp-user:define-package :stream-provider

   (:use :fw.lu)

   (:export #:get-stream-for

-	   #:stream-provider

-	   #:string-provider

-	   #:file-provider

-	   #:stream-key

-	   #:root

-	   #:streams

-	   #:with-storage-stream))

+           #:stream-provider

+           #:string-provider

+           #:file-provider

+           #:stream-key

+           #:root

+           #:streams

+           #:with-storage-stream

+           #:get-nested-provider))

 (cl:in-package :stream-provider)

 (defclass stream-provider ()

@@ -23,6 +24,9 @@ If you override on provider, make sure to CALL-NEXT-METHOD"))

 (defgeneric get-stream-for (provider streamable &rest extra-args)

   (:documentation "get a stream for a given streamable object"))

+(defgeneric get-nested-provider (provider streamable)

+  (:documentation "implement to handle storage of hierarchical data"))

+

 (defgeneric root (provider)

   (:documentation "get the base path for the streams"))

@@ -34,19 +38,31 @@ If you override on provider, make sure to CALL-NEXT-METHOD"))

   #p "/")

 (defmethod stream-key :around (provider item)

+  (declare (optimize (debug 3)))

   (let ((key (call-next-method)))

-    (check-type key (or string pathname))

-    (uiop:enough-pathname key (root provider))))

+    (check-type key (or cons string pathname))

+    (let ((the-pathname

+           (ctypecase key

+             (pathname key)

+             (string (pathname key))

+             (cons (uiop:merge-pathnames*

+                    (car (last key))

+                    (apply 'path-join

+                           (mapcar 'uiop:ensure-directory-pathname

+                                   (butlast key))))))))

+      (uiop:enough-pathname the-pathname

+                            (root provider)))))

+

 (defmethod get-stream-for ((provider string-provider) streamable &rest extra-args)

   (declare (ignore extra-args))

   (with-accessors* (streams) provider

     (vector-update-stream:make-update-stream 

      (setf (gethash (stream-key provider streamable) streams)

-	   (make-array 10

-		       :element-type 'octet

-		       :adjustable t

-		       :fill-pointer 0)))))

+           (make-array 10

+                       :element-type 'octet

+                       :adjustable t

+                       :fill-pointer 0)))))

 (defclass file-provider (stream-provider)

   ((%root :initarg :root :initform (error "need a root for a file-provider") :reader root)

@@ -56,15 +72,15 @@ If you override on provider, make sure to CALL-NEXT-METHOD"))

   (declare (ignore extra-args))

   (with-accessors* (if-exists root) provider

     (let ((stream-key (merge-pathnames (stream-key provider streamable)

-				       root)))

+                                       root)))

       (when (eql if-exists :if-exists)

-	(ensure-directories-exist stream-key))

+        (ensure-directories-exist stream-key))

       (open stream-key :direction :output :if-exists if-exists

-	    :element-type 'octet))))

+            :element-type 'octet))))

 (defmacro with-storage-stream ((stream-sym object provider &rest extra-args) &body body)

   (once-only (object)

     `(let ((,stream-sym (flexi-streams:make-flexi-stream (get-stream-for ,provider ,object ,@extra-args)

-							 :external-format :utf-8)))

+                                                         :external-format :utf-8)))

        (unwind-protect (progn ,@body)

-	 (close ,stream-sym)))))

+         (close ,stream-sym)))))