X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDOM%2FTiny.pm;h=0eecb5e7b8d2b90060e3f332af8ea5e22ba7d7d0;hb=4b5e2513f7ea1ac132c1bb5c6732516d6cb1b917;hp=b2b789cdaa75fd12fe2f0b3749328cf10e587a41;hpb=3187745294af04bb4f3ece751c5d947f373039e5;p=catagits%2FDOM-Tiny.git

diff --git a/lib/DOM/Tiny.pm b/lib/DOM/Tiny.pm
index b2b789c..0eecb5e 100644
--- a/lib/DOM/Tiny.pm
+++ b/lib/DOM/Tiny.pm
@@ -16,7 +16,7 @@ use DOM::Tiny::_CSS;
 use DOM::Tiny::_HTML;
 use Scalar::Util qw(blessed weaken);
 
-our $VERSION = '0.001';
+our $VERSION = '0.003';
 
 sub new {
   my $class = shift;
@@ -153,7 +153,7 @@ sub tag {
   return $self;
 }
 
-sub tap { shift->DOM::Tiny::_Collection::tap(@_) }
+sub tap { DOM::Tiny::_Collection::tap(@_) }
 
 sub text { shift->_all_text(0, @_) }
 
@@ -167,7 +167,13 @@ sub val {
   my $self = shift;
 
   # "option"
-  return $self->{value} // $self->text if (my $tag = $self->tag) eq 'option';
+  return defined($self->{value}) ? $self->{value} : $self->text
+    if (my $tag = $self->tag) eq 'option';
+
+  # "input" ("type=checkbox" and "type=radio")
+  my $type = $self->{type} || '';
+  return defined $self->{value} ? $self->{value} : 'on'
+    if $tag eq 'input' && ($type eq 'radio' || $type eq 'checkbox');
 
   # "textarea", "input" or "button"
   return $tag eq 'textarea' ? $self->text : $self->{value} if $tag ne 'select';
@@ -234,7 +240,7 @@ sub _content {
   my $tree = $self->tree;
   unless ($tree->[0] eq 'root' || $tree->[0] eq 'tag') {
     my $old = $self->content;
-    return $self->content($start ? "$old$new" : "$new$old");
+    return $self->content($start ? $old . $new : $new . $old);
   }
 
   $start  = $start  ? ($#$tree + 1) : _start($tree);
@@ -363,8 +369,8 @@ sub _text {
 sub _wrap {
   my ($self, $content, $new) = @_;
 
-  $content = 1 if (my $tree = $self->tree)->[0] eq 'root';
-  $content = 0 if $tree->[0] ne 'root' && $tree->[0] ne 'tag';
+  return $self if (my $tree = $self->tree)->[0] eq 'root' && !$content;
+  return $self if $tree->[0] ne 'root' && $tree->[0] ne 'tag' && $content;
 
   # Find innermost tag
   my $current;
@@ -464,8 +470,8 @@ names are lowercased and selectors need to be lowercase as well.
   my $dom = DOM::Tiny->new('<P ID="greeting">Hi!</P>');
   say $dom->at('p[id]')->text;
 
-If XML processing instructions are found, the parser will automatically switch
-into XML mode and everything becomes case-sensitive.
+If an XML declaration is found, the parser will automatically switch into XML
+mode and everything becomes case-sensitive.
 
   # XML semantics
   my $dom = DOM::Tiny->new('<?xml version="1.0"?><P ID="greeting">Hi!</P>');
@@ -486,32 +492,34 @@ XML detection can also be disabled with the L</"xml"> method.
 L<DOM::Tiny> uses a CSS selector engine based on L<Mojo::DOM::CSS>. All CSS
 selectors that make sense for a standalone parser are supported.
 
-=head2 *
+=over
+
+=item Z<>*
 
 Any element.
 
   my $all = $dom->find('*');
 
-=head2 E
+=item E
 
 An element of type C<E>.
 
   my $title = $dom->at('title');
 
-=head2 E[foo]
+=item E[foo]
 
 An C<E> element with a C<foo> attribute.
 
   my $links = $dom->find('a[href]');
 
-=head2 E[foo="bar"]
+=item E[foo="bar"]
 
 An C<E> element whose C<foo> attribute value is exactly equal to C<bar>.
 
   my $case_sensitive = $dom->find('input[type="hidden"]');
   my $case_sensitive = $dom->find('input[type=hidden]');
 
-=head2 E[foo="bar" i]
+=item E[foo="bar" i]
 
 An C<E> element whose C<foo> attribute value is exactly equal to any
 (ASCII-range) case-permutation of C<bar>. Note that this selector is
@@ -525,7 +533,7 @@ This selector is part of
 L<Selectors Level 4|http://dev.w3.org/csswg/selectors-4>, which is still a work
 in progress.
 
-=head2 E[foo~="bar"]
+=item E[foo~="bar"]
 
 An C<E> element whose C<foo> attribute value is a list of whitespace-separated
 values, one of which is exactly equal to C<bar>.
@@ -533,7 +541,7 @@ values, one of which is exactly equal to C<bar>.
   my $foo = $dom->find('input[class~="foo"]');
   my $foo = $dom->find('input[class~=foo]');
 
-=head2 E[foo^="bar"]
+=item E[foo^="bar"]
 
 An C<E> element whose C<foo> attribute value begins exactly with the string
 C<bar>.
@@ -541,7 +549,7 @@ C<bar>.
   my $begins_with = $dom->find('input[name^="f"]');
   my $begins_with = $dom->find('input[name^=f]');
 
-=head2 E[foo$="bar"]
+=item E[foo$="bar"]
 
 An C<E> element whose C<foo> attribute value ends exactly with the string
 C<bar>.
@@ -549,20 +557,20 @@ C<bar>.
   my $ends_with = $dom->find('input[name$="o"]');
   my $ends_with = $dom->find('input[name$=o]');
 
-=head2 E[foo*="bar"]
+=item E[foo*="bar"]
 
 An C<E> element whose C<foo> attribute value contains the substring C<bar>.
 
   my $contains = $dom->find('input[name*="fo"]');
   my $contains = $dom->find('input[name*=fo]');
 
-=head2 E:root
+=item E:root
 
 An C<E> element, root of the document.
 
   my $root = $dom->at(':root');
 
-=head2 E:nth-child(n)
+=item E:nth-child(n)
 
 An C<E> element, the C<n-th> child of its parent.
 
@@ -571,7 +579,7 @@ An C<E> element, the C<n-th> child of its parent.
   my $even  = $dom->find('div:nth-child(even)');
   my $top3  = $dom->find('div:nth-child(-n+3)');
 
-=head2 E:nth-last-child(n)
+=item E:nth-last-child(n)
 
 An C<E> element, the C<n-th> child of its parent, counting from the last one.
 
@@ -580,7 +588,7 @@ An C<E> element, the C<n-th> child of its parent, counting from the last one.
   my $even     = $dom->find('div:nth-last-child(even)');
   my $bottom3  = $dom->find('div:nth-last-child(-n+3)');
 
-=head2 E:nth-of-type(n)
+=item E:nth-of-type(n)
 
 An C<E> element, the C<n-th> sibling of its type.
 
@@ -589,7 +597,7 @@ An C<E> element, the C<n-th> sibling of its type.
   my $even  = $dom->find('div:nth-of-type(even)');
   my $top3  = $dom->find('div:nth-of-type(-n+3)');
 
-=head2 E:nth-last-of-type(n)
+=item E:nth-last-of-type(n)
 
 An C<E> element, the C<n-th> sibling of its type, counting from the last one.
 
@@ -598,109 +606,111 @@ An C<E> element, the C<n-th> sibling of its type, counting from the last one.
   my $even     = $dom->find('div:nth-last-of-type(even)');
   my $bottom3  = $dom->find('div:nth-last-of-type(-n+3)');
 
-=head2 E:first-child
+=item E:first-child
 
 An C<E> element, first child of its parent.
 
   my $first = $dom->find('div p:first-child');
 
-=head2 E:last-child
+=item E:last-child
 
 An C<E> element, last child of its parent.
 
   my $last = $dom->find('div p:last-child');
 
-=head2 E:first-of-type
+=item E:first-of-type
 
 An C<E> element, first sibling of its type.
 
   my $first = $dom->find('div p:first-of-type');
 
-=head2 E:last-of-type
+=item E:last-of-type
 
 An C<E> element, last sibling of its type.
 
   my $last = $dom->find('div p:last-of-type');
 
-=head2 E:only-child
+=item E:only-child
 
 An C<E> element, only child of its parent.
 
   my $lonely = $dom->find('div p:only-child');
 
-=head2 E:only-of-type
+=item E:only-of-type
 
 An C<E> element, only sibling of its type.
 
   my $lonely = $dom->find('div p:only-of-type');
 
-=head2 E:empty
+=item E:empty
 
 An C<E> element that has no children (including text nodes).
 
   my $empty = $dom->find(':empty');
 
-=head2 E:checked
+=item E:checked
 
 A user interface element C<E> which is checked (for instance a radio-button or
 checkbox).
 
   my $input = $dom->find(':checked');
 
-=head2 E.warning
+=item E.warning
 
 An C<E> element whose class is "warning".
 
   my $warning = $dom->find('div.warning');
 
-=head2 E#myid
+=item E#myid
 
 An C<E> element with C<ID> equal to "myid".
 
   my $foo = $dom->at('div#foo');
 
-=head2 E:not(s)
+=item E:not(s)
 
 An C<E> element that does not match simple selector C<s>.
 
   my $others = $dom->find('div p:not(:first-child)');
 
-=head2 E F
+=item E F
 
 An C<F> element descendant of an C<E> element.
 
   my $headlines = $dom->find('div h1');
 
-=head2 E E<gt> F
+=item E E<gt> F
 
 An C<F> element child of an C<E> element.
 
   my $headlines = $dom->find('html > body > div > h1');
 
-=head2 E + F
+=item E + F
 
 An C<F> element immediately preceded by an C<E> element.
 
   my $second = $dom->find('h1 + h2');
 
-=head2 E ~ F
+=item E ~ F
 
 An C<F> element preceded by an C<E> element.
 
   my $second = $dom->find('h1 ~ h2');
 
-=head2 E, F, G
+=item E, F, G
 
 Elements of type C<E>, C<F> and C<G>.
 
   my $headlines = $dom->find('h1, h2, h3');
 
-=head2 E[foo=bar][bar=baz]
+=item E[foo=bar][bar=baz]
 
 An C<E> element whose attributes match all following attribute selectors.
 
   my $links = $dom->find('a[foo^=b][foo$=ar]');
 
+=back
+
 =head1 OPERATORS
 
 L<DOM::Tiny> overloads the following operators.
@@ -777,7 +787,7 @@ objects. All selectors listed in L</"SELECTORS"> are supported.
 
   $dom = $dom->append('<p>I ♥ DOM::Tiny!</p>');
 
-Append HTML/XML fragment to this node.
+Append HTML/XML fragment to this node (for all node types other than C<root>).
 
   # "<div><h1>Test</h1><h2>123</h2></div>"
   $dom->parse('<div><h1>Test</h1></div>')
@@ -810,8 +820,8 @@ node's content.
   my $result = $dom->at('div ~ p');
 
 Find first descendant element of this element matching the CSS selector and
-return it as a L<DOM::Tiny> object or return C<undef> if none could be found.
-All selectors listed in L</"SELECTORS"> are supported.
+return it as a L<DOM::Tiny> object, or C<undef> if none could be found. All
+selectors listed in L</"SELECTORS"> are supported.
 
   # Find first element with "svg" namespace definition
   my $namespace = $dom->at('[xmlns\:svg]')->{'xmlns:svg'};
@@ -967,7 +977,7 @@ L</"SELECTORS"> are supported.
 
   my $namespace = $dom->namespace;
 
-Find this element's namespace or return C<undef> if none could be found.
+Find this element's namespace, or return C<undef> if none could be found.
 
   # Find namespace for an element with namespace prefix
   my $namespace = $dom->at('svg > svg\:circle')->namespace;
@@ -979,8 +989,8 @@ Find this element's namespace or return C<undef> if none could be found.
 
   my $sibling = $dom->next;
 
-Return L<DOM::Tiny> object for next sibling element or C<undef> if there are no
-more siblings.
+Return L<DOM::Tiny> object for next sibling element, or C<undef> if there are
+no more siblings.
 
   # "<h2>123</h2>"
   $dom->parse('<div><h1>Test</h1><h2>123</h2></div>')->at('h1')->next;
@@ -989,7 +999,7 @@ more siblings.
 
   my $sibling = $dom->next_node;
 
-Return L<DOM::Tiny> object for next sibling node or C<undef> if there are no
+Return L<DOM::Tiny> object for next sibling node, or C<undef> if there are no
 more siblings.
 
   # "456"
@@ -1004,8 +1014,11 @@ more siblings.
 
   my $parent = $dom->parent;
 
-Return L<DOM::Tiny> object for parent of this node or C<undef> if this node has
-no parent.
+Return L<DOM::Tiny> object for parent of this node, or C<undef> if this node
+has no parent.
+
+  # "<b><i>Test</i></b>"
+  $dom->parse('<p><b><i>Test</i></b></p>')->at('i')->parent;
 
 =head2 parse
 
@@ -1014,7 +1027,7 @@ no parent.
 Parse HTML/XML fragment.
 
   # Parse XML
-  my $dom = DOM::Tiny->new->xml(1)->parse($xml);
+  my $dom = DOM::Tiny->new->xml(1)->parse('<foo>I ♥ DOM::Tiny!</foo>');
 
 =head2 preceding
 
@@ -1042,7 +1055,7 @@ before this node as L<DOM::Tiny> objects.
 
   $dom = $dom->prepend('<p>I ♥ DOM::Tiny!</p>');
 
-Prepend HTML/XML fragment to this node.
+Prepend HTML/XML fragment to this node (for all node types other than C<root>).
 
   # "<div><h1>Test</h1><h2>123</h2></div>"
   $dom->parse('<div><h2>123</h2></div>')
@@ -1074,7 +1087,7 @@ node's content.
 
   my $sibling = $dom->previous;
 
-Return L<DOM::Tiny> object for previous sibling element or C<undef> if there
+Return L<DOM::Tiny> object for previous sibling element, or C<undef> if there
 are no more siblings.
 
   # "<h1>Test</h1>"
@@ -1084,7 +1097,7 @@ are no more siblings.
 
   my $sibling = $dom->previous_node;
 
-Return L<DOM::Tiny> object for previous sibling node or C<undef> if there are
+Return L<DOM::Tiny> object for previous sibling node, or C<undef> if there are
 no more siblings.
 
   # "123"
@@ -1220,13 +1233,13 @@ C<root>, C<tag> or C<text>.
   my $value = $dom->val;
 
 Extract value from form element (such as C<button>, C<input>, C<option>,
-C<select> and C<textarea>) or return C<undef> if this element has no value. In
+C<select> and C<textarea>), or return C<undef> if this element has no value. In
 the case of C<select> with C<multiple> attribute, find C<option> elements with
-C<selected> attribute and return an array reference with all values or C<undef>
-if none could be found.
+C<selected> attribute and return an array reference with all values, or
+C<undef> if none could be found.
 
   # "a"
-  $dom->parse('<input name="test" value="a">')->at('input')->val;
+  $dom->parse('<input name=test value=a>')->at('input')->val;
 
   # "b"
   $dom->parse('<textarea>b</textarea>')->at('textarea')->val;
@@ -1242,12 +1255,15 @@ if none could be found.
   $dom->parse('<select multiple><option selected>e</option></select>')
     ->at('select')->val->[0];
 
+  # "on"
+  $dom->parse('<input name=test type=checkbox>')->at('input')->val;
+
 =head2 wrap
 
   $dom = $dom->wrap('<div></div>');
 
-Wrap HTML/XML fragment around this node, placing it as the last child of the
-first innermost element.
+Wrap HTML/XML fragment around this node (for all node types other than C<root>),
+placing it as the last child of the first innermost element.
 
   # "<p>123<b>Test</b></p>"
   $dom->parse('<b>Test</b>')->at('b')->wrap('<p>123</p>')->root;
@@ -1265,8 +1281,8 @@ first innermost element.
 
   $dom = $dom->wrap_content('<div></div>');
 
-Wrap HTML/XML fragment around this node's content, placing it as the last
-children of the first innermost element.
+Wrap HTML/XML fragment around this node's content (for C<root> and C<tag>
+nodes), placing it as the last children of the first innermost element.
 
   # "<p><b>123Test</b></p>"
   $dom->parse('<p>Test<p>')->at('p')->wrap_content('<b>123</b>')->root;
@@ -1280,7 +1296,7 @@ children of the first innermost element.
   $dom     = $dom->xml($bool);
 
 Disable HTML semantics in parser and activate case-sensitivity, defaults to
-auto detection based on processing instructions.
+auto detection based on XML declarations.
 
 =head1 COLLECTION METHODS
 
@@ -1339,8 +1355,8 @@ passed to the callback and is also available as C<$_>.
   # Longer version
   my $first = $collection->first(sub { $_->$method(@args) });
 
-  # Find first value that contains the word "dom"
-  my $interesting = $collection->first(qr/dom/i);
+  # Find first value that contains the word "tiny"
+  my $interesting = $collection->first(qr/tiny/i);
 
   # Find first value that is greater than 5
   my $greater = $collection->first(sub { $_ > 5 });
@@ -1371,8 +1387,8 @@ C<$_>.
   # Longer version
   my $new = $collection->grep(sub { $_->$method(@args) });
 
-  # Find all values that contain the word "dom"
-  my $interesting = $collection->grep(qr/dom/i);
+  # Find all values that contain the word "tiny"
+  my $interesting = $collection->grep(qr/tiny/i);
 
   # Find all values that are greater than 5
   my $greater = $collection->grep(sub { $_ > 5 });
@@ -1406,8 +1422,8 @@ passed to the callback and is also available as C<$_>.
   # Longer version
   my $new = $collection->map(sub { $_->$method(@args) });
 
-  # Append the word "dom" to all values
-  my $domified = $collection->map(sub { $_ . 'dom' });
+  # Append the word "tiny" to all values
+  my $domified = $collection->map(sub { $_ . 'tiny' });
 
 =head2 reduce
 
@@ -1501,9 +1517,21 @@ Report any issues on the public bugtracker.
 
 Dan Book <dbook@cpan.org>
 
+Code and tests adapted from L<Mojo::DOM>, a lightweight DOM parser by the L<Mojolicious> team.
+
+=head1 CONTRIBUTORS
+
+=over
+
+=item Matt S Trout (mst)
+
+=back
+
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2015 by Dan Book.
+Copyright (c) 2008-2015 Sebastian Riedel.
+
+Copyright (c) 2015 L</"AUTHOR"> and L</"CONTRIBUTORS"> for adaptation to standalone format.
 
 This is free software, licensed under: