match keys only once

mojolicious · Aug 12, 2014 · c1eeadc · c1eeadc
1 parent ea20e1d
commit c1eeadc
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -71,15 +71,16 @@ sub get_helper {
   my ($self, $name) = @_;
 
   if (my $h = $self->helpers->{$name} || $self->{proxy}{$name}) { return $h }
-  return undef unless grep {/^\Q$name\E\./} my @keys = keys %{$self->helpers};
-
-  my $class = 'Mojolicious::Renderer::Helpers::' . md5_sum("$name:$self");
-  for my $key (@keys) {
-    next unless $key =~ /^(\Q$name\E\.([^.]+))/;
-    my $export = $2;
-    my $sub    = $self->get_helper($1);
-    monkey_patch $class, $export => sub { ${shift()}->$sub(@_) };
+
+  my ($found, $class);
+  for my $key (keys %{$self->helpers}) {
+    $key =~ /^(\Q$name\E\.([^.]+))/ ? ($found, my $method) = (1, $2) : next;
+    my $sub = $self->get_helper($1);
+    $class ||= 'Mojolicious::Renderer::Helpers::' . md5_sum("$name:$self");
+    monkey_patch $class, $method => sub { ${shift()}->$sub(@_) };
   }
+
+  return undef unless $found;
   return $self->{proxy}{$name} = sub { bless \shift, $class };
 }