From 93dcd408aa19014514d0490b42b56bae84d5c9d6 Mon Sep 17 00:00:00 2001
From: jpalanca <jpalanca@dsic.upv.es>
Date: Thu, 27 Sep 2018 19:52:53 +0200
Subject: [PATCH 1/3] preparing for release 3.0.7

---
 HISTORY.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index 11b98486..a3fd6977 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,14 @@
 History
 =======
 
+3.0.7 (2018-09-27)
+------------------
+
+* Fixed bug when running FSM states.
+* Improved Message __str__.
+* Fixed bug when thread is not defined in a message.
+* aioxmpp send method is now in client instead of stream.
+
 3.0.6 (2018-09-27)
 ------------------
 

From 8d09a1e7600e717df99b494dea53ea309fa6412c Mon Sep 17 00:00:00 2001
From: jpalanca <jpalanca@dsic.upv.es>
Date: Thu, 27 Sep 2018 19:53:00 +0200
Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=203.0.6=20=E2=86=92=203.0.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg         | 2 +-
 setup.py          | 2 +-
 spade/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b965e587..8f539762 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.6
+current_version = 3.0.7
 commit = True
 tag = False
 
diff --git a/setup.py b/setup.py
index 3db0d83b..2fd34d0a 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def parse_requirements(filename):
 
 setup(
     name='spade',
-    version='3.0.6',
+    version='3.0.7',
     description="Smart Python Agent Development Environment",
     long_description=readme + '\n\n' + history,
     author="Javi Palanca",
diff --git a/spade/__init__.py b/spade/__init__.py
index fb1fe39a..b8a931b6 100644
--- a/spade/__init__.py
+++ b/spade/__init__.py
@@ -7,6 +7,6 @@
 
 __author__ = """Javi Palanca"""
 __email__ = 'jpalanca@gmail.com'
-__version__ = '3.0.6'
+__version__ = '3.0.7'
 
 __all__ = ["agent", "behaviour", "message", "template"]

From f9b464d50f28fb49e489cbd59ab6952667d40163 Mon Sep 17 00:00:00 2001
From: jpalanca <jpalanca@dsic.upv.es>
Date: Thu, 27 Sep 2018 20:00:18 +0200
Subject: [PATCH 3/3] Added missing test for thread id in messages.

---
 tests/test_message.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/test_message.py b/tests/test_message.py
index 8beeee32..f44c2445 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -5,6 +5,7 @@
 import copy
 
 import aioxmpp
+import aioxmpp.forms.xso as forms_xso
 import pytest
 
 from spade.message import Message, SPADE_X_METADATA
@@ -73,6 +74,31 @@ def test_body_with_languages():
     assert new_msg.body == "Hello World"
 
 
+def test_message_from_node():
+    aiomsg = aioxmpp.Message(type_=aioxmpp.MessageType.CHAT)
+    data = forms_xso.Data(type_=forms_xso.DataType.FORM)
+
+    data.fields.append(
+        forms_xso.Field(
+            var="performative",
+            type_=forms_xso.FieldType.TEXT_SINGLE,
+            values=["request"],
+        )
+    )
+
+    data.fields.append(forms_xso.Field(var="_thread_node",
+                                       type_=forms_xso.FieldType.TEXT_SINGLE,
+                                       values=["thread-id"]))
+    data.title = SPADE_X_METADATA
+    aiomsg.xep0004_data = [data]
+
+    msg = Message.from_node(aiomsg)
+
+    assert msg.thread == "thread-id"
+    assert msg.get_metadata("performative") == "request"
+    assert msg.metadata == {"performative": "request"}
+
+
 def test_thread_empty():
     msg = Message(thread=None)