From e0958a0dfbcbe2454fe439eb933a370cb6ad64c2 Mon Sep 17 00:00:00 2001
From: sixFingers <ignazio.setti@gmail.com>
Date: Fri, 26 Aug 2016 10:58:36 +0200
Subject: [PATCH] Simplify configuration handling

---
 lib/streamex/config.ex   | 49 ++--------------------------------------
 test/activities_test.exs |  3 +--
 test/client_test.exs     |  4 ----
 test/config_test.exs     |  4 ++--
 test/feed_test.exs       |  3 +--
 5 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/lib/streamex/config.ex b/lib/streamex/config.ex
index 1def9a9..88f4243 100644
--- a/lib/streamex/config.ex
+++ b/lib/streamex/config.ex
@@ -9,51 +9,6 @@ defmodule Streamex.Config do
   @default_version 1.0
   @default_region ""
 
-  @doc """
-  Configures the client with the values set in the
-  configuration file. Returns `:ok`.
-  """
-  def configure() do
-    configure(
-      Application.get_env(:streamex, :key, ""),
-      Application.get_env(:streamex, :secret, ""),
-      region: Application.get_env(:streamex, :region, "")
-    )
-  end
-
-  @doc """
-  Configures the client with the specified `key`,
-  `secret` and `options`. Returns `:ok`.
-
-  Available options are:
-
-    - `region` - Currently supported values are `us-east`, `us-west` and `eu-west`
-    - `timeout` - Number of milliseconds before a request is discarded. `3000` by default
-    - `version` - API version number. Defaults to 1.0
-
-  ## Examples
-
-      iex> Streamex.Config.configure("my_key", "my_secret")
-      :ok
-
-      iex> Streamex.Config.configure("my_key", [region: "us-central"])
-      :ok
-
-  """
-  def configure(key, secret, opts \\ []) do
-    Application.put_env(:streamex, :key, key)
-    Application.put_env(:streamex, :secret, secret)
-
-    region = Keyword.get(opts, :region, @default_region)
-    Application.put_env(:streamex, :region, region)
-
-    timeout = Keyword.get(opts, :timeout, @default_timeout)
-    Application.put_env(:streamex, :timeout, timeout)
-
-    version = Keyword.get(opts, :version, @default_version)
-    Application.put_env(:streamex, :version, version)
-  end
-
   @doc """
   Returns the current client's base api url.
   """
@@ -77,12 +32,12 @@ defmodule Streamex.Config do
   @doc """
   Returns the current client's api region.
   """
-  def region, do: Application.get_env(:streamex, :region)
+  def region, do: Application.get_env(:streamex, :region, @default_region)
 
   @doc """
   Returns the current client's api version.
   """
-  def version, do: Application.get_env(:streamex, :version)
+  def version, do: Application.get_env(:streamex, :version, @default_version)
 
   @doc """
   Returns the current client's timeout setting.
diff --git a/test/activities_test.exs b/test/activities_test.exs
index b3decdf..dd3984a 100644
--- a/test/activities_test.exs
+++ b/test/activities_test.exs
@@ -2,12 +2,11 @@ defmodule ActivityTest do
   use ExUnit.Case, async: false
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
   import Streamex.Feed
-  alias Streamex.{Config, Feed, Activity, Activities, ErrorNotFound, ErrorInput}
+  alias Streamex.{Feed, Activity, Activities, ErrorNotFound, ErrorInput}
 
   doctest Streamex
 
   setup_all do
-    Config.configure()
     ExVCR.Config.cassette_library_dir("fixture/vcr_cassettes")
   end
 
diff --git a/test/client_test.exs b/test/client_test.exs
index e64dca2..4934681 100644
--- a/test/client_test.exs
+++ b/test/client_test.exs
@@ -5,10 +5,6 @@ defmodule ClientTest do
 
   doctest Streamex
 
-  setup_all do
-    Config.configure()
-  end
-
   test "client builds requests with correct full url" do
     Application.put_env(:streamex, :region, "eu-west")
     req = %Request{} |> Request.with_params(%{"parameter" => "value"}) |> Client.prepare_request
diff --git a/test/config_test.exs b/test/config_test.exs
index e0398e2..5c7b81f 100644
--- a/test/config_test.exs
+++ b/test/config_test.exs
@@ -5,12 +5,12 @@ defmodule ConfigTest do
   doctest Streamex
 
   test "Configuration handles empty region" do
-    Config.configure(Config.key, Config.secret, region: "")
+    Application.put_env(:streamex, :region, "")
     assert Config.base_url == "https://api.getstream.io/api/1.0"
   end
 
   test "Configuration handles region" do
-    Config.configure(Config.key, Config.secret, region: "us-west")
+    Application.put_env(:streamex, :region, "us-west")
     assert Config.base_url == "https://us-west-api.getstream.io/api/1.0"
   end
 end
diff --git a/test/feed_test.exs b/test/feed_test.exs
index e19fae2..4a7c0f0 100644
--- a/test/feed_test.exs
+++ b/test/feed_test.exs
@@ -1,12 +1,11 @@
 defmodule FeedTest do
   use ExUnit.Case, async: false
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
-  alias Streamex.{Config, Feed, Follow, ErrorInput, ErrorFeedNotFound}
+  alias Streamex.{Feed, Follow, ErrorInput, ErrorFeedNotFound}
 
   doctest Streamex
 
   setup_all do
-    Config.configure()
     ExVCR.Config.cassette_library_dir("fixture/vcr_cassettes")
   end