Remove redunant qualifiers for req functions

Author: lpil

CHANGELOG.md

@@ -4,11 +4,11 @@
 
 - The `gleam/http` module gains the `Scheme`, `Service`, `Request`, and
   `Response` types, along with associated functions `scheme_to_string`,
-  `scheme_from_string`, `req_uri`, `response`, `req_segments`, `req_query`,
+  `scheme_from_string`, `req_uri`, `response`, `req_segments`, `get_query`,
   `get_req_header`, `get_resp_header`, `prepend_req_header`, `seq_req_host`,
-  `set_req_path`, `prepend_resp_header`, `set_req_method`, `set_req_body`,
+  `set_req_path`, `prepend_resp_header`, `set_method`, `set_req_body`,
   `set_resp_body`, `map_resp_body`, `map_req_body` `try_map_resp_body`,
-  `set_req_query`, `req_from_uri`, `default_req`, and `redirect`.
+  `set_query`, `req_from_uri`, `default_req`, and `redirect`.
 - Created the `gleam/http/middleware` module with the `Middleware` type and
   the `method_override`, `prepend_resp_header`, `map_resp_body` middleware
   functions.

src/gleam/http.gleam

@@ -191,7 +191,7 @@ pub fn req_segments(request: Request(body)) -> List(String) {
 }
 
 /// Decode the query of a request.
-pub fn req_query(
+pub fn get_query(
   request: Request(body),
 ) -> Result(List(tuple(String, String)), Nil) {
   case request.query {
@@ -200,6 +200,46 @@ pub fn req_query(
   }
 }
 
+// TODO: test
+// TODO: escape
+// TODO: record update syntax
+/// Set the query of the request.
+///
+pub fn set_query(
+  req: Request(body),
+  query: List(tuple(String, String)),
+) -> Request(body) {
+  let pair = fn(t: tuple(String, String)) {
+    string_builder.from_strings([t.0, "=", t.1])
+  }
+  let query = query
+    |> list.map(pair)
+    |> list.intersperse(string_builder.from_string("&"))
+    |> string_builder.concat
+    |> string_builder.to_string
+    |> Some
+  let Request(
+    method: method,
+    headers: headers,
+    body: body,
+    scheme: scheme,
+    host: host,
+    port: port,
+    path: path,
+    query: _,
+  ) = req
+  Request(
+    method: method,
+    headers: headers,
+    body: body,
+    scheme: scheme,
+    host: host,
+    port: port,
+    path: path,
+    query: query,
+  )
+}
+
 /// Get the value for a given header.
 ///
 /// If the request does not have that header then `Error(Nil)` is returned.
@@ -293,7 +333,7 @@ pub fn set_req_body(
 // TODO: record update syntax
 /// Set the method of the request.
 ///
-pub fn set_req_method(req: Request(body), method: Method) -> Request(body) {
+pub fn set_method(req: Request(body), method: Method) -> Request(body) {
   let Request(
     method: _,
     headers: headers,
@@ -433,43 +473,3 @@ pub fn set_req_path(req: Request(body), path: String) -> Request(body) {
     query: query,
   )
 }
-
-// TODO: test
-// TODO: escape
-// TODO: record update syntax
-/// Set the query of the request.
-///
-pub fn set_req_query(
-  req: Request(body),
-  query: List(tuple(String, String)),
-) -> Request(body) {
-  let pair = fn(t: tuple(String, String)) {
-    string_builder.from_strings([t.0, "=", t.1])
-  }
-  let query = query
-    |> list.map(pair)
-    |> list.intersperse(string_builder.from_string("&"))
-    |> string_builder.concat
-    |> string_builder.to_string
-    |> Some
-  let Request(
-    method: method,
-    headers: headers,
-    body: body,
-    scheme: scheme,
-    host: host,
-    port: port,
-    path: path,
-    query: _,
-  ) = req
-  Request(
-    method: method,
-    headers: headers,
-    body: body,
-    scheme: scheme,
-    host: host,
-    port: port,
-    path: path,
-    query: query,
-  )
-}

src/gleam/http/middleware.gleam

@@ -41,7 +41,7 @@ fn ensure_post(req: Request(a)) {
 }
 
 fn get_override_method(req) {
-  try query_params = http.req_query(req)
+  try query_params = http.get_query(req)
   try method = list.key_find(query_params, "_method")
   try method = http.parse_method(method)
   case method {
@@ -69,7 +69,7 @@ pub fn method_override(service: Service(req, resp)) -> Service(req, resp) {
     req
     |> ensure_post
     |> result.then(get_override_method)
-    |> result.map(http.set_req_method(req, _))
+    |> result.map(http.set_method(req, _))
     |> result.unwrap(req)
     |> service
   }

test/gleam/http/middleware_test.gleam

@@ -11,44 +11,44 @@ pub fn method_override_test() {
 
   // No overriding without the query param
   http.default_req()
-  |> http.set_req_method(Get)
+  |> http.set_method(Get)
   |> service
   |> should.equal(Response(200, [], Get))
 
   http.default_req()
-  |> http.set_req_method(Post)
+  |> http.set_method(Post)
   |> service
   |> should.equal(Response(200, [], Post))
 
   // Can override
   http.default_req()
-  |> http.set_req_method(Post)
-  |> http.set_req_query([tuple("_method", "DELETE")])
+  |> http.set_method(Post)
+  |> http.set_query([tuple("_method", "DELETE")])
   |> service
   |> should.equal(Response(200, [], Delete))
 
   http.default_req()
-  |> http.set_req_method(Post)
-  |> http.set_req_query([tuple("_method", "PATCH")])
+  |> http.set_method(Post)
+  |> http.set_query([tuple("_method", "PATCH")])
   |> service
   |> should.equal(Response(200, [], Patch))
 
   http.default_req()
-  |> http.set_req_method(Post)
-  |> http.set_req_query([tuple("_method", "PUT")])
+  |> http.set_method(Post)
+  |> http.set_query([tuple("_method", "PUT")])
   |> service
   |> should.equal(Response(200, [], Put))
 
   // Cannot override with other methods
   http.default_req()
-  |> http.set_req_method(Post)
-  |> http.set_req_query([tuple("_method", "OPTIONS")])
+  |> http.set_method(Post)
+  |> http.set_query([tuple("_method", "OPTIONS")])
   |> service
   |> should.equal(Response(200, [], Post))
 
   http.default_req()
-  |> http.set_req_method(Post)
-  |> http.set_req_query([tuple("_method", "SOMETHING")])
+  |> http.set_method(Post)
+  |> http.set_query([tuple("_method", "SOMETHING")])
   |> service
   |> should.equal(Response(200, [], Post))
 }

test/gleam/http_test.gleam

@@ -698,7 +698,7 @@ pub fn req_segments_test() {
   should.equal(["ellen", "ripley"], http.req_segments(request))
 }
 
-pub fn req_query_test() {
+pub fn get_query_test() {
   let make_request = fn(query) {
     http.Request(
       method: http.Get,
@@ -713,13 +713,13 @@ pub fn req_query_test() {
   }
 
   let request = make_request(Some("foo=x%20y"))
-  should.equal(Ok([tuple("foo", "x y")]), http.req_query(request))
+  should.equal(Ok([tuple("foo", "x y")]), http.get_query(request))
 
   let request = make_request(None)
-  should.equal(Ok([]), http.req_query(request))
+  should.equal(Ok([]), http.get_query(request))
 
   let request = make_request(Some("foo=%!2"))
-  should.equal(Error(Nil), http.req_query(request))
+  should.equal(Error(Nil), http.get_query(request))
 }
 
 pub fn get_resp_header_test() {