added next and previous methods to Mojo::DOM

mojolicious · Oct 31, 2012 · f6305c5 · f6305c5
1 parent 9354ce2
commit f6305c5
Show file tree

Hide file tree

Showing 63 changed files with 46 additions and 61 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,8 @@
 
+3.54  2012-11-01
+  - Added next and previous methods to Mojo::DOM.
+  - Improved tests.
+
 3.53  2012-10-31
   - Replaced Mojolicious::Guides::CodingGuidelines with
     Mojolicious::Guides::Contributing.

diff --git a/lib/Mojo/DOM.pm b/lib/Mojo/DOM.pm
@@ -151,6 +151,8 @@ sub namespace {
   return '';
 }
 
+sub next { shift->_sibling(1) }
+
 sub parent {
   my $self = shift;
 
@@ -178,6 +180,8 @@ sub prepend_content {
   return $self;
 }
 
+sub previous { shift->_sibling(0) }
+
 sub remove { shift->replace('') }
 
 sub replace {
@@ -344,6 +348,24 @@ sub _parser {
   return $self;
 }
 
+sub _sibling {
+  my ($self, $next) = @_;
+
+  # Root
+  return undef unless my $parent = $self->parent;
+
+  # Find previous or next sibling
+  my ($candidate, $current);
+  for my $child ($parent->children->each) {
+    ++$current and next if $child->tree eq $self->tree;
+    return $next ? $child : $candidate if $current;
+    $candidate = $child;
+  }
+
+  # No siblings
+  return undef;
+}
+
 sub _text {
   my ($elements, $recurse, $trim) = @_;
 
@@ -570,6 +592,12 @@ Find element namespace.
   # Find namespace for an element that may or may not have a namespace prefix
   my $namespace = $dom->at('svg > circle')->namespace;
 
+=head2 C<next>
+
+  my $sibling = $dom->next;
+
+Next sibling of element.
+
 =head2 C<parent>
 
   my $parent = $dom->parent;
@@ -603,6 +631,12 @@ Prepend to element content.
   # "<div><h2>AB</h2></div>"
   $dom->parse('<div><h2>B</h2></div>')->at('h2')->prepend_content('A')->root;
 
+=head2 C<previous>
+
+  my $sibling = $dom->previous;
+
+Previous sibling of element.
+
 =head2 C<remove>
 
   my $old = $dom->remove;

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -38,7 +38,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.53';
+our $VERSION  = '3.54';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/lib/Mojolicious/Command/generate/plugin.pm b/lib/Mojolicious/Command/generate/plugin.pm
@@ -79,7 +79,6 @@ L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojolicious::Lite;
 use Test::Mojo;
 

diff --git a/t/mojo/app.t b/t/mojo/app.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo;
 use Mojo::IOLoop;
 use Mojo::Server::Daemon;

diff --git a/t/mojo/asset.t b/t/mojo/asset.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Asset::File;
 use Mojo::Asset::Memory;
 

diff --git a/t/mojo/bytestream.t b/t/mojo/bytestream.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use File::Spec::Functions qw(catfile splitdir);
 use File::Temp 'tempdir';
 use FindBin;

diff --git a/t/mojo/cache.t b/t/mojo/cache.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Cache;
 
 my $cache = Mojo::Cache->new(max_keys => 2);

diff --git a/t/mojo/cgi.t b/t/mojo/cgi.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Message::Response;
 use Mojo::Server::CGI;
 use Mojolicious::Command::cgi;

diff --git a/t/mojo/collection.t b/t/mojo/collection.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Collection 'c';
 
 # Array

diff --git a/t/mojo/content.t b/t/mojo/content.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Content::MultiPart;
 use Mojo::Content::Single;
 

diff --git a/t/mojo/cookie.t b/t/mojo/cookie.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Cookie::Request;
 use Mojo::Cookie::Response;
 

diff --git a/t/mojo/cookiejar.t b/t/mojo/cookiejar.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Cookie::Response;
 use Mojo::URL;
 use Mojo::UserAgent::CookieJar;

diff --git a/t/mojo/date.t b/t/mojo/date.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Date;
 
 # RFC 822/1123

diff --git a/t/mojo/delay.t b/t/mojo/delay.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo::IOLoop;
 use Mojo::IOLoop::Delay;
 

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::DOM;
 use Mojo::Util 'encode';
 
@@ -128,6 +127,13 @@ is $dom->at('[class$="ing"]')->type,    'simple', 'right type';
 is $dom->at('[class="working"]')->type, 'simple', 'right type';
 is $dom->at('[class$=ing]')->type,      'simple', 'right type';
 is $dom->at('[class=working]')->type,   'simple', 'right type';
+is $dom->at('foo > simple')->next->type, 'test', 'right type';
+is $dom->at('foo > simple')->next->next->type, 'a', 'right type';
+is $dom->at('foo > test')->previous->type, 'simple', 'right type';
+is $dom->next,     undef, 'no siblings';
+is $dom->previous, undef, 'no siblings';
+is $dom->at('foo > a')->next,          undef, 'no next sibling';
+is $dom->at('foo > simple')->previous, undef, 'no previous sibling';
 
 # Class and ID
 $dom = Mojo::DOM->new->parse('<div id="id" class="class">a</div>');

diff --git a/t/mojo/eventemitter.t b/t/mojo/eventemitter.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::EventEmitter;
 
 # Normal event

diff --git a/t/mojo/headers.t b/t/mojo/headers.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Headers;
 
 # Basic functionality

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -4,7 +4,6 @@ use Mojo::Base -strict;
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;
-
 use Cwd qw(cwd realpath);
 use File::Spec::Functions qw(canonpath catdir splitdir);
 use FindBin;

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo::IOLoop;
 use Mojo::IOLoop::Client;
 use Mojo::IOLoop::Delay;

diff --git a/t/mojo/json.t b/t/mojo/json.t
@@ -11,7 +11,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::ByteStream 'b';
 use Mojo::JSON;
 

diff --git a/t/mojo/json_pointer.t b/t/mojo/json_pointer.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::JSON::Pointer;
 
 # "contains" (hash)

diff --git a/t/mojo/log.t b/t/mojo/log.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use File::Spec::Functions 'catdir';
 use File::Temp 'tempdir';
 use Mojo::Asset::File;

diff --git a/t/mojo/parameters.t b/t/mojo/parameters.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::Parameters;
 
 # Basic functionality

diff --git a/t/mojo/path.t b/t/mojo/path.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::Path;
 
 # Basic functionality

diff --git a/t/mojo/psgi.t b/t/mojo/psgi.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::JSON;
 use Mojo::Server::PSGI;
 use Mojolicious::Command::psgi;

diff --git a/t/mojo/reactor_poll.t b/t/mojo/reactor_poll.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use IO::Socket::INET;
 use Mojo::Reactor::Poll;
 

diff --git a/t/mojo/request.t b/t/mojo/request.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use File::Spec::Functions 'catfile';
 use File::Temp 'tempdir';
 use Mojo::Content::Single;

diff --git a/t/mojo/request_cgi.t b/t/mojo/request_cgi.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Message::Request;
 
 # Parse Lighttpd CGI environment variables and body

diff --git a/t/mojo/response.t b/t/mojo/response.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Asset::File;
 use Mojo::Content::Single;
 use Mojo::Content::MultiPart;

diff --git a/t/mojo/template.t b/t/mojo/template.t
@@ -18,7 +18,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use File::Spec::Functions qw(catfile splitdir);
 use FindBin;
 use Mojo::Template;

diff --git a/t/mojo/transactor.t b/t/mojo/transactor.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use File::Spec::Functions 'catdir';
 use FindBin;
 use Mojo::URL;

diff --git a/t/mojo/url.t b/t/mojo/url.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use Mojo::URL;
 
 # Simple

diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo::IOLoop;
 use Mojo::UserAgent;
 use Mojolicious::Lite;

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -3,7 +3,6 @@ use Mojo::Base -strict;
 use utf8;
 
 use Test::More;
-
 use File::Spec::Functions qw(catfile splitdir);
 use File::Temp 'tempdir';
 use FindBin;

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use IO::Socket::INET;
 use Mojo::IOLoop;
 use Mojo::Transaction::WebSocket;

diff --git a/t/mojo/websocket_frames.t b/t/mojo/websocket_frames.t
@@ -1,7 +1,6 @@
 use Mojo::Base -strict;
 
 use Test::More;
-
 use Mojo::Transaction::WebSocket;
 
 # Simple text frame roundtrip

diff --git a/t/mojo/websocket_proxy.t b/t/mojo/websocket_proxy.t
@@ -7,7 +7,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo::IOLoop;
 use Mojo::Server::Daemon;
 use Mojo::UserAgent;

diff --git a/t/mojolicious/charset_lite_app.t b/t/mojolicious/charset_lite_app.t
@@ -9,7 +9,6 @@ BEGIN {
 }
 
 use Test::More;
-
 use Mojo::ByteStream 'b';
 use Mojolicious::Lite;
 use Test::Mojo;

diff --git a/t/mojolicious/command.t b/t/mojolicious/command.t
@@ -4,7 +4,6 @@ use Mojo::Base -strict;
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;
-
 use Cwd 'cwd';
 use File::Spec::Functions 'catdir';
 use File::Temp 'tempdir';