Revert changes to the public API

Applying suggestions from code review.

lib/rustler_precompiled.ex

@@ -275,13 +275,19 @@ defmodule RustlerPrecompiled do
 
   @native_dir "priv/native"
 
+  @doc deprecated: "Use available_nifs/1 instead"
+  def available_nif_urls(nif_module) when is_atom(nif_module) do
+    available_nifs(nif_module)
+    |> Enum.map(fn {_lib_name, {url, _headers}} -> url end)
+  end
+
   @doc """
-  Returns tuples of file names and their URLs for NIFs based on its module name.
+  Returns URLs for NIFs based on its module name as a list of tuples: `[{lib_name, {url, headers}}]`.
 
   The module name is the one that defined the NIF and this information
   is stored in a metadata file.
   """
-  def available_nif_urls(nif_module) when is_atom(nif_module) do
+  def available_nifs(nif_module) when is_atom(nif_module) do
     nif_module
     |> metadata_file()
     |> read_map_from_file()
@@ -299,6 +305,17 @@ defmodule RustlerPrecompiled do
 
   @doc false
   def nif_urls_from_metadata(metadata) when is_map(metadata) do
+    case(nifs_from_metadata(metadata)) do
+      {:ok, nifs} ->
+        {:ok, Enum.map(nifs, fn {_lib_name, {url, _headers}} -> url end)}
+
+      {:error, wrong_meta} ->
+        {:error, wrong_meta}
+    end
+  end
+
+  @doc false
+  def nifs_from_metadata(metadata) when is_map(metadata) do
     case metadata do
       %{
         targets: targets,
@@ -340,13 +357,19 @@ defmodule RustlerPrecompiled do
 
   defp maybe_variants_tar_gz_urls(_, _, _, _), do: []
 
+  @doc deprecated: "Use current_target_nifs/1 instead"
+  def current_target_nif_urls(nif_module) when is_atom(nif_module) do
+    current_target_nifs(nif_module)
+    |> Enum.map(fn {_lib_name, {url, _headers}} -> url end)
+  end
+
   @doc """
-  Returns tuples of file names and their URLs to be downloaded for current target.
+  Returns the file URLs to be downloaded for current target as a list of tuples: `[{lib_name, {url, headers}}]`.
 
   It is in the plural because a target may have some variants for it.
   It receives the NIF module.
   """
-  def current_target_nif_urls(nif_module) when is_atom(nif_module) do
+  def current_target_nifs(nif_module) when is_atom(nif_module) do
     metadata =
       nif_module
       |> metadata_file()
@@ -920,6 +943,9 @@ defmodule RustlerPrecompiled do
 
     options = [body_format: :binary]
 
+    request_headers =
+      Enum.map(request_headers, fn {k, v} when is_binary(k) -> {String.to_charlist(k), v} end)
+
     case :httpc.request(:get, {url, request_headers}, http_options, options) do
       {:ok, {{_, 200, _}, _headers, body}} ->
         {:ok, body}

lib/rustler_precompiled/config.ex

@@ -83,6 +83,10 @@ defmodule RustlerPrecompiled.Config do
 
   defp validate_base_url!(nil), do: raise_for_nil_field_value(:base_url)
 
+  defp validate_base_url!(base_url) when is_binary(base_url) do
+    validate_base_url!({base_url, []})
+  end
+
   defp validate_base_url!({base_url, headers}) when is_binary(base_url) and is_list(headers) do
     case :uri_string.parse(base_url) do
       %{} ->
@@ -107,10 +111,6 @@ defmodule RustlerPrecompiled.Config do
     end
   end
 
-  defp validate_base_url!(base_url) when is_binary(base_url) do
-    validate_base_url!({base_url, []})
-  end
-
   defp validate_list!(nil, option, _valid_values), do: raise_for_nil_field_value(option)
 
   defp validate_list!([_ | _] = values, option, valid_values) do

test/rustler_precompiled_test.exs

@@ -529,7 +529,7 @@ defmodule RustlerPrecompiledTest do
               module: RustlerPrecompilationExample.Native,
               base_cache_dir: tmp_dir,
               base_url:
-                {"http://localhost:#{bypass.port}/download", [{'authorization', "Token 123"}]},
+                {"http://localhost:#{bypass.port}/download", [{"authorization", "Token 123"}]},
               version: "0.2.0",
               crate: "example",
               targets: @available_targets,
@@ -1015,7 +1015,7 @@ defmodule RustlerPrecompiledTest do
                  "libexample-v0.2.0-nif-2.17-x86_64-unknown-linux-gnu.so.tar.gz",
                  "libexample-v0.2.0-nif-2.17-x86_64-unknown-linux-musl.so.tar.gz"
                ]
-               |> Enum.map(fn file_name -> {file_name, {"#{base_url}/#{file_name}", []}} end)
+               |> Enum.map(fn file_name -> "#{base_url}/#{file_name}" end)
     end
 
     test "does not build list of tar gz urls due to missing metadata field" do
@@ -1063,6 +1063,6 @@ defmodule RustlerPrecompiledTest do
 
   def url_with_headers(file_name) do
     {"http://localhost:1234/download?file_name=#{file_name}&foo=bar",
-     [{'authorization', "Token 123"}]}
+     [{"authorization", "Token 123"}]}
   end
 end