diff --git a/README.md b/README.md index 15aeb70..6a34ac3 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Keyword params changes the input parameters from string-based to keyword based. {"name" "Hello world"} ; params without keyword-params {:name "Hello world"} ; params with keyword-params -#### destructuring syntax #### +#### destructuring syntax #### The routes have a [startling new syntax][9]: diff --git a/project.clj b/project.clj index 9de53de..2748192 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ (defproject compojure-cookies-example "1.0.0-SNAPSHOT" - :main example0 + :main example3 :description "Idiomatic usage of Compojure using sessionless cookies." :dependencies [[org.clojure/clojure "1.2.0"] [org.clojure/clojure-contrib "1.2.0"] diff --git a/src/example0.clj b/src/example0.clj index c1c56f1..569b2ed 100644 --- a/src/example0.clj +++ b/src/example0.clj @@ -8,7 +8,7 @@ (defn main-page [cookies] (str "Hi there " (if (empty? (:value (cookies "name"))) - "
What's your name?
" + "
What's your name?
" (:value (cookies "name"))))) (defn process-form [params cookies] @@ -27,6 +27,6 @@ (def app (-> #'routes wrap-cookies wrap-keyword-params wrap-params)) (defn -main [] - (run-jetty routes {:port (if (nil? (System/getenv "PORT")) - 8000 ; localhost or heroku? - (Integer/parseInt (System/getenv "PORT")))}) ) + (run-jetty app {:port (if (nil? (System/getenv "PORT")) + 8000 ; localhost or heroku? + (Integer/parseInt (System/getenv "PORT")))}) ) diff --git a/src/example2.clj b/src/example2.clj index 372d00f..4ea6b31 100644 --- a/src/example2.clj +++ b/src/example2.clj @@ -5,9 +5,9 @@ (defroutes routes (POST "/" [name] (str "Thanks " name)) - (GET "/" [] "
What's your name?
")) + (GET "/" [] "
What's your name?
")) -(def app (-> #'routes wrap-params)) +(def app (wrap-params routes)) (defn -main [] (run-jetty app {:port (if (nil? (System/getenv "PORT")) diff --git a/src/example3.clj b/src/example3.clj index 125bf3f..62c4635 100644 --- a/src/example3.clj +++ b/src/example3.clj @@ -5,11 +5,10 @@ [ring.middleware.params :only [wrap-params]] [ring.middleware.keyword-params :only [wrap-keyword-params]])) -(defn main-page [cookies uri] - (println "URI: " uri) +(defn main-page [cookies] (str "Hi there " (if (empty? (:value (cookies "name"))) - "
What's your name?
" + "
What's your name?
" (:value (cookies "name"))))) (defn process-form [params cookies] @@ -23,7 +22,7 @@ (defroutes routes (POST "/" {params :params cookies :cookies} (process-form params cookies)) - (GET "/" {cookies :cookies uri :headers} (main-page cookies uri))) + (GET "/" {cookies :cookies} (main-page cookies))) (def app (-> #'routes wrap-cookies wrap-keyword-params wrap-params))