From 0fe057b5c3f462275cf8dbf321c2ebec61de1bfe Mon Sep 17 00:00:00 2001
From: Sangeeth Saravanaraj <sangeeth@riptideio.com>
Date: Tue, 27 Jan 2015 15:13:57 +0530
Subject: Boilerplate for Stanzas - request and response

---
 sleekxmpp/plugins/xep_0332/stanza/__init__.py | 12 ++++++++++++
 sleekxmpp/plugins/xep_0332/stanza/request.py  | 21 +++++++++++++++++++++
 sleekxmpp/plugins/xep_0332/stanza/response.py | 21 +++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 sleekxmpp/plugins/xep_0332/stanza/__init__.py
 create mode 100644 sleekxmpp/plugins/xep_0332/stanza/request.py
 create mode 100644 sleekxmpp/plugins/xep_0332/stanza/response.py

(limited to 'sleekxmpp/plugins/xep_0332/stanza')

diff --git a/sleekxmpp/plugins/xep_0332/stanza/__init__.py b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
new file mode 100644
index 00000000..5d686710
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
@@ -0,0 +1,12 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Implementation of HTTP over XMPP transport
+    http://xmpp.org/extensions/xep-0332.html
+    Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.plugins.xep_0332.stanza.request import *
+from sleekxmpp.plugins.xep_0332.stanza.response import *
diff --git a/sleekxmpp/plugins/xep_0332/stanza/request.py b/sleekxmpp/plugins/xep_0332/stanza/request.py
new file mode 100644
index 00000000..3d75b534
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0332/stanza/request.py
@@ -0,0 +1,21 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Implementation of HTTP over XMPP transport
+    http://xmpp.org/extensions/xep-0332.html
+    Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp import Iq
+from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from sleekxmpp.plugins.xep_0131.stanza import Headers
+
+
+class Request(ElementBase):
+    pass
+
+
+register_stanza_plugin(Iq, Request)
+register_stanza_plugin(Request, Headers)
diff --git a/sleekxmpp/plugins/xep_0332/stanza/response.py b/sleekxmpp/plugins/xep_0332/stanza/response.py
new file mode 100644
index 00000000..7f8180bb
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0332/stanza/response.py
@@ -0,0 +1,21 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Implementation of HTTP over XMPP transport
+    http://xmpp.org/extensions/xep-0332.html
+    Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp import Iq
+from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from sleekxmpp.plugins.xep_0131.stanza import Headers
+
+
+class Response(ElementBase):
+    pass
+
+
+register_stanza_plugin(Iq, Response)
+register_stanza_plugin(Response, Headers)
-- 
cgit v1.2.3


From e1f25604ecbf5d6c196080cd8394191c7ea459c9 Mon Sep 17 00:00:00 2001
From: Sangeeth Saravanaraj <sangeeth@riptideio.com>
Date: Wed, 28 Jan 2015 14:52:15 +0530
Subject: Added callbacks, registered stanzas, added features, etc.

---
 sleekxmpp/plugins/xep_0332/stanza/__init__.py |  3 +-
 sleekxmpp/plugins/xep_0332/stanza/request.py  | 40 +++++++++++++++++++++++----
 sleekxmpp/plugins/xep_0332/stanza/response.py | 37 +++++++++++++++++++++----
 3 files changed, 66 insertions(+), 14 deletions(-)

(limited to 'sleekxmpp/plugins/xep_0332/stanza')

diff --git a/sleekxmpp/plugins/xep_0332/stanza/__init__.py b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
index 5d686710..5d9283c7 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/__init__.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
@@ -8,5 +8,4 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.plugins.xep_0332.stanza.request import *
-from sleekxmpp.plugins.xep_0332.stanza.response import *
+NAMESPACE = 'urn:xmpp:http'
diff --git a/sleekxmpp/plugins/xep_0332/stanza/request.py b/sleekxmpp/plugins/xep_0332/stanza/request.py
index 3d75b534..ea2650c0 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/request.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/request.py
@@ -8,14 +8,42 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
-from sleekxmpp.plugins.xep_0131.stanza import Headers
+from sleekxmpp.xmlstream import ElementBase
+from sleekxmpp.plugins.xep_0332.stanza import NAMESPACE
 
 
 class Request(ElementBase):
-    pass
 
+    """
+    All HTTP communication is done using the `Request`/`Response` paradigm.
+    Each HTTP Request is made sending an `iq` stanza containing a `req` element
+    to the server. Each `iq` stanza sent is of type `set`.
+
+    Examples:
+    <iq type='set' from='a@b.com/browser' to='x@y.com' id='1'>
+        <req xmlns='urn:xmpp:http' method='GET' resource='/api/user' version='1.1'>
+            <headers xmlns='http://jabber.org/protocol/shim'>
+                <header name='Host'>b.com</header>
+            </headers>
+        </req>
+    </iq>
+
+    <iq type='set' from='a@b.com/browser' to='x@y.com' id='2'>
+        <req xmlns='urn:xmpp:http' method='PUT' resource='/api/users' version='1.1'>
+            <headers xmlns='http://jabber.org/protocol/shim'>
+                <header name='Host'>b.com</header>
+                <header name='Content-Type'>text/html</header>
+                <header name='Content-Length'>...</header>
+            </headers>
+            <data>
+                <text>&lt;html&gt;&lt;header/&gt;&lt;body&gt;&lt;p&gt;Beautiful home page.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
+            </data>
+        </req>
+    </iq>
+    """
+
+    name = 'request'
+    namespace = NAMESPACE
+    interfaces = set(('method', 'resource', 'version'))
+    plugin_attrib = 'req'
 
-register_stanza_plugin(Iq, Request)
-register_stanza_plugin(Request, Headers)
diff --git a/sleekxmpp/plugins/xep_0332/stanza/response.py b/sleekxmpp/plugins/xep_0332/stanza/response.py
index 7f8180bb..4dc14344 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/response.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/response.py
@@ -8,14 +8,39 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
-from sleekxmpp.plugins.xep_0131.stanza import Headers
+from sleekxmpp.xmlstream import ElementBase
+from sleekxmpp.plugins.xep_0332.stanza import NAMESPACE
 
 
 class Response(ElementBase):
-    pass
 
+    """
+    When the HTTP Server responds, it does so by sending an `iq` stanza
+    response (type=`result`) back to the client containing the `resp` element.
+    Since response are asynchronous, and since multiple requests may be active
+    at the same time, responses may be returned in a different order than the
+    in which the original requests were made.
 
-register_stanza_plugin(Iq, Response)
-register_stanza_plugin(Response, Headers)
+    Examples:
+    <iq type='result' from='httpserver@clayster.com' to='httpclient@clayster.com/browser' id='2'>
+        <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
+            <headers xmlns='http://jabber.org/protocol/shim'>
+                <header name='Date'>Fri, 03 May 2013 16:39:54GMT-4</header>
+                <header name='Server'>Clayster</header>
+                <header name='Content-Type'>text/turtle</header>
+                <header name='Content-Length'>...</header>
+                <header name='Connection'>Close</header>
+            </headers>
+            <data>
+                <text>
+                    ...
+                </text>
+            </data>
+        </resp>
+    </iq>
+    """
+
+    name = 'response'
+    namespace = NAMESPACE
+    interfaces = set(('statusCode', 'statusMessage', 'version'))
+    plugin_attrib = 'resp'
-- 
cgit v1.2.3


From a96f608469e74d39d3e7a2a86399dbb724ffadec Mon Sep 17 00:00:00 2001
From: Sangeeth Saravanaraj <sangeeth@riptideio.com>
Date: Thu, 29 Jan 2015 08:33:40 +0530
Subject: Composing request and response.

---
 sleekxmpp/plugins/xep_0332/stanza/__init__.py |  4 +++-
 sleekxmpp/plugins/xep_0332/stanza/data.py     | 29 +++++++++++++++++++++++++++
 sleekxmpp/plugins/xep_0332/stanza/request.py  | 26 +++++++++++++++++++++---
 sleekxmpp/plugins/xep_0332/stanza/response.py | 17 +++++++++++++---
 4 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 sleekxmpp/plugins/xep_0332/stanza/data.py

(limited to 'sleekxmpp/plugins/xep_0332/stanza')

diff --git a/sleekxmpp/plugins/xep_0332/stanza/__init__.py b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
index 5d9283c7..eeab3f31 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/__init__.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/__init__.py
@@ -8,4 +8,6 @@
     See the file LICENSE for copying permission.
 """
 
-NAMESPACE = 'urn:xmpp:http'
+from sleekxmpp.plugins.xep_0332.stanza.request import Request
+from sleekxmpp.plugins.xep_0332.stanza.response import Response
+from sleekxmpp.plugins.xep_0332.stanza.data import Data
diff --git a/sleekxmpp/plugins/xep_0332/stanza/data.py b/sleekxmpp/plugins/xep_0332/stanza/data.py
new file mode 100644
index 00000000..e77d2585
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0332/stanza/data.py
@@ -0,0 +1,29 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Implementation of HTTP over XMPP transport
+    http://xmpp.org/extensions/xep-0332.html
+    Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.xmlstream import ElementBase
+
+
+class Data(ElementBase):
+    """
+    The data element.
+    """
+    name = 'data'
+    namespace = ''
+    interfaces = set(['data'])
+    plugin_attrib = 'data'
+
+    def get_data(self):
+        print "Data:: get_data()"
+
+    def set_data(self, data, encoding='text'):
+        print "Data:: set_data()"
+        self._set_sub_text(encoding, text=data)
+
diff --git a/sleekxmpp/plugins/xep_0332/stanza/request.py b/sleekxmpp/plugins/xep_0332/stanza/request.py
index ea2650c0..51e565e5 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/request.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/request.py
@@ -9,7 +9,6 @@
 """
 
 from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins.xep_0332.stanza import NAMESPACE
 
 
 class Request(ElementBase):
@@ -43,7 +42,28 @@ class Request(ElementBase):
     """
 
     name = 'request'
-    namespace = NAMESPACE
-    interfaces = set(('method', 'resource', 'version'))
+    namespace = 'urn:xmpp:http'
+    interfaces = set(['method', 'resource', 'version'])
     plugin_attrib = 'req'
 
+    def get_method(self):
+        print "Request:: get_method()"
+
+    def set_method(self, method):
+        print "Request:: set_method()"
+        self._set_attr('method', method)
+
+    def get_resource(self):
+        print "Request:: get_resource()"
+
+    def set_resource(self, resource):
+        print "Request:: set_resource()"
+        self._set_attr('resource', resource)
+
+    def get_version(self):
+        print "Request:: get_version()"
+
+    def set_version(self, version='1.1'):
+        print "Request:: set_version()"
+        self._set_attr('version', version)
+
diff --git a/sleekxmpp/plugins/xep_0332/stanza/response.py b/sleekxmpp/plugins/xep_0332/stanza/response.py
index 4dc14344..d863efa3 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/response.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/response.py
@@ -9,7 +9,6 @@
 """
 
 from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins.xep_0332.stanza import NAMESPACE
 
 
 class Response(ElementBase):
@@ -41,6 +40,18 @@ class Response(ElementBase):
     """
 
     name = 'response'
-    namespace = NAMESPACE
-    interfaces = set(('statusCode', 'statusMessage', 'version'))
+    namespace = 'urn:xmpp:http'
+    interfaces = set(['code', 'version'])
     plugin_attrib = 'resp'
+
+    def get_code(self):
+        print "Response:: get_code()"
+
+    def set_code(self, code):
+        print "Response:: set_code()"
+        self._set_attr('statusCode', str(code))
+        self._set_attr('statusMessage', str(code))
+
+    def set_version(self, version='1.1'):
+        print "Response:: set_version()"
+        self._set_attr('version', version)
-- 
cgit v1.2.3


From 8bc70264efd17390fbe795e359a7cbb0442fd0d1 Mon Sep 17 00:00:00 2001
From: Sangeeth Saravanaraj <sangeeth@riptideio.com>
Date: Thu, 5 Feb 2015 17:35:04 +0530
Subject: misc updates..

---
 sleekxmpp/plugins/xep_0332/stanza/data.py     |  9 +++++----
 sleekxmpp/plugins/xep_0332/stanza/request.py  | 14 +++++---------
 sleekxmpp/plugins/xep_0332/stanza/response.py | 14 +++++++++-----
 3 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'sleekxmpp/plugins/xep_0332/stanza')

diff --git a/sleekxmpp/plugins/xep_0332/stanza/data.py b/sleekxmpp/plugins/xep_0332/stanza/data.py
index e77d2585..9a08426b 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/data.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/data.py
@@ -16,14 +16,15 @@ class Data(ElementBase):
     The data element.
     """
     name = 'data'
-    namespace = ''
+    namespace = 'urn:xmpp:http'
     interfaces = set(['data'])
     plugin_attrib = 'data'
+    is_extension = True
 
-    def get_data(self):
-        print "Data:: get_data()"
+    def get_data(self, encoding='text'):
+        data = self._get_sub_text(encoding, None)
+        return str(data) if data is not None else data
 
     def set_data(self, data, encoding='text'):
-        print "Data:: set_data()"
         self._set_sub_text(encoding, text=data)
 
diff --git a/sleekxmpp/plugins/xep_0332/stanza/request.py b/sleekxmpp/plugins/xep_0332/stanza/request.py
index 51e565e5..07618727 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/request.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/request.py
@@ -20,7 +20,7 @@ class Request(ElementBase):
 
     Examples:
     <iq type='set' from='a@b.com/browser' to='x@y.com' id='1'>
-        <req xmlns='urn:xmpp:http' method='GET' resource='/api/user' version='1.1'>
+        <req xmlns='urn:xmpp:http' method='GET' resource='/api/users' version='1.1'>
             <headers xmlns='http://jabber.org/protocol/shim'>
                 <header name='Host'>b.com</header>
             </headers>
@@ -35,7 +35,7 @@ class Request(ElementBase):
                 <header name='Content-Length'>...</header>
             </headers>
             <data>
-                <text>&lt;html&gt;&lt;header/&gt;&lt;body&gt;&lt;p&gt;Beautiful home page.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
+                <text>...</text>
             </data>
         </req>
     </iq>
@@ -47,23 +47,19 @@ class Request(ElementBase):
     plugin_attrib = 'req'
 
     def get_method(self):
-        print "Request:: get_method()"
+        return self._get_attr('method', None)
 
     def set_method(self, method):
-        print "Request:: set_method()"
         self._set_attr('method', method)
 
     def get_resource(self):
-        print "Request:: get_resource()"
+        return self._get_attr('resource', None)
 
     def set_resource(self, resource):
-        print "Request:: set_resource()"
         self._set_attr('resource', resource)
 
     def get_version(self):
-        print "Request:: get_version()"
+        return self._get_attr('version', None)
 
     def set_version(self, version='1.1'):
-        print "Request:: set_version()"
         self._set_attr('version', version)
-
diff --git a/sleekxmpp/plugins/xep_0332/stanza/response.py b/sleekxmpp/plugins/xep_0332/stanza/response.py
index d863efa3..0fc46de8 100644
--- a/sleekxmpp/plugins/xep_0332/stanza/response.py
+++ b/sleekxmpp/plugins/xep_0332/stanza/response.py
@@ -41,17 +41,21 @@ class Response(ElementBase):
 
     name = 'response'
     namespace = 'urn:xmpp:http'
-    interfaces = set(['code', 'version'])
+    interfaces = set(['code', 'message', 'version'])
     plugin_attrib = 'resp'
 
     def get_code(self):
-        print "Response:: get_code()"
+        code = self._get_attr('statusCode', None)
+        return int(code) if code is not None else code
 
     def set_code(self, code):
-        print "Response:: set_code()"
         self._set_attr('statusCode', str(code))
-        self._set_attr('statusMessage', str(code))
+
+    def get_message(self):
+        return self._get_attr('statusMessage', '')
+
+    def set_message(self, message):
+        self._set_attr('statusMessage', message)
 
     def set_version(self, version='1.1'):
-        print "Response:: set_version()"
         self._set_attr('version', version)
-- 
cgit v1.2.3