sort method to Mojo::Collection can use $a,$b

mojolicious · Aug 5, 2014 · f2e2e4f · f2e2e4f
1 parent 556a858
commit f2e2e4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/Mojo/Collection.pm b/lib/Mojo/Collection.pm
@@ -92,7 +92,17 @@ sub slice {
 
 sub sort {
   my ($self, $cb) = @_;
-  return $self->new($cb ? sort { $a->$cb($b) } @$self : sort @$self);
+
+  return $self->new(sort @$self) unless $cb;
+
+  my $caller = caller;
+  no strict 'refs';
+  return $self->new(
+    sort {
+      local (*{"$caller\::a"}, *{"$caller\::b"}) = (\$a, \$b);
+      $a->$cb($b);
+    } @$self
+  );
 }
 
 sub tap { shift->Mojo::Base::tap(@_) }
@@ -299,7 +309,7 @@ Number of elements in collection.
 Sort elements based on return value of callback and create a new collection
 from the results.
 
-  my $insensitive = $collection->sort(sub { uc(shift) cmp uc(shift) });
+  my $insensitive = $collection->sort(sub { uc($a) cmp uc($b) });
 
 =head2 tap
 

diff --git a/t/mojo/collection.t b/t/mojo/collection.t
@@ -121,6 +121,8 @@ is c()->reduce(sub { $a + $b }), undef, 'no result';
 # sort
 $collection = c(2, 5, 4, 1);
 is_deeply [$collection->sort->each], [1, 2, 4, 5], 'right order';
+is_deeply [$collection->sort(sub { $b cmp $a })->each], [5, 4, 2, 1],
+  'right order';
 is_deeply [$collection->sort(sub { $_[1] cmp $_[0] })->each], [5, 4, 2, 1],
   'right order';
 $collection = c(qw(Test perl Mojo));