Extract shared request helpers in Wikipedia.API

lib/wikipedia/api.ex

@@ -8,16 +8,8 @@ defmodule Wikipedia.API do
   @spec get_wikipedia_title(String.t(), Wikipedia.Config.t()) ::
           {:ok, String.t() | nil} | {:error, term()}
   def get_wikipedia_title(wikidata_id, config) do
-    request =
+    case config
-      Req.new(
+         |> new_request("https://www.wikidata.org")
-        base_url: "https://www.wikidata.org",
-        max_retries: 1,
-        user_agent: config.user_agent
-      )
-      |> Req.Request.merge_options(config.req_options)
-      |> Req.RateLimiter.attach(name: :wikipedia, cooldown: config.api_cooldown)
-      |> Req.Request.append_request_steps(log_attempt: &log_attempt/1)
-      |> Req.Request.append_response_steps(log_error: &log_error/1)
          |> Req.merge(
            url: "/w/api.php",
            params: [
@@ -28,61 +20,32 @@ defmodule Wikipedia.API do
              format: "json"
            ]
          )
-
+         |> get_request() do
-    case Req.get(request) do
+      {:ok, body} ->
-      {:ok, response} when response.status == 200 ->
+        title = get_in(body, ["entities", wikidata_id, "sitelinks", "enwiki", "title"])
-        title =
-          get_in(response.body, ["entities", wikidata_id, "sitelinks", "enwiki", "title"])
-
         {:ok, title}
 
-      {:ok, response} ->
+      {:error, reason} ->
-        {:error, response.body}
+        {:error, reason}
-
-      error ->
-        error
     end
   end
 
   @spec get_article_summary(String.t(), Wikipedia.Config.t()) :: {:ok, map()} | {:error, term()}
   def get_article_summary(title, config) do
-    request =
+    case config
-      Req.new(
+         |> new_request("https://en.wikipedia.org")
-        base_url: "https://en.wikipedia.org",
-        max_retries: 1,
-        user_agent: config.user_agent
-      )
-      |> Req.Request.merge_options(config.req_options)
-      |> Req.RateLimiter.attach(name: :wikipedia, cooldown: config.api_cooldown)
-      |> Req.Request.append_request_steps(log_attempt: &log_attempt/1)
-      |> Req.Request.append_response_steps(log_error: &log_error/1)
          |> Req.merge(url: "/api/rest_v1/page/summary/#{URI.encode(title)}")
-
+         |> get_request() do
-    case Req.get(request) do
+      {:ok, body} -> {:ok, body}
-      {:ok, response} when response.status == 200 ->
+      {:error, reason} -> {:error, reason}
-        {:ok, response.body}
-
-      {:ok, response} ->
-        {:error, response.body}
-
-      error ->
-        error
     end
   end
 
   @spec get_article_extract(String.t(), Wikipedia.Config.t()) ::
           {:ok, String.t() | nil} | {:error, term()}
   def get_article_extract(title, config) do
-    request =
+    case config
-      Req.new(
+         |> new_request("https://en.wikipedia.org")
-        base_url: "https://en.wikipedia.org",
-        max_retries: 1,
-        user_agent: config.user_agent
-      )
-      |> Req.Request.merge_options(config.req_options)
-      |> Req.RateLimiter.attach(name: :wikipedia, cooldown: config.api_cooldown)
-      |> Req.Request.append_request_steps(log_attempt: &log_attempt/1)
-      |> Req.Request.append_response_steps(log_error: &log_error/1)
          |> Req.merge(
            url: "/w/api.php",
            params: [
@@ -93,11 +56,10 @@ defmodule Wikipedia.API do
              format: "json"
            ]
          )
-
+         |> get_request() do
-    case Req.get(request) do
+      {:ok, body} ->
-      {:ok, response} when response.status == 200 ->
         extract =
-          response.body
+          body
           |> get_in(["query", "pages"])
           |> Map.values()
           |> List.first()
@@ -105,6 +67,28 @@ defmodule Wikipedia.API do
 
         {:ok, extract}
 
+      {:error, reason} ->
+        {:error, reason}
+    end
+  end
+
+  defp new_request(config, base_url) do
+    Req.new(
+      base_url: base_url,
+      max_retries: 1,
+      user_agent: config.user_agent
+    )
+    |> Req.Request.merge_options(config.req_options)
+    |> Req.RateLimiter.attach(name: :wikipedia, cooldown: config.api_cooldown)
+    |> Req.Request.append_request_steps(log_attempt: &log_attempt/1)
+    |> Req.Request.append_response_steps(log_error: &log_error/1)
+  end
+
+  defp get_request(request) do
+    case Req.get(request) do
+      {:ok, response} when response.status == 200 ->
+        {:ok, response.body}
+
       {:ok, response} ->
         {:error, response.body}