diff options
author | Jesse Luehrs <doy@tozt.net> | 2012-10-04 17:39:32 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2012-10-04 17:39:32 -0500 |
commit | 813512b43e411bb8657ecc3f9715943afff07b37 (patch) | |
tree | 897a70885293d4a7772e720ea88618f25113316e /lib | |
parent | cfbd9cd78c34ed3f9e123b8a7988d778bc389ef1 (diff) | |
download | text-handlebars-813512b43e411bb8657ecc3f9715943afff07b37.tar.gz text-handlebars-813512b43e411bb8657ecc3f9715943afff07b37.zip |
refactor this so that helpers are just normal functions
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Text/Handlebars.pm | 22 | ||||
-rw-r--r-- | lib/Text/Xslate/Syntax/Handlebars.pm | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/lib/Text/Handlebars.pm b/lib/Text/Handlebars.pm index 471d2f0..11de467 100644 --- a/lib/Text/Handlebars.pm +++ b/lib/Text/Handlebars.pm @@ -64,7 +64,6 @@ sub options { my $options = $class->SUPER::options(@_); $options->{compiler} = 'Text::Handlebars::Compiler'; - $options->{helpers} = {}; return $options; } @@ -88,19 +87,16 @@ sub _register_builtin_methods { return 1 if try { $weakself->find_file($filename); 1 }; return 0; }; + $funcs->{'(run_block_helper)'} = sub { + my ($code, $raw_text, $vars, @args) = @_; - for my $helper (keys %{ $self->{helpers} }) { - my $code = $self->{helpers}{$helper}; - $funcs->{$helper} = sub { - my ($raw_text, $vars, @args) = @_; - my $recurse = sub { - my ($new_vars) = @_; - return $weakself->render_string($raw_text, $new_vars); - }; - - return $code->($vars, @args, { fn => $recurse }); - } - } + my $recurse = sub { + my ($new_vars) = @_; + return $weakself->render_string($raw_text, $new_vars); + }; + + return $code->($vars, @args, { fn => $recurse }); + }; } 1; diff --git a/lib/Text/Xslate/Syntax/Handlebars.pm b/lib/Text/Xslate/Syntax/Handlebars.pm index d99f3d0..69a20c6 100644 --- a/lib/Text/Xslate/Syntax/Handlebars.pm +++ b/lib/Text/Xslate/Syntax/Handlebars.pm @@ -350,11 +350,15 @@ sub std_block { $self->advance(';'); if ($name->arity eq 'call') { - unshift @{ $name->second }, ( - $raw_text->clone, - $self->symbol('(vars)')->clone(arity => 'vars'), + return $self->print_raw( + $self->call( + '(run_block_helper)', + $self->symbol($name->first->id)->clone, + $raw_text->clone, + $self->symbol('(vars)')->clone(arity => 'vars'), + @{ $name->second }, + ), ); - return $self->print_raw($name); } my $iterations = $inverted |