Merge pull request #3 from thepeanutgalleryandco/master

Added ignore case functionality and catered for more Xpath expressions

Author: basiliscos

Diff for: README.md

@@ -19,3 +19,4 @@ Contributors
 
 * blumf
 * Ivan Baidakou (basiliscos)
+* Rohan de Jongh (thepeanutgalleryandco)

Diff for: doc/us/index.html

@@ -65,8 +65,8 @@ <h2><a name="overview"></a>Overview</h2>
 
           <h2><a name="status"></a>Status</h2>
 
-          <p>Current version is 1.2. It was developed for Lua 5.1 based on <a href="http://www.keplerproject.org/luaexpat">
-            LuaExpat</a> but also should work with Lua 5.2 and 5.3.
+          <p>Current version is 1.3. It was developed for Lua 5.1 based on <a href="http://www.keplerproject.org/luaexpat">
+            LuaExpat</a> but also should work with Lua 5.2, 5.3 and 5.4.
           </p>
 
 
@@ -78,6 +78,13 @@ <h2><a name="download"></a>Download</h2>
 
           <h2><a name="history"></a>History</h2>
           <dl class="history">
+	    <dt><strong>Version 1.3</strong> [10/July/2024]</dt>
+	    <dd><ul>
+              <li>Added ignore case functionality</li>
+              <li>Added support for more XPath expressions that might be more complex</li>
+              <li>Added comments in library</li>
+	    </ul></dd>
+
 	    <dt><strong>Version 1.2</strong> [15/Mar/2015]</dt>
 	    <dd><ul>
               <li>Moved to github and a bit reogranized project structure</li>

Diff for: doc/us/manual.html

@@ -73,7 +73,7 @@ <h2><a name="usage"></a>Usage</h2>
   require "luaxpath"
   local lom = require "lxp.lom"
 
-  xpath.selectNodes(lom.parse(xmlString),xpathExpression)
+  xpath.selectNodes(lom.parse(xmlString),xpathExpression,ignoreCase)
 </pre>
 
 <h2><a name="examples"></a>Examples</h2>        
@@ -85,20 +85,54 @@ <h2><a name="examples"></a>Examples</h2>
 local xmlTest =
 [[
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;root&gt;
-	&lt;element id="1" name="element1"&gt;text of the first element&lt;/element&gt;
-        &lt;element id="2" name="element2"&gt;
-		&lt;subelement&gt;text of the second element&lt;/subelement&gt;
-        &lt;/element&gt;
+&lt;root xmlns:test="https://test.test/"&gt;
+  &lt;element id="1" name="element1"&gt;text of the first element&lt;/element&gt;
+  &lt;element id="2" name="element2"&gt;
+    &lt;subelement&gt;text of the second element&lt;/subelement&gt;
+  &lt;/element&gt;
+  &lt;test:newElement id="1" name="newElement"&gt;
+    &lt;test&gt;text of the test element&lt;/test&gt;
+  &lt;/test:newElement&gt;
 &lt;/root&gt;
 ]]
 
 -- get all elements
 xpath.selectNodes(lom.parse(xmlTest),'//element')
+
 -- get the subelement text
 xpath.selectNodes(lom.parse(xmlTest),'/root/element/subelement/text()')
--- get the first element
+
+-- get the element by attribute id 1
 xpath.selectNodes(lom.parse(xmlTest),'/root/element[@id="1"]')
+
+-- get node two by index
+xpath.selectNodes(lom.parse(xmlTest),'/root/element[2]')
+
+-- get the first element node, with ignoring the case of element
+xpath.selectNodes(lom.parse(xmlTest),'/root/ELEMENT[1]',true)
+
+-- get the newElement node and make use of the namespace in the tag name
+xpath.selectNodes(lom.parse(xmlTest),'/root/test:newElement')
+
+-- get the node that has a child node that contains a tag name of subelement
+xpath.selectNodes(lom.parse(xmlTest),'//element[name="subelement"]')
+
+-- get any node that has an attribute of test
+xpath.selectNodes(lom.parse(xmlTest),'//*/@test')
+
+-- get the node by name
+xpath.selectNodes(lom.parse(xmlTest),'/root/element/node()')
+
+-- get all child nodes of root
+xpath.selectNodes(lom.parse(xmlTest),'/root/*')
+
+-- get all child nodes of root that contains an attribute of name which is equal to element
+xpath.selectNodes(lom.parse(xmlTest),'/root/element[contains(@name, "element")]')
+
+-- get all element nodes that contains an attribute of name which starts with ele
+xpath.selectNodes(lom.parse(xmlTest),'/root/element[starts-with(@name, "ele")]')
+
+
 </pre>
 
 <h2><a name="related_docs"></a>Related documentation</h2>        

Diff for: rockspecs/luaxpath-1.2-4.rockspec renamed to rockspecs/luaxpath-1.3-0.rockspec

@@ -1,8 +1,8 @@
 package = "luaxpath"
-version = "1.2-4"
+version = "1.3-0"
 source = {
    url = "git://github.com/basiliscos/lua-xpath",
-   tag = "v1.2.4",
+   tag = "v1.3.0",
 }
 description = {
    summary = "Simple XPath implementation in the Lua programming language.",