@@ -24,7 +24,7 @@

                ;; data model

                (:file "model" :depends-on ("package"))

-               (:file "protocol" :depends-on ("package" "model"))

+               (:file "protocol" :depends-on ("package" "model" "util"))

                (:file "repository" :depends-on ("package" "model"))

                (:file "tree" :depends-on ("package" "model" "protocol"))

                (:file "commit" :depends-on ("package" "model" "protocol"))

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

 (in-package :fwoar.cl-git)

-(defmacro defclass+ (name (&rest super) &body (direct-slots &rest options))

-  (let ((initargs (mapcan (lambda (slot)

-                            (serapeum:unsplice

-                             (make-symbol

-                              (symbol-name

-                               (getf (cdr slot)

-                                     :initarg)))))

-                          direct-slots)))

-    `(progn (defclass ,name ,super

-              ,direct-slots

-              ,@options)

-            (defun ,name (,@initargs)

-              (fw.lu:new ',name ,@initargs)))))

-

 (defclass delta ()

   ((%repository :initarg :repository :reader repository)

    (%base :initarg :base :reader base)

@@ -1,8 +1,11 @@

 (in-package :fwoar.cl-git)

+(defclass+ blob ()

+  ((%data :reader data :initarg :data)))

+

 (defgeneric -extract-object-of-type (type s repository &key &allow-other-keys)

   (:method ((type (eql :blob)) s repository &key)

-    s)

+    (blob s))

   (:method ((type (eql :tag)) s repository &key)

     s))

@@ -141,12 +141,13 @@

                         (fiveam:is (equal hash (fwoar.cl-git::ref-hash ref)))

                         (fiveam:is (equal *fake-repo* (fwoar.cl-git::ref-repo ref)))

                         (fwoar.cl-git::extract-object ref))))

-    (5am:is (typep object '(vector (unsigned-byte 8))))

+    (5am:is (typep object 'fwoar.cl-git::blob))

     (5am:is (equal "hello, world

 "

                    (babel:octets-to-string

-                    (fwoar.cl-git::extract-object

-                     (fwoar.cl-git::packed-ref

-                      :fwoar.cl-git.git-objects.pack

-                      "4b5fa63702dd96796042e92787f464e28f09f17d"))

+                    (fwoar.cl-git::data

+                     (fwoar.cl-git::extract-object

+                      (fwoar.cl-git::packed-ref

+                       :fwoar.cl-git.git-objects.pack

+                       "4b5fa63702dd96796042e92787f464e28f09f17d")))

                     :encoding :utf-8)))))

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

 (in-package :fwoar.cl-git)

+(defmacro defclass+ (name (&rest super) &body (direct-slots &rest options))

+  (let ((initargs (mapcan (lambda (slot)

+                            (serapeum:unsplice

+                             (make-symbol

+                              (symbol-name

+                               (getf (cdr slot)

+                                     :initarg)))))

+                          direct-slots)))

+    `(progn (defclass ,name ,super

+              ,direct-slots

+              ,@options)

+            (defun ,name (,@initargs)

+              (fw.lu:new ',name ,@initargs)))))

+

 (fw.lu:defun-ct batch-4 (bytes)

   (mapcar 'fwoar.bin-parser:be->int

           (serapeum:batches bytes 4)))

@@ -31,7 +45,7 @@

 (defun partition (char string &key from-end (with-offset nil wo-p))

   (let ((pos (position char string :from-end from-end)))

     (if pos

-        (if wo-p 

+        (if wo-p

             (list (subseq string 0 (+ pos with-offset 1))

                   (subseq string (+ pos 1 with-offset)))

             (list (subseq string 0 pos)