Skip to content
Sign up
This repository

public / clojure-http-client Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Make the caller add query params to the URL instead of doing it in re… 

…quest.
  • Loading branch information...
commit 39dda131f998bbda7d081574ff09c478308b9cc8 1 parent 677a48d
Phil Hagelberg authored

Showing 3 changed files with 17 additions and 16 deletions. Show Diff Stats Hide Diff Stats

  1. 10  README.markdown
  2. 16  src/clojure_http/client.clj
  3. 7  src/clojure_http/resourcefully.clj
10  README.markdown
Source Rendered
View 
@@ -22,17 +22,17 @@ more towards interactions with REST-based APIs.
22 22 
       (:body-seq response)) ;; ("<html><head><meta[...]" ...
23 23
24 24 
     (resourcefully/put "http://localhost:5984/my-db/doc1"
25   
-                      {} {} (json-str {:hello "world"}))
  25 
+                      {} (json-str {:hello "world"}))
26 26
27 27 
     (res/with-cookies {}
28 28 
       (res/post "http://localhost:3000/login"
29   
-                {} {} {"user" user "password" password})
  29 
+                {} {"user" user "password" password})
30 30 
       (res/get "http://localhost:3000/my-secret-page))
31 31
32 32 
 The request function requires a URL and optionally accepts a method
33   
-(GET by default), a map of headers, a map of cookies, a map of query
34   
-parameters, and a request body. The resourcefully functions take a URL,
35   
-an optional headers map, and an optional body.
  33 
+(GET by default), a map of headers, a map of cookies, and a request
  34 
+body. The resourcefully functions take a URL, an optional headers map,
  35 
+and an optional body.
36 36
37 37 
 Request bodies may be strings, maps, or InputStreams. Strings get sent
38 38 
 verbatim. Maps get sent as application/x-www-form-urlencoded, and
16  src/clojure_http/client.clj
View 
@@ -105,19 +105,21 @@ by a server."
105 105 
                              #^String (as-str (val cookie))))
106 106 
                       cookie-map)))
107 107
108   
-(defn- queryify
109   
-  "Takes a map of query parameters and turns them into a query string."
110   
-  [url query-map]
111   
-  (if (seq query-map)
112   
-    (apply str url "?" (interpose "&" (for [[k v] query-map] (str (url-encode k) "=" (url-encode v)))))
  108 
+(defn add-query-params
  109 
+  "Takes a URL and query params and returns a URL with query params attached."
  110 
+  [url & query-params]
  111 
+  (if (seq query-params)
  112 
+    (apply str url "?"
  113 
+           (interpose "&" (for [[k v] query-params]
  114 
+                            (str (url-encode k) "=" (url-encode v)))))
113 115 
     url))
114 116
115 117 
 (defn request
116 118 
   "Perform an HTTP request on URL u."
117   
-  [u & [method headers cookies querys body]]
  119 
+  [u & [method headers cookies body]]
118 120 
   ;; This function *should* throw an exception on non-HTTP URLs.
119 121 
   ;; This will happen if the cast fails.
120   
-  (let [u (url (queryify u querys))
  122 
+  (let [u (url u)
121 123 
         #^HttpURLConnection connection
122 124 
         (cast HttpURLConnection (.openConnection u))
123 125 
         method (.toUpperCase #^String (as-str (or method
7  src/clojure_http/resourcefully.clj
View 
@@ -36,13 +36,12 @@
36 36 
 (defmacro define-method
37 37 
   [method]
38 38 
   `(defn ~method
39   
-     ~(str "Perform HTTP " method " request to url u with specified headers
40   
-and query map. Cookies will be saved if inside with-cookies block.")
41   
-     [u# & [headers# querys# body#]]
  39 
+     ~(str "Perform HTTP " method " request to url u with specified headers.
  40 
+Cookies will be saved if inside with-cookies block.")
  41 
+     [u# & [headers# body#]]
42 42 
      (let [response# (save-cookies (client/request u# ~(str method)
43 43 
                                                    headers# (if *cookies*
44 44 
                                                               @*cookies*)
45   
-						   querys#
46 45 
                                                    body#))]
47 46 
        (if (error? response#)
48 47 
          (throw (java.io.IOException. (error-message response#)))

0 notes on commit 39dda13

Please sign in to comment.
Something went wrong with that request. Please try again.