@@ -5,10 +5,12 @@

   :description ""

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

   :license "MIT"

-  :depends-on (#:alexandria

-               #:uiop

-               #:serapeum

-               #:hunchentoot)

+  :depends-on (:alexandria

+               :uiop

+               :serapeum

+               :hunchentoot

+               :myway

+               :fwoar-lisputils)

   :serial t

   :components ((:file "package")

                (:file "araneus-2")))

@@ -1 +1,25 @@

 (in-package :araneus-2)

+

+(defgeneric mapper (acceptor)

+  (:documentation ""))

+

+(defclass acceptor (hunchentoot:acceptor)

+  ((%mapper :initform (myway:make-mapper) :reader mapper)))

+

+(defvar *current-route*)

+

+(defgeneric resolve-request (acceptor request)

+  (:method-combination or :most-specific-first)

+  (:method or ((acceptor acceptor) request)

+           (let ((router (mapper acceptor)))

+             (myway:dispatch router (hunchentoot:script-name*)

+                             :method (hunchentoot:request-method*)))))

+

+(defmethod hunchentoot:acceptor-dispatch-request ((acceptor acceptor) request)

+  (multiple-value-bind (result matched)

+      (resolve-request acceptor request)

+    (if matched

+        result

+        (call-next-method))))

+

+

@@ -1,3 +1,7 @@

 (defpackage :araneus-2

   (:use :cl :alexandria :serapeum :fwoar.lisputils)

-  (:export ))

+  (:export #:*current-route*

+           #:resolve-request

+           #:myway-acceptor

+           #:acceptor

+           #:mapper))