Merge pull request #65 from mattr-/alice-initialization-require-struct

Make application initialization take a struct

README.md

@@ -85,11 +85,15 @@ handler. We recommend putting them in `lib/alice/handlers/`.)
 def application do
   [ applications: [:alice],
     mod: {
-      Alice, [
-        Alice.Handlers.Random,
-        Alice.Handlers.AgainstHumanity,
-        Alice.Handlers.GoogleImages
-      ] } ]
+      Alice, %{
+        handlers: [
+          Alice.Handlers.Random,
+          Alice.Handlers.AgainstHumanity,
+          Alice.Handlers.GoogleImages
+        ]
+      }
+    }
+  ]
 end
 ```
 

lib/alice.ex

@@ -10,10 +10,10 @@ defmodule Alice do
   List of Alice route handlers to register upon startup
   """
   def handlers(extras) do
-    [Alice.Earmuffs,
-     Alice.Handlers.Help,
-     Alice.Handlers.Utils
-    ] ++ extras
+    case Map.fetch(extras, :handlers) do
+      {:ok, additional_handlers} -> default_handlers ++ additional_handlers
+      _ -> default_handlers
+    end
   end
 
   @doc """
@@ -42,4 +42,8 @@ defmodule Alice do
       _other -> []
     end
   end
+
+  defp default_handlers do
+    [Alice.Earmuffs, Alice.Handlers.Help, Alice.Handlers.Utils ]
+  end
 end

test/alice_test.exs

@@ -1,4 +1,18 @@
 defmodule AliceTest do
   use ExUnit.Case, async: true
   doctest Alice
+
+  alias Alice.Handlers.TestHandler
+
+  test "contains a default set of handlers" do
+    assert [Alice.Earmuffs, Alice.Handlers.Help, Alice.Handlers.Utils] == Alice.handlers(%{})
+  end
+
+  test "properly adds handlers to the list when they're provided" do
+    assert [Alice.Earmuffs,
+            Alice.Handlers.Help,
+            Alice.Handlers.Utils,
+            Alice.Handlers.TestHandler] ==
+          Alice.handlers(%{handlers: [TestHandler]})
+  end
 end