Current section
14 Versions
Jump to
Current section
14 Versions
Compare versions
22
files changed
+77
additions
-59
deletions
| @@ -1,6 +1,6 @@ | |
| 1 1 | {<<"links">>,[{<<"GitHub">>,<<"https://github.com/combo-team/combo">>}]}. |
| 2 2 | {<<"name">>,<<"combo">>}. |
| 3 | - {<<"version">>,<<"0.2.0">>}. |
| 3 | + {<<"version">>,<<"0.2.1">>}. |
| 4 4 | {<<"description">>,<<"Combines the good parts of modern web development.">>}. |
| 5 5 | {<<"elixir">>,<<"~> 1.18">>}. |
| 6 6 | {<<"app">>,<<"combo">>}. |
| @@ -268,7 +268,7 @@ defmodule Combo.Conn do | |
| 268 268 | @doc """ |
| 269 269 | Gets the request format, such as "json", "html". |
| 270 270 | """ |
| 271 | - @spec get_format(Conn.t()) :: String.t() |
| 271 | + @spec get_format(Conn.t()) :: String.t() | nil |
| 272 272 | def get_format(conn) do |
| 273 273 | conn.private[:combo_format] |
| 274 274 | end |
| @@ -806,7 +806,7 @@ defmodule Combo.Conn do | |
| 806 806 | ## Responses - by rendering templates |
| 807 807 | |
| 808 808 | @type template :: atom() | String.t() |
| 809 | - @type assigns :: Keyword.t() | map() |
| 809 | + @type assigns :: keyword() | map() |
| 810 810 | |
| 811 811 | defguard is_template(template) when is_atom(template) or is_binary(template) |
| 812 812 | defguard is_assigns(assigns) when is_list(assigns) or is_map(assigns) |
| @@ -1131,7 +1131,7 @@ defmodule Combo.Conn do | |
| 1131 1131 | plug :allow_jsonp, callback: "cb" |
| 1132 1132 | |
| 1133 1133 | """ |
| 1134 | - @spec allow_jsonp(Conn.t(), Keyword.t()) :: Conn.t() |
| 1134 | + @spec allow_jsonp(Conn.t(), keyword()) :: Conn.t() |
| 1135 1135 | def allow_jsonp(conn, opts \\ []) do |
| 1136 1136 | callback = Keyword.get(opts, :callback, "callback") |
| @@ -140,6 +140,7 @@ defmodule Combo.Controller.Pipeline do | |
| 140 140 | end |
| 141 141 | |
| 142 142 | @doc false |
| 143 | + @dialyzer {:no_return, __catch__: 5} |
| 143 144 | def __catch__( |
| 144 145 | %Plug.Conn{}, |
| 145 146 | :function_clause, |
| @@ -375,7 +375,7 @@ defmodule Combo.Endpoint do | |
| 375 375 | |
| 376 376 | See `Phoenix.PubSub.subscribe/3` for options. |
| 377 377 | """ |
| 378 | - @callback subscribe(topic, opts :: Keyword.t()) :: :ok | {:error, term()} |
| 378 | + @callback subscribe(topic, opts :: keyword()) :: :ok | {:error, term()} |
| 379 379 | |
| 380 380 | @doc """ |
| 381 381 | Unsubscribes the caller from the given topic. |
| @@ -2,7 +2,7 @@ defmodule Combo.Endpoint.Adapter do | |
| 2 2 | @moduledoc false |
| 3 3 | |
| 4 4 | @type endpoint :: module() |
| 5 | - @type config :: Keyword.t() |
| 5 | + @type config :: keyword() |
| 6 6 | @type scheme :: :http | :https |
| 7 7 | |
| 8 8 | @doc """ |
Loading more files…