Merge pull request #5 from alunny/master

allow namespaced attributes
racker · Oct 15, 2012 · 6dd9abf · 6dd9abf
2 parents da0f62d + 41ce77a
commit 6dd9abf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/elementpath.js b/lib/elementpath.js
@@ -30,7 +30,7 @@ var RE = new RegExp(
   "\\.\\.|" +
   "\\(\\)|" +
   "[/.*:\\[\\]\\(\\)@=])|" +
-  "((?:\\{[^}]+\\})?[^/:\\[\\]\\(\\)@=\\s]+)|" +
+  "((?:\\{[^}]+\\})?[^/\\[\\]\\(\\)@=\\s]+)|" +
   "\\s+", 'g'
 );
 

diff --git a/tests/data/xml1.xml b/tests/data/xml1.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
-<container name="test_container_1">
+<container name="test_container_1" xmlns:android="http://schemas.android.com/apk/res/android">
   <object>dd
     <name>test_object_1</name>
     <hash>4281c348eaf83e70ddce0e07221c3d28</hash>
-    <bytes>14</bytes>
+    <bytes android:type="cool">14</bytes>
     <content_type>application/octetstream</content_type>
     <last_modified>2009-02-03T05:26:32.612278</last_modified>
   </object>
   <object>
     <name>test_object_2</name>
     <hash>b039efe731ad111bc1b0ef221c3849d0</hash>
-    <bytes>64</bytes>
+    <bytes android:type="lame">64</bytes>
     <content_type>application/octetstream</content_type>
     <last_modified>2009-02-03T05:26:32.612278</last_modified>
   </object>

diff --git a/tests/test-simple.js b/tests/test-simple.js
@@ -24,7 +24,7 @@ var XML = et.XML;
 var ElementTree = et.ElementTree;
 var Element = et.Element;
 var SubElement = et.SubElement;
-var SyntaxError = require('errors').SyntaxError;
+var SyntaxError = require('./../lib/errors').SyntaxError;
 
 function readFile(name) {
   return fs.readFileSync(path.join(__dirname, '/data/', name), 'utf8');
@@ -203,6 +203,15 @@ exports['test_parse_and_find_2'] = function(test, assert) {
   test.finish();
 };
 
+exports['test_namespaced_attribute'] = function(test, assert) {
+  var data = readFile('xml1.xml');
+  var etree = et.parse(data);
+
+  assert.equal(etree.findall('*/bytes[@android:type="cool"]').length, 1);
+
+  test.finish();
+}
+
 exports['test_syntax_errors'] = function(test, assert) {
   var expressions = [ './/@bar', '[@bar', '[@foo=bar]', '[@', '/bar' ];
   var errCount = 0;