Merge pull request #73 from nsweeting/v0.13

Fix handle_setup for ConsumerSupervisor
nsweeting · Mar 11, 2021 · 021b7e4 · 021b7e4
2 parents a931b87 + b20d2ff
commit 021b7e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ The package can be installed by adding `rabbit` to your list of dependencies in
 ```elixir
 def deps do
   [
-    {:rabbit, "~> 0.12"}
+    {:rabbit, "~> 0.13"}
   ]
 end
 ```

diff --git a/lib/rabbit/consumer_supervisor.ex b/lib/rabbit/consumer_supervisor.ex
@@ -119,9 +119,9 @@ defmodule Rabbit.ConsumerSupervisor do
   A callback executed by each consumer after the channel is open, but before
   consumption.
 
-  Please see `c:Rabbit.Consumer.handle_setup/2` for more information.
+  Please see `c:Rabbit.Consumer.handle_setup/1` for more information.
   """
-  @callback handle_setup(channel :: AMQP.Channel.t(), queue :: String.t()) :: :ok
+  @callback handle_setup(state :: map()) :: :ok | {:ok, new_state :: map()} | :error
 
   @doc """
   A callback executed by each consumer to handle message consumption.
@@ -137,7 +137,7 @@ defmodule Rabbit.ConsumerSupervisor do
   """
   @callback handle_error(message :: Rabbit.Message.t()) :: Rabbit.Consumer.message_response()
 
-  @optional_callbacks handle_setup: 2
+  @optional_callbacks handle_setup: 1
 
   ################################
   # Public API

diff --git a/lib/rabbit/topology.ex b/lib/rabbit/topology.ex
@@ -6,7 +6,7 @@ defmodule Rabbit.Topology do
   bindings. Basically - performing any RabbitMQ setup required by your application.
   It should be added to your supervision tree before any producers or consumers.
 
-  Both `Rabbit.Consumer` and `Rabbit.ConsumerSupervisor` have the `handle_setup/2`
+  Both `Rabbit.Consumer` and `Rabbit.ConsumerSupervisor` have the `handle_setup/1`
   callback, which can be used to perform any queue, exchange or binding work as
   well. But if you have more complex requirements, this module can be used.
 

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Rabbit.MixProject do
   use Mix.Project
 
-  @version "0.12.0"
+  @version "0.13.0"
 
   def project do
     [

diff --git a/test/consumer_supervisor_test.exs b/test/consumer_supervisor_test.exs
@@ -30,9 +30,9 @@ defmodule Rabbit.ConsumerSupervisorTest do
     end
 
     @impl Rabbit.ConsumerSupervisor
-    def handle_setup(chan, queue) do
-      AMQP.Queue.declare(chan, queue, auto_delete: true)
-      AMQP.Queue.purge(chan, queue)
+    def handle_setup(state) do
+      AMQP.Queue.declare(state.chan, state.queue, auto_delete: true)
+      AMQP.Queue.purge(state.chan, state.queue)
 
       :ok
     end