Merge branch 'master' of github.com:hairyhum/cl-mvc

Conflicts:
	src/controller.lisp

src/controller.lisp

@@ -25,14 +25,18 @@
          (push package (default-controllers))
          (defparameter-in-package *mapper* package (default-mapper))
          (defun-in-package index package ())
+<<<<<<< HEAD
          (defun-in-package route-params package mvc::*route-params*)
+=======
+>>>>>>> ddc6527edba209d1d0b41e7451477946b94a3039
          (defparameter-in-package *default-action-name* package "index")
          (defparameter-in-package *filters* package (list :before nil :after nil :around nil))
          (defparameter-in-package *view-type* package ,(if view-type `',(cdr (assoc view-type *view-types*)) `*default-view-type*))
          ;(defparameter-in-package *view-name* package ,@(if view-name view-type *default-view-name*))
          (defparameter-in-package *view-layout* package ,(if view-layout view-layout))
          package))))
 (defparameter *default-controller* (defcontroller "Index"))
+<<<<<<< HEAD
 
 (defmacro with-controller-context (controller action bindings &body body)
   `(progn
@@ -50,6 +54,12 @@
   ;(let ((*package* controller))
   ;  (render-view (apply-with-filters action)))
   )
+=======
+(defun process-controller (controller action bindings)
+  (init-context controller action bindings)
+  (let ((*package* controller))
+    (render-view (apply-with-filters action))))
+>>>>>>> ddc6527edba209d1d0b41e7451477946b94a3039
 (defmacro make-view (&optional params &key name layout type)
   (let* ((view-type (or (cdr (assoc type *view-types*))
                         (cdr (assoc (get *action* :view-type) *view-types*))
@@ -73,6 +83,7 @@
   (defparameter-in-package *cookies-in* controller (hunchentoot:cookies-in*))
   (defparameter-in-package *cookies-out* controller (hunchentoot:cookies-out*))
   (defparameter-in-package *route-params* controller bindings))
+<<<<<<< HEAD
 
 (defun apply-with-filters (action)
   (let  ((*action* action))
@@ -83,6 +94,19 @@
         (apply-filters (get-filters *package* action :after))
         res))))
 
+=======
+(defun apply-with-filters (action)
+  (let  ((*action* action)
+          (around (get-filters *package* action :around))
+          (before (get-filters *package* action :before))
+          (after (get-filters *package* action :after)))
+    (flet ((apply-filters (filters) 
+             (mapcar #'funcall filters)))
+      (apply-filters before)
+      (let ((res (apply-around around))) 
+        (apply-filters after)
+        res))))
+>>>>>>> ddc6527edba209d1d0b41e7451477946b94a3039
 (defmethod apply-around ((around list))
   (let ((*around-list* (rest around))
         (current (first around)))

test/views/css/cupertino/.svn/all-wcprops

@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino
+END
+jquery-ui-1.8.13.custom.css
+K 25
+svn:wc:ra_dav:version-url
+V 91
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/jquery-ui-1.8.13.custom.css
+END

test/views/css/cupertino/.svn/entries

@@ -0,0 +1,65 @@
+10
+
+dir
+2
+http://lisp-mvc.unfuddle.com/svn/lisp-mvc_framework/todotree/views/css/cupertino
+http://lisp-mvc.unfuddle.com/svn/lisp-mvc_framework
+
+
+
+2011-06-10T16:28:28.115490Z
+2
+hairyhum
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac95b44f-471c-48cd-8414-b967058da7d4
+
+jquery-ui-1.8.13.custom.css
+file
+
+
+
+
+2011-06-01T07:59:44.000000Z
+91a3df8885aad587eb667aadd6ca8f2f
+2011-06-10T16:28:28.115490Z
+2
+hairyhum
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+34360
+
+images
+dir
+

test/views/css/cupertino/images/.svn/all-wcprops

@@ -0,0 +1,89 @@
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images
+END
+ui-icons_2e83ff_256x240.png
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-icons_2e83ff_256x240.png
+END
+ui-bg_highlight-hard_100_f2f5f7_1x100.png
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+END
+ui-bg_glass_100_e4f1fb_1x400.png
+K 25
+svn:wc:ra_dav:version-url
+V 103
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
+END
+ui-bg_glass_80_d7ebf9_1x400.png
+K 25
+svn:wc:ra_dav:version-url
+V 102
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
+END
+ui-icons_2694e8_256x240.png
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-icons_2694e8_256x240.png
+END
+ui-bg_flat_15_cd0a0a_40x100.png
+K 25
+svn:wc:ra_dav:version-url
+V 102
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
+END
+ui-icons_3d80b3_256x240.png
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-icons_3d80b3_256x240.png
+END
+ui-icons_ffffff_256x240.png
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-icons_ffffff_256x240.png
+END
+ui-bg_highlight-hard_70_000000_1x100.png
+K 25
+svn:wc:ra_dav:version-url
+V 111
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
+END
+ui-bg_highlight-soft_25_ffef8f_1x100.png
+K 25
+svn:wc:ra_dav:version-url
+V 111
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+END
+ui-bg_diagonals-thick_90_eeeeee_40x40.png
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+END
+ui-icons_72a7cf_256x240.png
+K 25
+svn:wc:ra_dav:version-url
+V 98
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-icons_72a7cf_256x240.png
+END
+ui-bg_glass_50_3baae3_1x400.png
+K 25
+svn:wc:ra_dav:version-url
+V 102
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
+END
+ui-bg_highlight-soft_100_deedf7_1x100.png
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/svn/lisp-mvc_framework/!svn/ver/2/todotree/views/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+END