added last method to Mojo::Collection

mojolicious · Feb 12, 2014 · 8854bca · 8854bca
1 parent 94f6cfa
commit 8854bca
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 4.80  2014-02-12
   - Merged Mojo::DOM::Node into Mojo::DOM.
   - Added next_sibling and previous_sibling methods to Mojo::DOM.
+  - Added last method to Mojo::Collection.
   - Improved many methods in Mojo::DOM to work with all node types.
   - Improved Mojo::DOM::HTML performance.
   - Fixed list parsing bug in Mojo::DOM::HTML.

diff --git a/lib/Mojo/Collection.pm b/lib/Mojo/Collection.pm
@@ -55,6 +55,8 @@ sub grep {
 
 sub join { Mojo::ByteStream->new(join $_[1] // '', map({"$_"} @{$_[0]})) }
 
+sub last { shift->[-1] }
+
 sub map {
   my ($self, $cb) = @_;
   return $self->new(map { $_->$cb } @$self);
@@ -215,6 +217,12 @@ Turn collection into L<Mojo::ByteStream>.
 
   $collection->join("\n")->say;
 
+=head2 last
+
+  my $last = $collection->last;
+
+Return the last element in collection.
+
 =head2 map
 
   my $new = $collection->map(sub {...});

diff --git a/t/mojo/collection.t b/t/mojo/collection.t
@@ -50,6 +50,10 @@ $collection = c();
 is $collection->first, undef, 'no result';
 is $collection->first(sub { defined $_ }), undef, 'no result';
 
+# last
+is c(5, 4, 3)->last, 3, 'right result';
+is c(5, 4, 3)->reverse->last, 5, 'right result';
+
 # grep
 $collection = c(1, 2, 3, 4, 5, 6, 7, 8, 9);
 is_deeply [$collection->grep(qr/[6-9]/)->each], [6, 7, 8, 9], 'right elements';

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -150,7 +150,7 @@ is $dom->at('p')->previous_sibling->previous_sibling, undef,
   'no more siblings';
 is $dom->at('p')->next_sibling->content,      'after', 'right content';
 is $dom->at('p')->next_sibling->next_sibling, undef,   'no more siblings';
-is $dom->at('p')->contents->[-1]->previous_sibling->previous_sibling->content,
+is $dom->at('p')->contents->last->previous_sibling->previous_sibling->content,
   'test', 'right content';
 is $dom->at('p')->contents->first->next_sibling->next_sibling->content,
   ' 456 ', 'right content';
@@ -162,10 +162,10 @@ is $dom->all_contents->[2]->node,    'text',  'right node';
 is $dom->all_contents->[2]->content, 'test',  'right content';
 is $dom->all_contents->[5]->node,    'pi',    'right node';
 is $dom->all_contents->[5]->content, 'after', 'right content';
-is $dom->at('p')->all_contents->[0]->node,     'text',    'right node';
-is $dom->at('p')->all_contents->[0]->content,  'test',    'right node';
-is $dom->at('p')->all_contents->[-1]->node,    'comment', 'right node';
-is $dom->at('p')->all_contents->[-1]->content, ' 456 ',   'right node';
+is $dom->at('p')->all_contents->[0]->node,    'text', 'right node';
+is $dom->at('p')->all_contents->[0]->content, 'test', 'right node';
+is $dom->at('p')->all_contents->last->node,    'comment', 'right node';
+is $dom->at('p')->all_contents->last->content, ' 456 ',   'right node';
 is $dom->contents->[1]->contents->first->parent->type, 'p', 'right type';
 is $dom->contents->[1]->contents->first->content, 'test', 'right content';
 is $dom->contents->[1]->contents->first, 'test', 'right content';
@@ -865,14 +865,14 @@ is_deeply \@li, [qw(A C E G)], 'found all odd li elements';
 @li = ();
 $dom->find('li:nth-last-child(odd)')->each(sub { push @li, shift->text });
 is_deeply \@li, [qw(B D F H)], 'found all odd li elements';
-is $dom->find(':nth-child(odd)')->[0]->type,       'ul', 'right type';
-is $dom->find(':nth-child(odd)')->[1]->text,       'A',  'right text';
-is $dom->find(':nth-child(1)')->[0]->type,         'ul', 'right type';
-is $dom->find(':nth-child(1)')->[1]->text,         'A',  'right text';
-is $dom->find(':nth-last-child(odd)')->[0]->type,  'ul', 'right type';
-is $dom->find(':nth-last-child(odd)')->[-1]->text, 'H',  'right text';
-is $dom->find(':nth-last-child(1)')->[0]->type,    'ul', 'right type';
-is $dom->find(':nth-last-child(1)')->[1]->text,    'H',  'right text';
+is $dom->find(':nth-child(odd)')->[0]->type,      'ul', 'right type';
+is $dom->find(':nth-child(odd)')->[1]->text,      'A',  'right text';
+is $dom->find(':nth-child(1)')->[0]->type,        'ul', 'right type';
+is $dom->find(':nth-child(1)')->[1]->text,        'A',  'right text';
+is $dom->find(':nth-last-child(odd)')->[0]->type, 'ul', 'right type';
+is $dom->find(':nth-last-child(odd)')->last->text, 'H', 'right text';
+is $dom->find(':nth-last-child(1)')->[0]->type, 'ul', 'right type';
+is $dom->find(':nth-last-child(1)')->[1]->text, 'H',  'right text';
 @li = ();
 $dom->find('li:nth-child(2n+1)')->each(sub { push @li, shift->text });
 is_deeply \@li, [qw(A C E G)], 'found all odd li elements';