Merge pull request #19 from kiequoo/master

Allow connection state to be queried

Author: gertjana

src/main/scala/com/thenewmotion/akka/rabbitmq/ChannelActor.scala

@@ -8,9 +8,11 @@ import ConnectionActor.ProvideChannel
  * @author Yaroslav Klymko
  */
 object ChannelActor {
-  private[rabbitmq] sealed trait State
-  private[rabbitmq] case object Disconnected extends State
-  private[rabbitmq] case object Connected extends State
+  sealed trait State
+  case object Disconnected extends State
+  case object Connected extends State
+
+  case object GetState
 
   private[rabbitmq] sealed trait Data
   private[rabbitmq] case class InMemory(queue: Queue[OnChannel] = Queue()) extends Data
@@ -133,6 +135,11 @@ class ChannelActor(setupChannel: (Channel, ActorRef) => Any)
           goto(Disconnected) using InMemory()
       }
   }
+  whenUnhandled {
+    case Event(GetState, _) =>
+      sender ! stateName
+      stay
+  }
   onTransition {
     case Disconnected -> Connected => log.info("{} connected", self.path)
     case Connected -> Disconnected => log.warning("{} disconnected", self.path)

src/test/scala/com/thenewmotion/akka/rabbitmq/ChannelActorSpec.scala

@@ -104,6 +104,13 @@ class ChannelActorSpec extends ActorSpec with Mockito {
       there was one(onChannel).apply(channel)
       state mustEqual disconnected(last)
     }
+    "respond to GetState message" in new TestScope {
+      actorRef ! GetState
+      expectMsg(Disconnected)
+      actorRef.setState(Connected, Connected(channel))
+      actorRef ! GetState
+      expectMsg(Connected)
+    }
   }
 
   private abstract class TestScope extends ActorScope {