Split out headers to reduce boilerplate.

oubiwann · Dec 9, 2013 · da92fcb · da92fcb
1 parent 5481c90
commit da92fcb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/lferax-http.lfe b/src/lferax-http.lfe
@@ -2,15 +2,23 @@
   (export all))
 
 
+(defun get-default-headers (content-type)
+  (list (tuple (: lferax-const content-type)
+               content-type)
+        (tuple (: lferax-const user-agent)
+               (: lferax-const user-agent-string))))
+
+(defun get-auth-headers (content-type auth-token)
+  (: lists merge (get-default-headers content-type)
+                 (list (tuple (: lferax-const x-auth-token)
+                              auth-token))))
+
 ; XXX all of these need to be refactored to reduce boilerplate
 (defun post (url payload)
   (: lferax-util start-services)
   (let* ((method 'post)
          (content-type '"application/json")
-         (headers (list (tuple (: lferax-const content-type)
-                               content-type)
-                        (tuple (: lferax-const user-agent)
-                               (: lferax-const user-agent-string))))
+         (headers (get-default-headers content-type))
          (request-data (tuple url headers content-type payload))
          (http-options ())
          (options ()))
@@ -20,12 +28,7 @@
   (: lferax-util start-services)
   (let* ((method 'post)
          (content-type '"application/json")
-         (headers (list (tuple (: lferax-const content-type)
-                               content-type)
-                        (tuple (: lferax-const x-auth-token)
-                               auth-token)
-                        (tuple (: lferax-const user-agent)
-                               (: lferax-const user-agent-string))))
+         (headers (get-auth-headers content-type auth-token))
          (request-data (tuple url headers content-type payload))
          (http-options ())
          (options ()))
@@ -36,12 +39,7 @@
   (let* ((method 'get)
          (content-type '"application/json")
          (payload '"")
-         (headers (list (tuple (: lferax-const content-type)
-                               content-type)
-                        (tuple (: lferax-const x-auth-token)
-                               auth-token)
-                        (tuple (: lferax-const user-agent)
-                               (: lferax-const user-agent-string))))
+         (headers (get-auth-headers content-type auth-token))
          (request-data (tuple url headers))
          (http-options ())
          (options ()))

diff --git a/test/lferax-http_tests.lfe b/test/lferax-http_tests.lfe
@@ -15,6 +15,20 @@
           (assert-exit 2))))
 
 
+(defun get-default-headers_test()
+  (let* ((result (: lferax-http get-default-headers '"my-content-type"))
+         (data-check (list_to_binary (element 2 (car result))))
+         (count (length result)))
+    (assert-equal '"my-content-type" `(binary_to_list ,data-check))
+    (assert-equal 2 count)))
+
+(defun get-auth-headers_test()
+  (let* ((result (: lferax-http get-auth-headers '"my-content-type" '"abc-tk"))
+         (data-check (list_to_binary (element 2 (: lists last result))))
+         (count (length result)))
+    (assert-equal '"abc-tk" `(binary_to_list ,data-check))
+    (assert-equal 3 count)))
+
 (defun get_test ()
   (: inets start)
   (: meck new 'httpc)