Refactor query module

Break-up processing bits to add tests

2 files changed, 45 insertions, 27 deletions

diff --git a/lib/ex_prometheus_io.ex b/lib/ex_prometheus_io.ex
index cac39a5..dd47bee 100644
--- a/lib/ex_prometheus_io.ex
+++ b/lib/ex_prometheus_io.ex
@@ -7,25 +7,25 @@ defmodule ExPrometheusIo do
 
   def query(query, _opts \\ []) do
     query_opts = [query]
-    spawn_query(:fetch_query, query_opts)
+    spawn_query(:query, query_opts)
   end
 
   def range(query, start_ts, end_ts, step, _opts \\ []) do
     query_opts = [query, start_ts, end_ts, step]
-    spawn_query(:fetch_range, query_opts)
+    spawn_query(:range, query_opts)
   end
 
   def series(matches, _opts \\ []) do
-    spawn_query(:fetch_series, [matches])
+    spawn_query(:series, [matches])
   end
 
-  defp spawn_query(fetch, query_opts, _opts \\ []) do
+  defp spawn_query(query, query_opts, _opts \\ []) do
     query_ref = make_ref()
-    query_opts = query_opts ++ [query_ref, self()]
+    query_opts = [query | query_opts] ++ [query_ref, self()]
     {:ok, pid} = Task.Supervisor.start_child(
       ExPrometheusIo.QuerySupervisor,
       ExPrometheusIo.Query,
-      fetch,
+      :process,
       query_opts)
     {pid, query_ref}
   end
diff --git a/lib/ex_prometheus_io/query.ex b/lib/ex_prometheus_io/query.ex
index 2bba7bd..140d0a9 100644
--- a/lib/ex_prometheus_io/query.ex
+++ b/lib/ex_prometheus_io/query.ex
@@ -1,41 +1,59 @@
 defmodule ExPrometheusIo.Query do
 
-  def fetch_query(query_str, query_ref, owner) do
-    "query=#{query_str}" <> "&time=#{:os.system_time(:seconds)}"
-    |> fetch_json("query")
+  def process(:query, query, query_ref, owner) do
+    build_url(:query, query)
+    |> fetch_json()
     |> Poison.decode
     |> send_results(query_ref, owner)
   end
 
-  def fetch_range(query_str, start_ts, end_ts, step, query_ref, owner) do
-    "query=#{query_str}"
-    <> "&start=#{start_ts}"
-    <> "&end=#{end_ts}"
-    <> "&step=#{step}"
-    |> fetch_json("query_range")
+  def process(:range, query, start_ts, end_ts, step, query_ref, owner) do
+    build_url(:range, {query, start_ts, end_ts, step})
+    |> fetch_json()
     |> Poison.decode
     |> send_results(query_ref, owner)
   end
 
-  def fetch_series(matches, query_ref, owner) do
-    matches
-    |> Enum.map(fn(match) -> "match[]=#{match}" end)
-    |> Enum.join("&")
-    |> fetch_json("series")
+  def process(:series, matches, query_ref, owner) do
+    build_url(:series, matches)
+    |> fetch_json()
     |> Poison.decode
     |> send_results(query_ref, owner)
   end
 
-  defp fetch_json(query_str, query_type) do
-    {:ok, {_, _, body}} = :httpc.request(
-      "http://"
-      <> prometheus_host
-      <> "/api/v1/#{query_type}?"
-      <> query_str
-      |> String.to_char_list())
+  defp fetch_json(uri) do
+    {:ok, {_, _, body}} = :httpc.request(uri |> String.to_char_list())
     body
   end
 
+  def endpoint(:query), do: build_endpoint("query")
+  def endpoint(:range), do: build_endpoint("query_range")
+  def endpoint(:series), do: build_endpoint("series")
+  defp build_endpoint(endpoint) do
+    "http://" <> prometheus_host <> "/api/v1/#{endpoint}"
+  end
+  def build_url(query, opts) when query in [:query, :range, :series] do
+    endpoint(query) <> "?" <> query_params(query, opts)
+  end
+
+  def query_params(:query, query_parameter) do
+    query_time = :os.system_time(:seconds)
+    "query=#{query_parameter}&time=#{query_time}"
+  end
+
+  def query_params(:range, {topic, start_ts, end_ts, step}) do
+    "query=#{topic}"
+    <> "&start=#{start_ts}"
+    <> "&end=#{end_ts}"
+    <> "&step=#{step}"
+  end
+
+  def query_params(:series, matches) when is_list(matches) do
+    matches
+    |> Enum.map(fn(match) -> "match[]=#{match}" end)
+    |> Enum.join("&")
+  end
+
   defp send_results({:error, :invalid} = results, query_ref, owner) do
     send(owner, {:prometheus_results, query_ref, results})
   end