Merge from master.

technomancy · May 5, 2009 · c6e960e · c6e960e
2 parents c11f148 + d218e07
commit c6e960e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/clojure/http/client.clj b/src/clojure/http/client.clj
@@ -1,6 +1,6 @@
 (ns clojure.http.client
   (:use [clojure.contrib.java-utils :only [as-str]]
-        [clojure.contrib.duck-streams :only [read-lines]]
+        [clojure.contrib.duck-streams :only [read-lines writer]]
         [clojure.contrib.str-utils :only [str-join]])
   (:import (java.net URL HttpURLConnection URLEncoder)
            (java.io StringReader)))
@@ -15,6 +15,11 @@ representation of text."
   [text]
   (URLEncoder/encode text "UTF-8"))
 
+(defn- encode-body-map
+  "Turns a map into a URL-encoded string suitable for a request body."
+  [body]
+  (str-join "&" (map #(str-join "=" (map url-encode %)) body)))
+
 (defn url
   "If u is an instance of java.net.URL then returns it without
 modification, otherwise tries to instantiate a java.net.URL with
@@ -88,11 +93,10 @@ by a server."
                              "Content-Type"
                              "application/x-www-form-urlencoded")
         (.connect connection)
-        (.write (.getOutputStream connection)
+        (.write (writer (.getOutputStream connection))
                 (if (isa? body String)
                   body
-                  ;; TODO: keys/values need to be URL-encoded
-                  (str-join "&" (map #(str-join "=" %) body)))))
+                  (encode-body-map body))))
       (.connect connection))
 
     (let [headers (parse-headers connection)]

diff --git a/test/clojure/http/test/client.clj b/test/clojure/http/test/client.clj
@@ -11,7 +11,7 @@
 
 (defn response-headers
   ([headers]
-     (reduce #(conj %1 (str (first %2) ": " (second %2)))
+     (reduce #(conj %1 (str-join ":" %2))
              '("HTTP/1.1 200 OK"
                "Server: clojure-http-test-client"
                "Content-Type: text/plain")
@@ -46,4 +46,10 @@
 
 (deftest case-insensitive-headers
   (let [response (request (str "http://localhost:" test-port))]
-    (is (= "text/plain" ((:get-header response) "content-type")))))
+    (is (= "text/plain" ((:get-header response) "content-type")))))
+
+;; need echo response to work with body before this will work.
+;; (deftest request-body
+;;   (let [response (request (str "http://localhost:" test-port)
+;;                           :get {} {} {"hey" "düde"})]
+;;     (is (some #{"o=hai+dere&hey=d%C3%B6od"} (:body-seq response)))))