Merge branch 'release/2.0.4'

README.md

@@ -18,7 +18,7 @@ The package is [available in Hex](lttps://hex.pm/packages/agala), and can be ins
   end
   ```
 
-  2. Ensure `agala` is started before your application:
+  1. Ensure `agala` is started before your application:
 
   ```elixir
   def application do

lib/bot/responser.ex

@@ -55,10 +55,10 @@ defmodule Agala.Bot.Responser do
   def response(%Agala.Conn{multi: %Agala.Conn.Multi{conns: conns}}) do
     Enum.each(conns, &response/1)
   end
+  def response(%Agala.Conn{halted: true}), do: :ok
   def response(%Agala.Conn{responser_name: nil}) do
     Logger.warn("Responser's name was not specified for the connection. Please, check your chain.")
   end
-  def response(%Agala.Conn{halted: true}), do: :ok
   def response(conn = %Agala.Conn{responser_name: name}) do
     GenServer.cast(via_tuple(name), {:response, conn})
   end

lib/conn/multi.ex

@@ -29,7 +29,7 @@ defmodule Agala.Conn.Multi do
   def put_buffer(buff, content), do: Agent.update(buff, &[content | &1])
   @doc false
   def render(buff) do
-    %Agala.Conn{multi: %Agala.Conn.Multi{conns: Agent.get(buff, &(&1))}}
+    %Agala.Conn{multi: %Agala.Conn.Multi{conns: Enum.reverse(Agent.get(buff, &(&1)))}}
   end
 
   defmacro add(conn_structure) do

mix.exs

@@ -3,7 +3,7 @@ defmodule Agala.Mixfile do
 
   def project do
     [app: :agala,
-     version: "2.0.3",
+     version: "2.0.4",
      elixir: "~> 1.5",
      build_embedded: Mix.env == :prod,
      start_permanent: Mix.env == :prod,
@@ -34,10 +34,10 @@ defmodule Agala.Mixfile do
 
   defp deps do
     [
-      {:ex_doc, "~> 0.16", only: :dev},
+      {:ex_doc, "~> 0.18", only: :dev},
       {:inch_ex,"~> 0.5", only: [:dev, :test, :docs]},
       {:credo, "~> 0.8", only: [:dev, :test]},
-      {:excoveralls, "~> 0.7.4"}
+      {:excoveralls, "~> 0.8", only: :test}
     ]
   end
 

mix.lock

@@ -1,12 +1,12 @@
 %{"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [], [], "hexpm"},
   "certifi": {:hex, :certifi, "2.0.0", "a0c0e475107135f76b8c1d5bc7efb33cd3815cb3cf3dea7aefdd174dabead064", [], [], "hexpm"},
   "coverex": {:hex, :coverex, "1.4.15", "60fadf825a6c0439b79d1f98cdb54b6733cdd5cb1b35d15d56026c44ed15a5a8", [], [{:hackney, "~> 1.5", [hex: :hackney, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
-  "credo": {:hex, :credo, "0.8.8", "990e7844a8d06ebacd88744a55853a83b74270b8a8461c55a4d0334b8e1736c9", [], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.17.1", "39f777415e769992e6732d9589dc5846ea587f01412241f4a774664c746affbb", [], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "excoveralls": {:hex, :excoveralls, "0.7.4", "3d84b2f15a0e593159f74b19f83794b464b34817183d27965bdc6c462de014f9", [], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
+  "credo": {:hex, :credo, "0.8.10", "261862bb7363247762e1063713bb85df2bbd84af8d8610d1272cd9c1943bba63", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"},
+  "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.18.3", "f4b0e4a2ec6f333dccf761838a4b253d75e11f714b85ae271c9ae361367897b7", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
+  "excoveralls": {:hex, :excoveralls, "0.8.1", "0bbf67f22c7dbf7503981d21a5eef5db8bbc3cb86e70d3798e8c802c74fa5e27", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm"},
-  "hackney": {:hex, :hackney, "1.9.0", "51c506afc0a365868469dcfc79a9d0b94d896ec741cfd5bd338f49a5ec515bfe", [], [{:certifi, "2.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
+  "hackney": {:hex, :hackney, "1.11.0", "4951ee019df102492dabba66a09e305f61919a8a183a7860236c0fde586134b6", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
   "idna": {:hex, :idna, "5.1.0", "d72b4effeb324ad5da3cab1767cb16b17939004e789d8c0ad5b70f3cea20c89a", [], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
   "inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [], [], "hexpm"},

test/unit/conn/multi_test.exs

@@ -4,9 +4,9 @@ defmodule Agala.Conn.MultiTest do
 
   def good_multi do
     multi do
-      add %Agala.Conn{}
-      add %Agala.Conn{}
-      add %Agala.Conn{}
+      add(%Agala.Conn{})
+      add(%Agala.Conn{})
+      add(%Agala.Conn{})
     end
   end
 
@@ -18,9 +18,16 @@ defmodule Agala.Conn.MultiTest do
 
   def wrong_add do
     multi do
-      add %Agala.Conn{}
-      add %Agala.Conn{}
-      add :wrong_add
+      add(%Agala.Conn{})
+      add(%Agala.Conn{})
+      add(:wrong_add)
+    end
+  end
+
+  def order_multi do
+    multi do
+      add(%Agala.Conn{assigns: %{index: 1}})
+      add(%Agala.Conn{assigns: %{index: 2}})
     end
   end
 
@@ -34,4 +41,12 @@ defmodule Agala.Conn.MultiTest do
       Agala.Conn.MultiTest.wrong_add()
     end
   end
+
+  test "Multi execute conns in right order" do
+    assert %Agala.Conn{
+             multi: %Agala.Conn.Multi{
+               conns: [%Agala.Conn{assigns: %{index: 1}}, %Agala.Conn{assigns: %{index: 2}}]
+             }
+           } = Agala.Conn.MultiTest.order_multi()
+  end
 end