Add test for keyword or string as :scheme

Author: dakrone

changelog.org

@@ -74,6 +74,10 @@
 * Work log
   Log of merges/issues/work that's gone in so I know what to put in
   the changelog for the next release
+** 2012-02-05
+   - merged https://github.com/dakrone/clj-http/pull/42 to allow
+     strings or keywords for :scheme in requests
+   - added test for different :schemes
 ** Release 0.3.1
 ** 2012-02-03
    - merged https://github.com/dakrone/clj-http/pull/40 to allow

src/clj_http/core.clj

@@ -114,11 +114,11 @@
 
 (defn- default-proxy-host-for
   [scheme]
-  (System/getProperty (str (name scheme) ".proxyHost")))
+  (System/getProperty (str scheme ".proxyHost")))
 
 (defn- default-proxy-port-for
   [scheme]
-  (Integer/parseInt (System/getProperty (str (name scheme) ".proxyPort"))))
+  (Integer/parseInt (System/getProperty (str scheme ".proxyPort"))))
 
 (defn add-client-params!
   "Add various client params to the http-client object, if needed."
@@ -169,10 +169,11 @@
            proxy-port as] :as req}]
   (let [conn-mgr (or *connection-manager* (make-regular-conn-manager insecure?))
         http-client (DefaultHttpClient.
-                      ^org.apache.http.conn.ClientConnectionManager conn-mgr)]
+                      ^org.apache.http.conn.ClientConnectionManager conn-mgr)
+        scheme (name scheme)]
     (add-client-params! http-client scheme socket-timeout
                         conn-timeout server-name proxy-host proxy-port)
-    (let [http-url (str (name scheme) "://" server-name
+    (let [http-url (str scheme "://" server-name
                         (when server-port (str ":" server-port))
                         uri
                         (when query-string (str "?" query-string)))

test/clj_http/test/client.clj

@@ -14,9 +14,16 @@
 (deftest ^{:integration true} roundtrip
   (run-server)
   (Thread/sleep 1000)
+  ;; roundtrip with scheme as a keyword
   (let [resp (client/request (merge base-req {:uri "/get" :method :get}))]
     (is (= 200 (:status resp)))
     (is (= "close" (get-in resp [:headers "connection"])))
+    (is (= "get" (:body resp))))
+  ;; roundtrip with scheme as a string
+  (let [resp (client/request (merge base-req {:uri "/get" :method :get
+                                              :scheme "http"}))]
+    (is (= 200 (:status resp)))
+    (is (= "close" (get-in resp [:headers "connection"])))
     (is (= "get" (:body resp)))))
 
 (defn is-passed [middleware req]
@@ -39,6 +46,7 @@
     (is (= 200 (:status resp)))
     (is (= :get (:request-method (:req resp))))
     (is (= :http (:scheme (:req resp))))
+
     (is (= "/bat" (:uri (:req resp))))))
 
 (deftest redirect-to-get-on-head