* GraphiQL 0.6.1

* Improving validation of functions

Author: aweiker

lib/graphql/plug.ex

@@ -35,9 +35,9 @@ defmodule GraphQL.Plug do
 
  @spec init(Map) :: init
  def init(opts) do
- opts
- |> GraphQL.Plug.Endpoint.init
- |> GraphQL.Plug.GraphiQL.init
+ graphiql = GraphQL.Plug.GraphiQL.init(opts)
+ endpoint = GraphQL.Plug.Endpoint.init(opts)
+ Enum.dedup(endpoint ++ graphiql)
  end
 
  def call(conn, opts) do

lib/graphql/plug/configurable_value.ex

@@ -9,16 +9,22 @@ defmodule GraphQL.Plug.ConfigurableValue do
  @type t :: {module, atom} | (Plug.Conn.t -> Map) | Map | nil
  @spec evaluate(Plug.Conn.t, t, any) :: Map
 
+ @error_msg "Configured function must only be arity of 1 that accepts a value of Plug.Conn"
+
  def evaluate(conn, {mod, func}, _) do
- apply(mod, func, [conn])
+ if :erlang.function_exported(mod, func, 1) do
+ apply(mod, func, [conn])
+ else
+ raise @error_msg
+ end
  end
 
  def evaluate(conn, root_fn, _) when is_function(root_fn, 1) do
  apply(root_fn, [conn])
  end
 
  def evaluate(_, root_fn, _) when is_function(root_fn) do
- raise "Configured function must only be arity of 1 that accepts a value of Plug.Conn"
+ raise @error_msg
  end
 
  def evaluate(_, nil, default) do

lib/graphql/plug/endpoint.ex

@@ -41,7 +41,6 @@ defmodule GraphQL.Plug.Endpoint do
  end
 
  def call(%Conn{method: m} = conn, opts) when m in ["GET", "POST"] do
- # %{schema: schema, root_value: root_value, query: query} = opts
  root_value = opts[:root_value]
  schema = opts[:schema]
  query = opts[:query]

lib/graphql/plug/graphiql.ex

@@ -1,20 +1,17 @@
 defmodule GraphQL.Plug.GraphiQL do
  @moduledoc """
- This is the core plug for mounting a GraphQL server.
+ This is the GraphiQL plug for mounting a GraphQL server.
 
  You can build your own pipeline by mounting the
- `GraphQL.Plug.Endpoint` plug directly.
+ `GraphQL.Plug.GraphiQL` plug directly.
 
  ```elixir
- forward "/graphql", GraphQL.Plug.Endpoint, schema: {MyApp.Schema, :schema}
+ forward "/graphql", GraphQL.Plug.GraphiQL, schema: {MyApp.Schema, :schema}
  ```
 
  You may want to look at how `GraphQL.Plug` configures its pipeline.
  Specifically note how `Plug.Parsers` are configured, as this is required
  for pre-parsing the various POST bodies depending on `content-type`.
-
- This plug currently includes _GraphiQL_ support but this should end
- up in it's own plug.
  """
  import Plug.Conn
  alias Plug.Conn
@@ -24,7 +21,7 @@ defmodule GraphQL.Plug.GraphiQL do
 
  @behaviour Plug
 
- @graphiql_version "0.4.9"
+ @graphiql_version "0.6.1"
  @graphiql_instructions """
  # Welcome to GraphQL Elixir!
  #
@@ -48,7 +45,7 @@ defmodule GraphQL.Plug.GraphiQL do
  [:graphiql_version, :query, :variables, :result]
 
  def init(opts) do
- allow_graphiql? = Keyword.get(opts, :allow_graphiql?, false)
+ allow_graphiql? = Keyword.get(opts, :allow_graphiql?, true)
 
  GraphQL.Plug.Endpoint.init(opts) ++ [allow_graphiql?: allow_graphiql?]
  end
@@ -97,9 +94,8 @@ defmodule GraphQL.Plug.GraphiQL do
  |> send_resp(200, graphiql)
  end
 
- def use_graphiql?(%Conn{method: "GET"}, %{allow_graphiql?: false}), do: false
- def use_graphiql?(%Conn{method: "GET"} = conn, %{allow_graphiql?: true}) do
- case get_req_header(conn, "accept") do
+ def use_graphiql?(%Conn{method: "GET"} = conn, opts) do
+ case opts[:allow_graphiql?] && get_req_header(conn, "accept") do
  [accept_header | _] ->
  String.contains?(accept_header, "text/html") &&
  !Map.has_key?(conn.params, "raw")

test/graphql/plug/configurable_value_test.exs

@@ -42,10 +42,9 @@ defmodule GraphQL.Plug.ConfigurableValueTest do
  end
 
  test "raises error when {mod, fun} is not arity/1" do
- # TODO: This should have a better error messsage as this is not useful
  assert_raise(
- UndefinedFunctionError,
- "undefined function GraphQL.Plug.ConfigurableValueTest.Config.bar/1",
+ RuntimeError,
+ "Configured function must only be arity of 1 that accepts a value of Plug.Conn",
  fn ->
  %{}
  |> ConfigurableValue.evaluate({Config, :bar}, :default)