section 8 video 1

Author: tlipski

project.clj

@@ -15,6 +15,7 @@
 		 [korma "0.3.0-RC6"]
 		 [com.novemberain/monger "1.7.0"]
 		 [cheshire "5.1.1"]
-   	         [ring "1.2.0"]]
+   	         [ring "1.2.0"]
+  		 [compojure "1.1.6"]]
   :cljsbuild {:builds [{:source-paths ["cljs"] 
   			:compiler {:output-to "resources/public/app.js"}}]})

src/project1/blog.clj

@@ -76,11 +76,11 @@
 (def blog-handler 
  (->
   (route/routing
-   (route/with-route-matches :get "/entries" get-handler)
-   (route/with-route-matches :post "/entries" post-handler)
-   (route/with-route-matches :get "/entries/:id" get-entry-handler)
-   (route/with-route-matches :put "/entries/:id" put-handler)
-   (route/with-route-matches :delete "/entries/:id" delete-handler))
+   (route/with-route-matches :get "/" get-handler)
+   (route/with-route-matches :post "/" post-handler)
+   (route/with-route-matches :get "/:id" get-entry-handler)
+   (route/with-route-matches :put "/:id" put-handler)
+   (route/with-route-matches :delete "/:id" delete-handler))
   json-error-handler
 ))
 

src/project1/core.clj

@@ -8,6 +8,7 @@
 	   [ring.middleware.cookies]
 	   [ring.middleware.session]
 	   [ring.middleware.session.memory]
+  	   [compojure.core :as compojure]
   	   [project1.html :as html]
 	   [project1.route :as route]
 	   [project1.blog :as blog]
@@ -84,11 +85,11 @@
  {:body "Logged out."
   :session nil})
 
-(defn form-handler [request]
+(defn form-handler [login request]
  {:status 200
   :headers {"Content-type" "text/html"}
-  :cookies {:username (:login (:params request))}
-  :session {:username (:login (:params request))
+  :cookies {:username login}
+  :session {:username  login
 	    :cnt (inc (or (:cnt (:session request)) 0))}
   :body (layout
     	 [:div
@@ -104,18 +105,18 @@
 	[:b (when-let [f (get-in request [:params :file :tempfile])]
   		(.getAbsolutePath f))]])})
 
-(def route-handler 
- (route/routing
-   blog/blog-handler
-   (route/with-route-matches :get "/test1" test1-handler)
-   (route/with-route-matches :get "/test1/:id" test1-handler)
-   (route/with-route-matches :get "/test2" test2-handler)
-   (route/with-route-matches :get "/test3" handlers/handler3)
-   (route/with-route-matches :get "/form" form-handler)
-   (route/with-route-matches :post "/form" form-handler)
-   (route/with-route-matches :get "/cookies" cookie-handler)
-   (route/with-route-matches :get "/session" session-handler)
-   (route/with-route-matches :get "/logout" logout-handler)))
+(compojure/defroutes route-handler 
+  (compojure/context "/entries" [] 
+	blog/blog-handler)
+  (compojure/GET "/test1" [:as request] (test1-handler request))
+  (compojure/GET "/test1/:id" [id :as request] (test1-handler request))
+  (compojure/GET "/test2" [id :as request] (test2-handler request))
+  (compojure/GET "/test3" [id :as request] (handlers/handler3 request))
+  (compojure/ANY "/form" [login :as request] (form-handler login request))
+  (compojure/GET "/cookies" [:as request] (cookie-handler request))
+  (compojure/GET "/session" [:as request] (session-handler request))
+  (compojure/GET "/logout" [:as request] (logout-handler request))
+   )
 
 (defn wrapping-handler [request]
  (try

src/project1/route.clj

@@ -3,7 +3,7 @@
 (defn route-matches [verb path-spec request]
  (when (= (:request-method request) verb)
   (let [path-regex (.replaceAll path-spec "/:([^/]+)" "/([^/]+)")
-   	path-matches (re-matches (re-pattern path-regex) (:uri request))]
+   	path-matches (re-matches (re-pattern path-regex) (:path-info request))]
 	(println "Path regex for" path-spec "is" path-regex
 		 "match result:" path-matches)
 	(when path-matches