b06eadc812
XPath support for absolute paths without tests.
...
This allows Oga to parse and evaluate the XPath expression "/". This expression
can be used to select just the root node/document.
This fixes #35 .
2014-09-15 17:06:58 +02:00
398aaf68bc
Return a correct list of available namespaces.
...
This ensures that inner namespaces take precedence over outer namespaces.
Fixes #40 .
2014-09-14 18:42:02 +02:00
9f71b1ec7b
Ignore casing when testing for html void elements
...
Fixes #36
2014-09-14 12:02:02 +03:00
ee538ddcc2
Merge pull request #34 from ttasanen/fix_comment
...
Fix function name in comment
2014-09-13 16:22:55 +02:00
5979798356
Fix function name in comment
2014-09-13 16:22:06 +03:00
d082822cdc
Removed the node_type method crap.
...
The logic this was used for now only resides in the pull parser, instead of
being exposed to the public.
This fixes #30 .
2014-09-13 15:09:52 +02:00
9ab5c302f7
Release 0.1.1.
2014-09-13 11:50:30 +02:00
b8a82b2094
Separate XML attributes by spaces.
...
This was originally reported by @jrochkind and partially patched by @billdueber.
My patches are built upon the latter, but without the need of using Array#map,
Array#join, etc. They also contain a few style changes.
This fixes #32 and #33 .
2014-09-13 11:47:06 +02:00
019ba8c660
Set the initial version to 0.1.0.
2014-09-11 14:11:24 +02:00
319d622fa5
Include namespaces when converting attrs to XML.
2014-09-11 14:03:04 +02:00
c45d32a37e
Methods for adding attributes to elements.
...
The methods XML::Element#add_attribute and XML::Element#set can be used to more
easily add attributes to elements. The first method simply adds an Attribute
instance and links it to the element. This allows for fine grained control over
what data the attribute should contain. The second method ("set") simply sets an
attribute based on a name and value, optionally creating the attribute if it
doesn't already exist.
2014-09-10 23:55:29 +02:00
6cb2d54875
Added XML::Element#inner_text=
...
This method can be used to more easily set the text of an element, without
having to manually muck around with XML::Text instances.
2014-09-10 23:25:39 +02:00
6d19c9b311
Added XML::Element#get
...
This method can be used to directly retrieve an attribute value.
2014-09-10 19:03:32 +02:00
e2dab952d0
Added XML::Node#before and XML::Node#after
...
These methods can be used to insert nodes before/after other nodes without
manually having to mess around with node sets.
This fixes #28 .
2014-09-09 22:48:31 +02:00
fccc6359e1
Corrected YARD formatting.
2014-09-09 00:47:51 +02:00
ef03a12f99
Optimize descendant-or-self and child axes.
...
By using NodeSet#concat we can further reduce the amount of object allocations.
This in turn greatly reduces the time it takes to query large documents using
descendant-or-self.
2014-09-05 20:20:13 +02:00
9f6035e784
Reduce object allocations in on_axis_descendant
...
By using Traversal#each_node and _not_ calling on_test() (which was only called
for node_matches?) we can save ourselves a few object allocations.
2014-09-05 19:58:37 +02:00
98984de540
Moved Document#each_node into a separate module.
...
This allows it to be re-used by XML::Node.
2014-09-05 19:42:38 +02:00
8f562c24dd
Use NodeSet#concat for descendant-or-self.
...
In a sample XML file this removes around 3400 NodeSet allocations.
2014-09-05 10:56:49 +02:00
bcdce306e5
Added NodeSet#concat.
...
This method allows two sets to be concatenated together without the need of
creating a 3rd node set (as is the case with NodeSet#+).
2014-09-05 10:07:22 +02:00
1fdf876a93
Tweaked docs of the XPath code a bit.
2014-09-04 10:17:32 +02:00
d8e2b97031
Tweaked docs of the XML parsers.
2014-09-04 09:34:59 +02:00
fbf3ae6e36
Manually increment XPath indexes.
...
This ensures that the index is only incremented for elements that match a node
test.
2014-09-03 23:56:13 +02:00
81a62a6f00
Added XML::Attribute#text
...
This allows attributes to also be used for axes such as "=".
2014-09-03 23:38:00 +02:00
dc5874f5aa
Show XML parsing errors when using IO as input.
...
Previously this wouldn't display anything due to the IO object being exhausted.
To fix this the input has to be wound back to the start, which means re-reading
it. Sadly I can't think of a way around this that doesn't require buffering
lines while parsing them (which massively increases memory usage).
2014-09-03 22:52:59 +02:00
d67f43508d
Use #each_line instead of #lines.
...
IO#each_line is deprecated so lets not rely on it.
2014-09-03 22:31:54 +02:00
bd31379c85
Fixed processing of nested predicates.
...
This ensures that nested predicates and functions that depend on predicates are
processed correctly.
2014-09-03 20:56:07 +02:00
e858b54c58
Use nested node stacks for predicates.
...
This ensures the current context node is set correctly when using the "self"
axis inside a path that's inside a predicate, e.g.
foo/bar[baz/. = "something"]
Here the "self" axis should refer to foo/bar/baz, _not_ foo/bar.
2014-09-03 19:54:16 +02:00
2b96d65103
XPath "self" axis inside predicates.
...
The "self" axis should use the current context node when inside a predicate.
2014-09-03 09:40:17 +02:00
71f2b42074
Convenience methods for parsing XML/HTML.
2014-09-03 09:31:48 +02:00
d92133ef43
Benchmark Oga XPath evaluation without the parser.
...
This gives better insight in the performance of the evaluator itself.
2014-09-02 20:55:42 +02:00
9649b50cc9
XML module for more easily querying using XPath.
2014-09-02 20:16:52 +02:00
ad34ab47a0
Support for binding/evaluating XPath variables.
2014-09-02 19:04:02 +02:00
5a0e8c5480
Lexing/parsing of XPath variable references.
2014-09-02 10:52:08 +02:00
5de37bdf81
Support for the XPath ">=" operator.
2014-09-01 22:45:01 +02:00
099227901a
Support for the XPath "<=" operator.
2014-09-01 22:40:50 +02:00
6eacf74da4
Fixed comparing node equality in XPath expressions
...
Previously this would take the text of the entire node set, not of the first
node in the set.
2014-09-01 22:34:18 +02:00
8884db8cb6
Support for the XPath ">" operator.
2014-09-01 22:23:35 +02:00
6b45a03cb4
Support for the XPath "<" operator.
2014-09-01 22:20:32 +02:00
e1d9e62b72
Support for the XPath "!=" operator.
2014-09-01 20:48:11 +02:00
9e5f15787d
Support for the XPath "=" operator.
2014-09-01 18:57:12 +02:00
a70645fb89
Support for the XPath sub/- operator.
2014-08-29 09:41:17 +02:00
89686b6cff
Support for the XPath mul/* operator.
2014-08-29 09:36:40 +02:00
034b360d13
Support for the XPath "mod" operator.
2014-08-29 09:31:11 +02:00
78c8cd1323
Support for the XPath "div" operator.
2014-08-28 23:05:12 +02:00
ced7f739fc
Support for the XPath "add" / "+" operator.
2014-08-28 21:18:09 +02:00
4fa40b58cf
Support for the XPath "or" operator.
2014-08-28 21:01:12 +02:00
4f189d9218
Support for the XPath "and" operator.
2014-08-28 09:42:55 +02:00
809ed9bfa6
Handle boolean values in the boolean() function.
2014-08-28 09:36:21 +02:00
8fb8fb17b6
Clarified docs for floor(), ceiling() and round().
2014-08-28 00:01:33 +02:00
543112dcdc
Support for the XPath round() function.
2014-08-28 00:00:25 +02:00
a2b8e3c954
Support for the XPath ceiling() function.
2014-08-27 23:56:43 +02:00
c8fb1ad202
Support for the XPath floor() function.
2014-08-27 23:52:23 +02:00
7c68f2a49b
Raise for non node sets in the sum() function.
...
According to the XPath spec this function *can only* take node sets, nothing
else. Lets actually enforce that.
2014-08-27 23:47:19 +02:00
ac06670c24
Better conversion of types to numbers.
...
The XPath number() function should also be capable of converting booleans to
numbers, something it previously was not able to do. In order to do this
reliably we can't rely on the string() function as this would make it impossible
to distinguish between literal string values and booleans. This is due to
true(), which returns a TrueClass, being converted to the string "true". This
string in turn can't be converted to a float.
2014-08-27 23:38:47 +02:00
fcb28d5ae8
Specs for various XPath evaluator helper methods.
2014-08-27 23:37:12 +02:00
30a5d01ebd
Support for the XPath sum() function.
2014-08-27 23:05:04 +02:00
585b3535b2
Support for the XPath lang() function.
2014-08-27 20:26:27 +02:00
10e82de87b
Handle boolean values in predicate results.
2014-08-27 20:26:10 +02:00
7c41fa814f
Default attribute namespaces.
...
When an attribute is prefixed with "xml" the default namespace should be used
automatically. This namespace is not registered on element level by default as
this namespace isn't registered manually, instead it's a "magic" namespace. This
also ensures we match the behaviour of libxml more closely, hopefully reducing
confusion.
2014-08-27 20:24:40 +02:00
d2f991538d
Support for the XPath true()/false() functions.
2014-08-27 09:37:28 +02:00
4ef79bad90
Support for the XPath not() function.
2014-08-27 09:35:02 +02:00
338aeeb514
Work around JRuby issue #1923 .
...
String#start_with?() returns false on JRuby when used with an empty string. See
https://github.com/jruby/jruby/issues/1923 for more information.
2014-08-26 21:08:50 +02:00
29870c21f2
Use char Arrays in on_call_translate().
...
When running a 1.9 based Ruby Enumerable doesn't have the method #[].
2014-08-26 20:41:16 +02:00
e288ab88f5
Support for the XPath boolean() function.
2014-08-26 20:22:28 +02:00
bcd138a15a
Lexing of explicit negative/positive XPath numbers
2014-08-26 20:21:30 +02:00
8295fa5783
Support for the XPath translate() function.
2014-08-26 18:14:44 +02:00
7f3f626744
Support for the XPath normalize-space() function.
2014-08-26 00:06:58 +02:00
06bed1cfdd
Support for the XPath string-length() function.
2014-08-25 23:46:18 +02:00
a60057db5c
Proper handling of decimals for string() calls.
...
When calling the string() XPath function floats with zero decimals (10.0, 5.0,
etc) should result in a string without any decimals. Ruby converts 10.0 to
"10.0" whereas XPath expects "10".
2014-08-25 23:21:36 +02:00
6c0c5ab720
Revert "Return XPath integers as actual integers."
...
The particular case of string(10) having to return "10" instead of "10.0" will
be handled separately. Returning integers breaks behaviour/expectations
elsewhere.
This reverts commit 431a253000
2014-08-25 23:14:22 +02:00
a1a2190fe2
Support for the XPath substring() function.
2014-08-25 23:13:34 +02:00
5382891106
Support for the XPath number() function.
2014-08-25 23:13:03 +02:00
ba058627f2
Corrected docs for on_call_string().
2014-08-25 23:12:45 +02:00
b2ca18e127
Support for the XPath substring-after() function.
2014-08-25 22:19:13 +02:00
b9cdb4a72b
Support for the XPath substring-before() function.
2014-08-25 22:11:05 +02:00
83b873e3c1
Support for the XPath contains() function.
2014-08-25 21:52:33 +02:00
5b65d6c31a
Support for the xpath starts-with() function.
2014-08-25 09:43:06 +02:00
276a5ab83b
Support for lexing empty XPath strings.
2014-08-25 09:42:51 +02:00
b688c6dc1b
Support for the XPath concat() function.
2014-08-23 20:24:18 +02:00
431a253000
Return XPath integers as actual integers.
...
This is to ensure that calls such as string(10) return "10" and not "10.0". It
also saves integer -> float conversions when they're not needed.
2014-08-23 20:22:58 +02:00
b316fd3e1c
Support for the XPath string() function.
2014-08-22 11:06:10 +02:00
ff8a4ad3aa
Ignore comment nodes in NodeSet#text.
2014-08-22 11:05:39 +02:00
99be3182ae
Support for evaluating XPath floats.
2014-08-22 10:59:03 +02:00
6ac3408a71
Match all node types when using node()
...
Previously this would only match element and text nodes.
2014-08-22 10:58:36 +02:00
da09f1296c
Support for using namespace-uri() with attributes.
2014-08-21 22:36:18 +02:00
0d41693bfc
Support for using name() with attributes.
2014-08-21 21:05:06 +02:00
acc056eea4
Support for using local-name() on attributes.
2014-08-21 21:03:28 +02:00
1dd6416bea
Basic support for the XPath name() function.
2014-08-21 20:47:20 +02:00
e7019ceb4c
Renamed context_node to function_node.
2014-08-21 19:06:14 +02:00
8cc0db2283
Support for the XPath namespace-uri() function.
2014-08-21 19:02:41 +02:00
9e20b5ca3e
Support for the XPath local-name() function.
2014-08-21 10:21:02 +02:00
2deb7a6d84
Support for the XPath id() function.
...
This comes with the limitation that it *always* uses the "id" attribute. This is
due to Oga not supporting DTD parsing/evaluation.
2014-08-20 21:06:35 +02:00
d351bc26cc
Support for the XPath count() function.
2014-08-20 10:16:06 +02:00
709fa365e0
XPath support for last() + evaluator docs.
...
I really dislike using a stack as it introduces an internal state. Sadly there
doesn't seem to be an easy way around this.
2014-08-19 22:59:26 +02:00
e0895be675
Better setup for XPath predicates.
...
This allows filtering of nodes by indexes (e.g. using last() or a literal
number) and uses the correct index range (1 to N in XPath). The function
position() is not yet supported as this requires access to the current node,
which isn't passed down the call stack just yet.
2014-08-19 19:56:56 +02:00
202f74a8eb
on_call_last() should return an index, not a node.
2014-08-19 19:56:41 +02:00
423af37422
Basic support for the XPath last() function.
2014-08-18 19:00:32 +02:00
2817784e6b
Support for the XPath pipe operator.
2014-08-17 22:04:08 +02:00
d1735750c1
Only store unique nodes in XML::NodeSet.
...
It's called a "set" after all.
2014-08-17 22:03:44 +02:00
bb503728af
XPath support for processing instructions.
2014-08-16 22:37:57 +02:00
0d7609da88
Support for parsing XML processing instructions.
2014-08-15 22:23:26 +02:00
8f4eaf3823
Lexing of XML processing instructions.
2014-08-15 22:04:45 +02:00
ccd95d69d8
Support for the XPath comment() test.
2014-08-15 20:49:13 +02:00
4d7f224892
Support for the XPath text() type test.
2014-08-15 10:46:00 +02:00
14aa420091
Use a new base class for XML text nodes.
...
The classes Text, Cdata and Comment now extend CharacterData instead of Text.
2014-08-15 10:43:16 +02:00
24bc84e15e
Added XML::Element#text_nodes.
...
This method returns all the text nodes directly nested in an element.
2014-08-15 10:07:49 +02:00
d0092b434d
Removed Document#available_namespaces.
...
Namespaces aren't scoped per document but instead per element, thus this method
doesn't make that much sense. This also fixes the remaining, failing XPath test.
2014-08-14 23:12:33 +02:00
d34e4697de
Match node types in node_matches?
...
The method XPath::Evaluator#node_matches? now has a special case to handle
"type-test" nodes. This in turn fixes a bunch of failing tests such as those for
the XPath query "parent::node()".
2014-08-14 22:54:19 +02:00
a437d67573
Renamed node_type to type_test.
2014-08-14 22:35:41 +02:00
05f6fc2f8d
Implement node() as a type test, not a function.
2014-08-14 22:30:14 +02:00
6ad5170476
Support for lexing/parsing XPath type tests.
...
Unlike what I thought before syntax such as "node()" is not a function call.
Instead this is a special node test that tests the *types* of nodes, not their
names.
2014-08-14 21:51:58 +02:00
23441bb5a4
Basic support for the XPath node() function.
2014-08-14 18:17:08 +02:00
a133b923a2
Only emit extra T_SLASH tokens for "//".
2014-08-13 01:28:43 +02:00
4d956c9ef0
Support for the XPath "namespace" axis.
2014-08-11 00:58:57 +02:00
873bd82273
Stricted matching of namespaced elements.
2014-08-11 00:47:07 +02:00
33c28f633b
Proper namespace support for elements.
...
This is still a bit rough on the edges but already way better than the broken
setup I had before.
2014-08-11 00:41:36 +02:00
04cbbdcf9e
Proper namespace support for attributes.
...
This separates namespace handling into namespace names and namespace objects.
The namespace objects are retrieved from the element an attribute belongs to.
Once retrieved the namespace is cached, due to the overhead of retrieving
namespaces in large documents.
2014-08-11 00:40:17 +02:00
fe8f77cf45
Basic work for supporting namespace URIs.
2014-08-08 19:03:42 +02:00
f002061aaa
Extra type validation for XML::Element options.
2014-08-07 21:10:01 +02:00
b1388ff84a
Ripped out inspect fuckery.
...
The old code used for generating Object#inspect values has been ripped out (for
the most part). The result is a non indented but far more compact #inspect
output. The code for this is also easier and doesn't break the signature of
Object#inspect.
2014-08-07 21:09:10 +02:00
3b2279e410
Don't create empty Namespace nodes.
2014-08-07 20:16:46 +02:00
4e18989972
Remove the uri attribute from Namespace.
...
Oga won't be handling URIs any time soon. The rationale is that they server zero
purpose when it comes to just parsing XML. Another goal of Oga is to make it
easy to modify and reserialize documents back to XML. If namespaces would also
store the URIs this would make this process more difficult.
2014-08-07 20:11:17 +02:00
97e59fe449
Use the Namespace class for namespaces vs Strings.
2014-08-07 20:03:26 +02:00
f653203220
Tests for the Namespace class.
2014-08-07 20:02:56 +02:00
8e8ea64206
Fixed serializing of elements to XML.
2014-08-06 00:04:42 +02:00
e0bbc81351
Added a very basic Namespace class.
2014-08-06 00:00:08 +02:00
d7df908649
Trimmed XML inspect values.
2014-08-05 23:57:12 +02:00
26d4bdc5b1
Support for the XPath "self" axis.
2014-08-05 21:10:12 +02:00
8a9b26fa73
Basic support for the preceding-sibling xpath axis
2014-08-05 19:28:26 +02:00
fc1d9776f3
Basic support for the XPath "preceding" axis.
2014-08-05 10:16:37 +02:00
375f3d7870
Basic support for the XPath "parent" axis.
...
The usage of `parent::node()` is not yet supported.
2014-08-05 09:34:57 +02:00
c0a6610d65
Use has_parent? in on_axis_following_sibling.
2014-08-04 21:57:16 +02:00
a1f80b4995
Support for the "following-sibling" axis.
...
This also comes with some small cleanups regarding
XPath::Evaluator#node_matches?. This change removes the need to, every time,
also use can_match_node?() to prevent NoMethodError errors from popping up.
2014-08-04 21:51:51 +02:00
57c0f4b35e
Renamed `node` to `ast_node`.
...
This should make it a bit easier to understand what kind of data the variable is
holding.
2014-08-04 19:01:27 +02:00
211caf00c6
Proper support for the XPath "following" axis.
2014-08-04 18:57:21 +02:00
57fcbbd0fc
Allow Document#each_node to skip child nodes.
...
Child nodes can be skipped by throwing :skip_children.
2014-08-04 10:00:32 +02:00
ef1ad5406a
Don't yield indexes in Document#each_node.
...
These indexes won't be used so there's no point in yielding them.
2014-08-04 09:08:39 +02:00
5c23333f46
Traverse document nodes in document order.
...
The method Document#each_node now yields the nodes in the correct order.
2014-08-01 23:34:32 +02:00
c419d8849b
Shift instead of pop nodes when yielding all nodes
2014-08-01 19:00:29 +02:00
34e2d28bbd
Document#all_nodes -> Document#each_node
...
This method has been renamed and now yields nodes and their indexes instead of
buffering them in a node set.
2014-07-31 18:57:05 +02:00
4bbf0c98ae
Use breadth-first-search for returning all nodes.
...
This still uses a stack but at least no longer relies on the call stack. I
decided not to go with the Morris in-order algorithm [1] as it modifies the tree
during a search. This would not work well if a document were to be accessed from
multiple threads at once (which should be possible for read-only operations).
I might change this method to actually perform a search (opposed to just
returning everything). This will require some closer inspection of the
available XPath axes to determine if this is needed.
Tests will also be added once I've taken care of the above.
[1]: http://en.wikipedia.org/wiki/Tree_traversal#Morris_in-order_traversal_using_threading
2014-07-30 22:27:09 +02:00
8fe71f298b
Half-assed way of retrieving all document nodes.
...
This currently only works for documents, is not tested and most likely will leak
memory due to being recursive.
2014-07-30 19:56:56 +02:00
52a4375278
Prepare setup for *actual* following support.
...
The previous commit was nonsense as I didn't understand XPath's "following" axis
properly. This commit introduces proper tests and a note for future me so that I
can implement it properly.
2014-07-30 00:16:44 +02:00
9a97d936e3
Support for the XPath "following" axis.
2014-07-29 23:09:16 +02:00
55e3388e30
Unfuck XPath axes evaluation.
...
The evaluation of axes has been fixed by changing the initial context as well as
the behaviour of some of the handler methods.
The initial context has been changed so that it's simply a NodeSet of whatever
the root object is, either a Document or an Element instance. Previously this
would be set to the child nodes of a Document in case the root object was a
Document. This in turn would prevent "child" axes from operating correctly.
2014-07-28 00:44:05 +02:00
23de57a3a0
Parse bare XPath node tests as child axes.
...
When parsing a bare node test such as "A" this is now parsed as following:
(axis "child" (test nil "A"))
Instead of this:
(test nil "A")
According to the XPath specification both are identical and this simplifies some
of the code in the XPath evaluator.
2014-07-28 00:34:26 +02:00
1916799fef
Basic boilerplate for descendant-or-self.
2014-07-25 21:24:39 +02:00
dd37b028a0
Support for the XPath descendant axis.
2014-07-24 09:49:05 +02:00
fd37bcff1f
Corrected an XPath example.
2014-07-23 18:48:53 +02:00
Yorick Peterse
Tero Tasanen