Changeset 346

Timestamp:

03/08/08 09:55:39 (2 months ago)

Author:

ingy

Message:

Complete pQuery::DOM.

Files:

• trunk/src/ingy/pQuery/lib/pQuery/DOM.pm (modified) (11 diffs)
• trunk/src/ingy/pQuery/t/dom.t (modified) (2 diffs)

trunk/src/ingy/pQuery/lib/pQuery/DOM.pm

@@ -40 +40 @@
-    $self->{'_ignore_text'}        = 0;
-    $self->{'_warn'}               = 0;
-0
+1
-    $self->{'_store_comments'}     = 0;
-1
+0
-    $self->{'_store_pis'}          = 0;
-
+          
-
-    # Parse attributes passed in as arguments
@@ -65 +65 @@
-    $self->{'_pos'} = undef; # pull it back up again
-    $self->ignore_ignorable_whitespace(0);
+    $self->store_comments(1);
-    $self->no_space_compacting(1);
-
@@ -104 +105 @@
-        }
-        $_;
-
+ || [$dom->{_content}[-1]]
-    return wantarray ? @dom : $dom[0];
+}
+
+sub createElement {
+    my ($class, $tag) = @_;
+    return unless $tag =~ /^\w+$/;
+    return $class->fromHTML('<' . $tag . '>');
+}
+
+sub createComment {
+    my ($class, $comment) = @_;
+    return $class->fromHTML('<!--' . $comment . '-->');
-}
-
@@ -123 +135 @@
-sub innerHTML {
-    my $self = shift;
+
+    return if $self->{_tag} eq '~comment';
+
-    if (@_) {
-my $dom = $self->html_to_dom(@_)
-die "XXX - need to insert dom here"
+$self->{_content} = [pQuery::DOM->fromHTML($_[0])]
+return $_[0]
-    }
-
-    my $html = '';
-
-
+ || []
-    for (@list) {
-        _to_html($_, \$html);
@@ -139 +154 @@
-
-sub getElementsByTagName {
-
+
+
+
+
-}
-
-sub getElementById {
-
+
+
+
+
-}
-
-sub nodeType {
-
+$_[0]->{_tag} eq '~comment' ? 8 : 
-}
-
-sub nodeName {
+    return '#comment' if $_[0]->{_tag} eq '~comment';
-    return uc($_[0]->{_tag});
+}
+
+sub tagName {
+    return '' if $_[0]->{_tag} eq '~comment';
+    return $_[0]->nodeName;
+}
+
+sub nodeValue {
+    my $self = shift;
+    return $self->{text} if $self->{_tag} eq '~comment';
+    return;
-}
-
@@ -159 +192 @@
-
-sub setAttribute {
-
+
+
+
+
+
+
-}
-
-sub hasAttributes {
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
-sub className {
+    if ($_[1]) {
+        return $_[0]->setAttribute(class => $_[1]);
+    }
-    $_[0]->getAttribute("class");
-}
-
-sub nodeValue {
-    die "Not yet implemented";
-}
-
-sub parentNode {
-die "Not yet implemented"
+return $_[0]->{_parent}
-}
-
-sub childNodes {
-die "Not yet implemented"
+return @{$_[0]->{_content} || []}
-}
-
-sub firstChild {
-
+
+
-}
-
-sub lastChild {
-
+
+
+
+
+
+
+
+
+
+
-}
-
-sub previousSibling {
-Not yet implemente
+pQuery::DOM does not support the previousSibling metho
-}
-
-sub nextSibling {
-Not yet implemente
+pQuery::DOM does not support the nextSibling metho
-}
-
-sub attributes {
-
-
-
+
+
-
-################################################################################
@@ -216 +256 @@
-sub _to_html {
-    my ($elem, $html) = @_;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        $$html .= $elem;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -255 +308 @@
-pQuery needs a DOM to represent its content. Since there is no standard
-DOM class in Perl, pQuery implements its own.
+
+=head1 DOM MODEL
+
+It is important to note that pQuery::DOM is essentially a subclass of
+HTML::TreeBuilder and HTML::Element. As such, text nodes are just
+strings and therefore cannot have methods called on them.
+
+This implies that the DOM methods previousSibling and nextSibling
+wouldn't really work correctly. Therefore they are not implemented.
+
+To deal with children, use the childNodes method which returns a list
+of all the child nodes. Then you can you standard Perl idioms to
+process them.
+
+Note that all pQuery::DOM objects are either HTML Element nodes or HTML
+Comment nodes.
-
-=head1 METHODS
@@ -268 +337 @@
-=item fromHTML($html)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-=back
@@ -290 +368 @@
-with the tree created from the HTML.
-
+=item getElementById($id)
+
+Returns a list of all the elements with the given id. Normally this
+should be one or zero elements, since two nodes should not have the same
+id in the same DOM.
+
+=item getElementsByTagName($tag)
+
+Returns a list of all elements in the tree that have the given tag name.
+
+=item nodeType
+
+Returns 1 if the node is an HTML Element and 8 if it is a comment node.
+Never returns 3 (the type value of a text node) since text nodes in the
+DOM are just strings.
+
-=item nodeName
-
@@ -295 +389 @@
-HTML tag name.
-
+Returns '#comment' if the node is a comment node.
+
+=item tagName
+
+Returns the nodeName of the element if it is an HTML Element. (Returns
+'' for comment nodes.)
+
+=item nodeValue
+
+This method returns undef unless the node is a comment. In most DOMs
+this attribute contains the value for Text nodes (which are just
+strings here).
+
+=item getAttribute($attr)
+
+Returns the value of the specified attribute.
+
+=item setAttribute($attr, $value)
+
+Sets the specified attribute to the given value.
+
+=item removeAttribute($attr)
+
+Removes the specified attribute.
+
+=item hasAttributes
+
+Returns 1 if the node has attributes. Otherwise returns 0.
+
+=item id id($value)
+
+Same as C<getAttribute('id')> or C<setAttribute('id', $value)>.
+
+=item className className($value)
+
+Same as C<getAttribute('class')> or C<setAttribute('class', $value)>.
+
+=item parentNode
+
+Returns the node's parent node.
+
+=item childNodes
+
+Returns a list of the node's child nodes.
+
+=item firstChild
+
+Returns the node's first child node. May be a string (aka a text node).
+
+=item lastChild
+
+Returns the node's last child node. May be a string (aka a text node).
+
+=item appendChild($node)
+
+Adds a node (or a string) to the end of the current node's children.
+
-=back
-

trunk/src/ingy/pQuery/t/dom.t

@@ -1 @@
-
+
+
+
-
-use pQuery::DOM;
@@ -17 +19 @@
-is $dom->innerHTML, 'I <b>Like</b> <ul>Pie</ul>!',
-    'innerHTML works';
+
+$dom = pQuery::DOM->fromHTML(<<'...');
+<div id="div1">
+    <div id="div2">
+        <span id="span1">Foo</span> 
+        <span id="span2">Bar</span>
+        <span id="span3">Baz</span>
+    </div>
+</div>
+...
+my $span = $dom->getElementById('span1');
+is $span->innerHTML, "Foo", 'getElementById works';
+is $span->nodeValue, undef, 'nodeValue is undefined for Element';
+is $span->tagName, "SPAN", 'tagName works';
+
+my @spans = $dom->getElementsByTagName('span');
+is scalar(@spans), 3, "Found 3 spans";
+is $spans[0]->innerHTML, "Foo", '1st value is correct';
+is $spans[1]->innerHTML, "Bar", '2nd value is correct';
+
+$span->setAttribute('Foo', 'Bar');
+is $span->toHTML, '<span id="span1" foo="Bar">Foo</span>',
+    'setAttribute works';
+
+is (pQuery::DOM->fromHTML('<div>')->hasAttributes, 0, 'hasAttributes works');
+is (pQuery::DOM->fromHTML('<div XXX="yyy">')->hasAttributes, 1, 'hasAttributes works');
+
+$span->removeAttribute('Id');
+is $span->toHTML, '<span foo="Bar">Foo</span>',
+    'removeAttribute works';
+
+is $span->parentNode->id, 'div2',
+    'parentNode works';
+
+my $div2 = $dom->getElementById('div2');
+my @children = $div2->childNodes;
+is scalar(@children), 7, 'div2 has 7 children';
+is ref($children[0]), '', 'child 1 is text node';
+
+is $div2->firstChild, "\n        ", "firstChild works";
+is $div2->lastChild, "\n    ", "lastChild works";
+
+$dom = pQuery::DOM->fromHTML('<div>xxx<!-- yyy -->zzz</div>');
+my @elems = pQuery::DOM->fromHTML('<div>xxx<!-- yyy -->zzz</div>')->childNodes;
+my $comment = $elems[1];
+is $comment->nodeType, 8, 'Handle comment nodes';
+is $comment->nodeValue, ' yyy ', 'Handle comment node value';
+is $comment->hasAttributes, 0, "Comments don't have attributes";
+is $comment->nodeName, '#comment', 'Comment has proper nodeName';
+is $comment->tagName, '', 'Comment has no tagName';
+is $comment->parentNode->tagName, 'DIV', 'Comment has parentNode';
+is $dom->toHTML, '<div>xxx<!-- yyy -->zzz</div>', 'Comments work in toHTML';
+is $comment->innerHTML, undef, 'Comments have no innerHTML';
+
+$dom->innerHTML('I <b>Like</b> Pie');
+
+is $dom->toHTML, '<div>I <b>Like</b> Pie</div>', 'Setting innerHTML works';
+
+my $div = pQuery::DOM->createElement('div');
+$div->id('new-div');
+$div->className('classy');
+$comment = pQuery::DOM->createComment('I am remarkable');
+$div->appendChild('Foo');
+$div->appendChild($comment);
+is $div->toHTML, '<div id="new-div" class="classy">Foo<!--I am remarkable--></div>',
+        'createElement, createComment and appendChild work';