Merge branch 'master' of git://github.com/technomancy/clojure-http-client

Conflicts:
	src/clojure/http/client.clj

Author: danlarkin

.gitignore

@@ -1 +1,4 @@
-target
+target
+local.properties
+classes
+*.jar

README.markdown

@@ -21,7 +21,7 @@ more towards interactions with REST-based APIs.
     (resourcefully/put "http://localhost:5984/my-db/doc1" 
                         {} (json-str {:hello "world"}))
 
-    (resourcefully/with-cookies
+    (resourcefully/with-cookies {}
       (resourcefully/post "http://localhost:3000/login" 
                           {} {"user" user "password" password})
       (resourcefully/get "http://localhost:3000/my-secret-page))

build.xml

@@ -0,0 +1,53 @@
+<project name="saxon" default="jar">
+  <description>
+    Clojure HTTP Client.
+  </description>
+
+  <property name="build.dir" location="classes"/>
+  <property name="source.dir" location="src"/>
+  <property name="jar.name" location="clojure-http-client.jar"/>
+  <property file="local.properties"/>
+  <available property="hasclojure" file="${clojure.jar}"/>
+  <available property="hascontrib" file="${contrib.jar}"/>
+
+  <target name="checkforjars" depends="init">
+    <condition property="hasjars">
+      <and>
+        <isset property="hasclojure"/>
+        <isset property="hascontrib"/>
+      </and>
+    </condition>
+  </target>
+
+  <target name="clean" description="Remove generated classfiles">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <target name="init" depends="clean">
+    <tstamp/>
+    <mkdir dir="${build.dir}"/>
+  </target>
+
+  <target name="compile" depends="checkforjars" description="Compile sources" if="hasjars">
+    <java classname="clojure.lang.Compile">
+      <classpath>
+        <path location="${clojure.jar}"/>
+        <path location="${contrib.jar}"/>
+        <path location="${build.dir}"/>
+        <path location="${source.dir}"/>
+      </classpath>
+      <sysproperty key="clojure.compile.path" value="${build.dir}"/>
+      <arg value="clojure.http.client"/>
+      <arg value="clojure.http.resourcefully"/>
+    </java>
+  </target>
+
+  <target name="jar" description="Create jar file" depends="compile">
+    <jar jarfile="${jar.name}" index="true">
+      <path location="MIT.txt"/>
+      <fileset dir="${source.dir}" includes="**/*.clj"/>
+      <fileset dir="${build.dir}" includes="**/*.class"/>
+    </jar>
+  </target>
+
+</project>

src/clojure/http/client.clj

@@ -11,19 +11,11 @@
 
 (defn url-encode
   "Wrapper around java.net.URLEncoder returning a (UTF-8) URL encoded
-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 (fn [m]
-                   (str-join "="
-                             (map #(url-encode (as-str %))
-                                  m)))
-                 body)))
+representation of argument, either a string or map."
+  [arg]
+  (if (map? arg)
+    (str-join \& (map #(str-join \= (map url-encode %)) arg))
+    (URLEncoder/encode (as-str arg) "UTF-8")))
 
 (defn- send-body
   [body connection headers]
@@ -41,7 +33,7 @@ representation of text."
   (let [out (.getOutputStream connection)]
     (cond
       (string? body) (spit out body)
-      (map? body) (spit out (encode-body-map body))
+      (map? body) (spit out (url-encode body))
       (instance? InputStream body) (let [bytes (make-array Byte/TYPE 1000)]
                                      (loop [bytes-read (.read body bytes)]
                                        (when (pos? bytes-read)
@@ -71,22 +63,17 @@ or the error stream of connection, whichever is appropriate."
   "Returns a map of the response headers from connection."
   [connection]
   (let [hs (.getHeaderFields connection)]
-    (apply merge (map (fn [e] (when-let [k (key e)]
-                                {k (first (val e))}))
-                      hs))))
+    (into {} (for [[k v] hs :when k] [k (first v)]))))
 
 (defn- parse-cookies
   "Returns a map of cookies when given the Set-Cookie string sent
 by a server."
   [cookie-string]
   (when cookie-string
-    (apply merge
-           (map (fn [cookie]
-                  (apply hash-map
-                         (map (fn [c]
-                                (.trim c))
-                              (.split cookie "="))))
-                (.split cookie-string ";")))))
+    (into {}
+      (for [cookie (.split cookie-string ";")]
+        (let [keyval (map #(.trim %) (.split cookie "="))]
+          [(first keyval) (second keyval)])))))
 
 (defn- create-cookie-string
   "Returns a string suitable for sending to the server in the