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
Yorick Peterse