Merge branch 'Amedeo91-master' into dev

Author: Arzaroth Lekva

rapidxml/c_ext/src/document_object.cpp

@@ -25,7 +25,7 @@ static void rapidxml_DocumentObject_dealloc(rapidxml_DocumentObject* self) {
 
 static int _parse(rapidxml_DocumentObject* self,
                   Py_buffer* text_buff,
-                  bool from_file) {
+                  bool from_file, bool parse_cdata=false) {
   const char* text;
   std::vector<char> text_vector;
 
@@ -43,9 +43,17 @@ static int _parse(rapidxml_DocumentObject* self,
   }
   try {
     self->base.base.document->clear();
-    (self->base.base.document
-     ->parse<rapidxml::parse_no_utf8 | rapidxml::parse_no_data_nodes>)
-      (self->base.base.document->allocate_string(text));
+	if (!parse_cdata){
+		(self->base.base.document
+			->parse<rapidxml::parse_no_utf8 | rapidxml::parse_no_data_nodes>)
+				(self->base.base.document->allocate_string(text));
+		
+	}else{
+		(self->base.base.document
+			->parse<rapidxml::parse_declaration_node>)
+				(self->base.base.document->allocate_string(text));
+	}
+    
   } catch (rapidxml::parse_error &e) {
     PyErr_SetString(rapidxml_RapidXmlError, e.what());
     return 0;
@@ -58,17 +66,19 @@ static PyObject* rapidxml_DocumentObject_parse(rapidxml_DocumentObject* self,
                                                PyObject* kwds) {
   Py_buffer text_buff;
   PyObject* from_file_obj = NULL;
+  PyObject* read_cdata = NULL;
   char kw_text[] = "text";
   char kw_from_file[] = "from_file";
+  char kw_parse_cdata[] = "parse_cdata";
 
-  static char* kwlist[] = {kw_text, kw_from_file, NULL};
-  if (!PyArg_ParseTupleAndKeywords(args, kwds, "s*|O", kwlist,
-                                   &text_buff, &from_file_obj)) {
+  static char* kwlist[] = {kw_text, kw_from_file, kw_parse_cdata, NULL};
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "s*|OO", kwlist,
+                                   &text_buff, &from_file_obj, &read_cdata)) {
     return NULL;
   }
 
   if (!_parse(self, &text_buff,
-              (from_file_obj != NULL) && PyObject_IsTrue(from_file_obj))) {
+              (from_file_obj != NULL) && PyObject_IsTrue(from_file_obj), (read_cdata != NULL) && PyObject_IsTrue(read_cdata))) {
     return NULL;
   }
   Py_INCREF(Py_None);
@@ -80,21 +90,23 @@ static int rapidxml_DocumentObject_init(rapidxml_DocumentObject* self,
                                         PyObject* kwds) {
   Py_buffer text_buff = {0};
   PyObject* from_file_obj = NULL;
+  PyObject* read_cdata = NULL;
   char kw_text[] = "text";
   char kw_from_file[] = "from_file";
+  char kw_parse_cdata[] = "parse_cdata";
 
   if (rapidxml_NodeType.tp_init(reinterpret_cast<PyObject*>(self), args, kwds) < 0) {
     return -1;
   }
-  static char* kwlist[] = {kw_text, kw_from_file, NULL};
-  if (!PyArg_ParseTupleAndKeywords(args, kwds, "|s*O", kwlist,
-                                   &text_buff, &from_file_obj)) {
+  static char* kwlist[] = {kw_text, kw_from_file, kw_parse_cdata, NULL};
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "|s*OO", kwlist,
+                                   &text_buff, &from_file_obj, &read_cdata)) {
     return -1;
   }
   self->base.base.underlying_obj = new rapidxml::xml_document<>();
   self->base.base.document = static_cast<rapidxml::xml_document<>*>(self->base.base.underlying_obj);
   if (text_buff.buf) {
-    return _parse(self, &text_buff, (from_file_obj != NULL) && PyObject_IsTrue(from_file_obj)) - 1;
+    return _parse(self, &text_buff, (from_file_obj != NULL) && PyObject_IsTrue(from_file_obj), (read_cdata != NULL) && PyObject_IsTrue(read_cdata)) - 1;
   }
   return 0;
 }

rapidxml/rapidxml.py

@@ -94,18 +94,19 @@ def __iter__(self):
                                 self.cdata_key,
                                 self.always_aslist)
 
-
 class RapidXml(DictNode, rapidxml.c_ext.Document):
     def __init__(self,
                  text="",
                  from_file=False,
                  attribute_prefix='@',
                  cdata_key='#text',
-                 always_aslist=False):
+                 always_aslist=False,
+				 parse_cdata=False):
         DictNode.__init__(self, attribute_prefix, cdata_key, always_aslist)
-        rapidxml.c_ext.Document.__init__(self, text, from_file)
+        rapidxml.c_ext.Document.__init__(self, text, from_file, parse_cdata)
 
     def allocate_node(self, *args):
         return DictNode(self.attribute_prefix,
                         self.cdata_key,
                         self.always_aslist).copy(super(RapidXml, self).allocate_node(*args))
+

tests/conftest.py

@@ -22,3 +22,14 @@ def init_rapidxml():
   <test>some text</test>
 </root>""")
     return r
+	
+@pytest.fixture(scope="function")
+def init_rapidxml_with_CDADA():
+    datra_str = "<root><test attr1=\"one\" attr2=\"two\" attr3=\"three\"/><test2><node id=\"1\"/><node id=\"2\"/><node id=\"3\"/></test2><test>some text</test><ns2:AdditionalData><ns2:Data TID=\"AD_1\"><![CDATA[{\"Cart\":{\"expirationTime\":\"2017-04-22T09:40\",\"id\":\"b469df3b-f626-4fe3-898c-825373e546a2\",\"products\":[\"1223\"],\"creationTime\":\"2017-04-21T09:40\",\"totalPrice\":{\"currencyCode\":\"EUR\",\"amount\":\"138.000\"}}}]]></ns2:Data></ns2:AdditionalData></root>"
+    r = rapidxml.RapidXml(datra_str,
+                          from_file=False,
+                          attribute_prefix='@',
+                          cdata_key='#text',
+                          always_aslist=False,
+                          parse_cdata=True)
+    return r

tests/test_attributes.py

@@ -53,3 +53,51 @@ def test_insert_attribute(init_rapidxml):
     test = attr2.previous_attribute()
     assert test.name == "test"
     assert test.value == "test"
+
+def test_first_attribute_cdata(init_rapidxml_with_CDADA):
+    test = init_rapidxml_with_CDADA.first_node().first_node("test")
+    assert test.first_attribute().name == "attr1"
+    assert test.first_attribute().value == "one"
+    attr2 = test.first_attribute("attr2")
+    assert attr2.name == "attr2"
+    assert attr2.value == "two"
+
+def test_last_attribute_cdata(init_rapidxml_with_CDADA):
+    test = init_rapidxml_with_CDADA.first_node().first_node("test")
+    assert test.last_attribute().name == "attr3"
+    assert test.last_attribute().value == "three"
+    attr2 = test.last_attribute("attr2")
+    assert attr2.name == "attr2"
+    assert attr2.value == "two"
+
+def test_append_attribute_cdata(init_rapidxml_with_CDADA):
+    root = init_rapidxml_with_CDADA.first_node()
+    root.append_attribute(init_rapidxml_with_CDADA.allocate_attribute())
+    assert root.last_attribute().name == ""
+    assert root.last_attribute().value == ""
+    root.append_attribute(init_rapidxml_with_CDADA.allocate_attribute("test"))
+    assert root.last_attribute().name == "test"
+    assert root.last_attribute().value == ""
+    root.append_attribute(init_rapidxml_with_CDADA.allocate_attribute(value="test"))
+    assert root.last_attribute().name == ""
+    assert root.last_attribute().value == "test"
+    root.append_attribute(init_rapidxml_with_CDADA.allocate_attribute("test", "test"))
+    assert root.last_attribute().name == "test"
+    assert root.last_attribute().value == "test"
+
+def test_prepend_attribute_cdata(init_rapidxml_with_CDADA):
+    root = init_rapidxml_with_CDADA.first_node()
+    root.prepend_attribute(init_rapidxml_with_CDADA.allocate_attribute("test", "test"))
+    assert root.first_attribute().name == "test"
+    assert root.first_attribute().value == "test"
+    root.prepend_attribute(init_rapidxml_with_CDADA.allocate_attribute("test2", "test2"))
+    assert root.first_attribute().name == "test2"
+    assert root.first_attribute().value == "test2"
+
+def test_insert_attribute_cdata(init_rapidxml_with_CDADA):
+    test = init_rapidxml_with_CDADA.first_node().first_node()
+    attr2 = test.first_attribute("attr2")
+    test.insert_attribute(attr2, init_rapidxml_with_CDADA.allocate_attribute("test", "test"))
+    test = attr2.previous_attribute()
+    assert test.name == "test"
+    assert test.value == "test"

tests/test_basic.py

@@ -57,3 +57,62 @@ def test_assign(init_rapidxml):
     assert init_rapidxml.unparse() == ('<new_root><new_test new_attr1="one" attr2="new_two" attr3="three"/>'
                                        '<test2><node id="1"/><node id="2"/><node id="3"/></test2>'
                                        '<test>some new text</test></new_root>')
+
+def test_init_cdata(init_rapidxml_with_CDADA):
+    datra_str =('<root><test attr1="one" attr2="two" attr3="three"/>'
+                '<test2><node id="1"/><node id="2"/><node id="3"/></test2>'
+                '<test>some text</test>'
+                "<ns2:AdditionalData><ns2:Data TID=\"AD_1\">"
+                "<![CDATA[{\"Cart\":{\"expirationTime\":\"2017-04-22T09:40\","
+                "\"id\":\"b469df3b-f626-4fe3-898c-825373e546a2\",\"products\":[\"1223\"],"
+                "\"creationTime\":\"2017-04-21T09:40\",\"totalPrice\":"
+                "{\"currencyCode\":\"EUR\",\"amount\":\"138.000\"}}}]]>"
+                "</ns2:Data></ns2:AdditionalData></root>")
+    assert init_rapidxml_with_CDADA.unparse() == rapidxml.RapidXml(datra_str,
+                                                                   from_file=False,
+                                                                   attribute_prefix='@',
+                                                                   cdata_key='#text',
+                                                                   always_aslist=False,
+                                                                   parse_cdata=True).unparse()
+    assert init_rapidxml_with_CDADA.unparse() == repr(init_rapidxml_with_CDADA)
+    assert init_rapidxml_with_CDADA.unparse(True) == str(init_rapidxml_with_CDADA)
+
+def test_parse_cdata(init_rapidxml_with_CDADA):
+    r = rapidxml.RapidXml()
+    try:
+        data = init_rapidxml_with_CDADA.unparse().encode('utf-8')
+    except UnicodeDecodeError:
+        data = init_rapidxml_with_CDADA.unparse()
+    r.parse(data, from_file=False, parse_cdata=True)
+    assert str(r) == str(init_rapidxml_with_CDADA)
+
+def test_parse_from_file_cdata(init_rapidxml_with_CDADA, tmpdir):
+    f = tmpdir.join("dump.xml")
+    f.write(init_rapidxml_with_CDADA.unparse())
+    r = rapidxml.RapidXml(str(f), from_file=True, parse_cdata=True)
+    assert str(r) == str(init_rapidxml_with_CDADA)
+
+def test_equals_cdata(init_rapidxml_with_CDADA):
+    assert init_rapidxml_with_CDADA == init_rapidxml_with_CDADA
+    root = init_rapidxml_with_CDADA.first_node()
+    assert root == root
+    assert root == init_rapidxml_with_CDADA.first_node()
+    assert root.first_node() != root.first_node("test2")
+    assert (root != root) == (not (root == root))
+
+def test_parent_cdata(init_rapidxml_with_CDADA):
+    assert init_rapidxml_with_CDADA.parent is None
+    assert init_rapidxml_with_CDADA.first_node().parent == init_rapidxml_with_CDADA
+
+def test_assign_cdata(init_rapidxml_with_CDADA):
+    root = init_rapidxml_with_CDADA.first_node()
+    root.name = "new_root"
+    assert root.name == "new_root"
+    test = root.first_node()
+    test.name = "new_test"
+    test.first_attribute().name = "new_attr1"
+    test.first_attribute().next_attribute().value = "new_two"
+    test = root.first_node("test")
+    test.value = "some new text"
+    assert test.value == "some new text"
+

tests/test_cdata.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+#
+# File: test_cdata.py
+# by Amedeo Bussi
+# amedeobussi@live.it
+#
+
+import sys
+import rapidxml
+import ast
+
+def test_cdata():
+    data = "<ns2:AdditionalData><ns2:Data TID=\"AD_1\"><![CDATA[{\"Cart\":{\"expirationTime\":\"2017-04-22T09:40\",\"id\":\"b469df3b-f626-4fe3-898c-825373e546a2\",\"products\":[\"1223\"],\"creationTime\":\"2017-04-21T09:40\",\"totalPrice\":{\"currencyCode\":\"EUR\",\"amount\":\"138.000\"}}}]]></ns2:Data></ns2:AdditionalData>"
+
+    object = \
+        {
+            "Cart":
+                {
+                    "expirationTime":"2017-04-22T09:40",
+                    "id":"b469df3b-f626-4fe3-898c-825373e546a2",
+                    "products":["1223"],
+                    "creationTime":"2017-04-21T09:40",
+                    "totalPrice":
+                        {
+                            "currencyCode":"EUR",
+                            "amount":"138.000"
+                        }
+                }
+        }
+
+    r = rapidxml.RapidXml(data,
+                          from_file=False,
+                          attribute_prefix='@',
+                          cdata_key='#text',
+                          always_aslist=False,
+                          parse_cdata=True)
+
+    object_received = ast.literal_eval(r.first_node().first_node().first_node().value)
+
+    assert object_received == object
+
+
+

tests/test_iterations.py

@@ -29,3 +29,27 @@ def test_attributes(init_rapidxml):
         i_attr = i_attr.next_attribute()
         if i_attr:
             assert i_attr.previous_attribute() == attr
+
+def test_children_cdata(init_rapidxml_with_CDADA):
+    test2 = init_rapidxml_with_CDADA.first_node().first_node("test2")
+    i_node = test2.first_node()
+    for node in test2.children:
+        assert i_node == node
+        assert node.name == "node"
+        assert node.value == ""
+        i_node = i_node.next_sibling()
+        if i_node:
+            assert i_node.previous_sibling() == node
+
+def test_attributes_cdata(init_rapidxml_with_CDADA):
+    test = init_rapidxml_with_CDADA.first_node().first_node()
+    i_attr = test.first_attribute()
+    for attr, expected_attr in zip(test.attributes, [('attr1', 'one'),
+                                                     ('attr2', 'two'),
+                                                     ('attr3', 'three')]):
+        assert i_attr == attr
+        assert (attr.name, attr.value) == expected_attr
+        assert (i_attr.name, i_attr.value) == expected_attr
+        i_attr = i_attr.next_attribute()
+        if i_attr:
+            assert i_attr.previous_attribute() == attr

tests/test_nodes.py

@@ -6,6 +6,8 @@
 # arzaroth@arzaroth.com
 #
 
+import ast
+
 def test_first_node(init_rapidxml):
     root = init_rapidxml.first_node()
     assert root.name == "root"
@@ -27,3 +29,40 @@ def test_nested_node(init_rapidxml):
     test2 = init_rapidxml.first_node().first_node("test2")
     assert test2.name == "test2"
     assert test2.value == ""
+
+def test_first_node_cdata(init_rapidxml_with_CDADA):
+    root = init_rapidxml_with_CDADA.first_node()
+    assert root.name == "root"
+    assert root.value == ""
+    assert root.unparse() == init_rapidxml_with_CDADA.unparse()
+    assert root.first_node() == root.first_node("test")
+    assert root.first_node() != root.first_node("test2")
+
+def test_last_node_cdata(init_rapidxml_with_CDADA):
+    root = init_rapidxml_with_CDADA.first_node()
+    assert root.first_node() != root.last_node()
+    assert root.first_node("test2") == root.last_node("test2")
+    object = \
+        {
+            "Cart":
+                {
+                    "expirationTime":"2017-04-22T09:40",
+                    "id":"b469df3b-f626-4fe3-898c-825373e546a2",
+                    "products":["1223"],
+                    "creationTime":"2017-04-21T09:40",
+                    "totalPrice":
+                        {
+                            "currencyCode":"EUR",
+                            "amount":"138.000"
+                        }
+                }
+        }
+    assert ast.literal_eval(root.last_node().first_node().first_node().value) == object
+
+def test_nested_node_cdata(init_rapidxml_with_CDADA):
+    test = init_rapidxml_with_CDADA.first_node().first_node("test")
+    assert test.name == "test"
+    assert test.value == ""
+    test2 = init_rapidxml_with_CDADA.first_node().first_node("test2")
+    assert test2.name == "test2"
+    assert test2.value == ""