refactor

Author: akshaykmr

lib/redex_server.ex

@@ -9,7 +9,7 @@ defmodule Redex.Server do
 
   ## Examples
 
-      iex> Redex.Server.start_link()
+      iex> Redex.Server.start_link([])
       {:ok, #PID<0.102.0>}
 
   """
@@ -34,21 +34,22 @@ defmodule Redex.Server do
 
   defp loop_acceptor(socket) do
     {:ok, client} = :gen_tcp.accept(socket)
-    serve(client)
+    Logger.debug "new client"
+    handle_client(client)
     loop_acceptor(socket)
   end
 
-  defp serve(socket) do
-    socket
-    |> read_line()
-    |> write_line(socket)
-
-    serve(socket)
+  defp handle_client(socket) do
+    case socket |> read_line() do
+      {:ok, line} ->
+        write_line(line, socket)
+        handle_client(socket)
+      {:error, error} -> Logger.debug "connection closed: #{error}"
+    end
   end
 
   defp read_line(socket) do
-    {:ok, data} = :gen_tcp.recv(socket, 0)
-    data
+    :gen_tcp.recv(socket, 0)
   end
 
   defp write_line(line, socket) do

lib/test_utils.ex

@@ -1,16 +1,21 @@
 defmodule Redex.TestUtils do
-  def wait_for_server(retries \\ 5) do
-    case :gen_tcp.connect('localhost', 6379, []) do
+
+  def wait_for_server(host, port, retries \\ 5) when is_binary(host) do
+    wait(to_charlist(host), port, retries)
+  end
+
+  defp wait(host, port, retries) do
+    case :gen_tcp.connect(host, port, []) do
       {:ok, socket} ->
         :gen_tcp.close(socket)
       {:error, reason} ->
         cond do
           retries > 0 ->
             :timer.sleep(100)
-            wait_for_server(retries - 1)
+            wait(host, port, retries - 1)
           :true ->
-            Mix.raise "Cannot connect to Redis" <>
-                  " (http://localhost:6379):" <>
+            Mix.raise "Cannot connect to server" <>
+                  " (#{host}:#{port}):" <>
                   " #{:inet.format_error(reason)}"
         end
     end

mix.exs

@@ -21,6 +21,7 @@ defmodule Redex.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
+      {:redix, ">= 0.0.0"}
       # {:dep_from_hexpm, "~> 0.3.0"},
       # {:dep_from_git, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.1.0"},
     ]

mix.lock

@@ -0,0 +1,3 @@
+%{
+  "redix": {:hex, :redix, "0.9.0", "c631c921354587e054bf1e2a6b7d0120d617352fc42b624b9ca79ea484d0326c", [:mix], [], "hexpm"},
+}

test/redex_test.exs

@@ -1,75 +1,26 @@
 defmodule RedexServerTest do
   use ExUnit.Case
+
+  @test_port 6455
   # doctest Redex.Server
 
   setup do
     IO.puts "starting server"
-    {:ok, server} = Redex.Server.start_link([])
+    {:ok, server} = Redex.Server.start_link([port: @test_port])
     %{pid: server}
   end
 
   setup context do
-    Redex.TestUtils.wait_for_server()
-    context
+    Redex.TestUtils.wait_for_server("localhost", @test_port)
+    :ok
   end
 
-  test "it starts", %{pid: pid} do
-    assert Process.alive?(pid)
+  setup context do
+    {:ok, conn} = Redix.start_link(host: "localhost", port: @test_port)
+    %{conn: conn}
   end
 
-  test "it responds to ping", %{pid: pid} do
-
+  test "it starts", %{pid: pid} do
+    assert Process.alive?(pid)
   end
 end
-
-
-# defmodule AssertionTest do
-#   use ExUnit.Case, async: true
-
-#   # "setup_all" is called once per module before any test runs
-#   setup_all do
-#     IO.puts "Starting AssertionTest"
-
-#     # Context is not updated here
-#     :ok
-#   end
-
-#   # "setup" is called before each test
-#   setup do
-#     IO.puts "This is a setup callback for #{inspect self()}"
-
-#     on_exit fn ->
-#       IO.puts "This is invoked once the test is done. Process: #{inspect self()}"
-#     end
-
-#     # Returns extra metadata to be merged into context
-#     [hello: "world"]
-
-#     # Similarly, any of the following would work:
-#     #   {:ok, [hello: "world"]}
-#     #   %{hello: "world"}
-#     #   {:ok, %{hello: "world"}}
-#   end
-
-#   # Same as above, but receives the context as argument
-#   setup context do
-#     IO.puts "Setting up: #{context.test}"
-#     :ok
-#   end
-
-#   # Setups can also invoke a local or imported function that returns a context
-#   setup :invoke_local_or_imported_function
-
-#   test "always pass" do
-#     assert true
-#   end
-
-#   test "uses metadata from setup", context do
-#     assert context[:hello] == "world"
-#     assert context[:from_named_setup] == true
-#   end
-
-#   defp invoke_local_or_imported_function(context) do
-#     [from_named_setup: true]
-#   end
-# end