Plugin: deprecate RendererHelper

diff --git a/src/newslash_web/lib/Newslash/Plugin/Epoch.pm b/src/newslash_web/lib/Newslash/Plugin/Epoch.pm
index bffa54e..a7b3e5f 100644 (file)
--- a/src/newslash_web/lib/Newslash/Plugin/Epoch.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/Epoch.pm
@@ -7,8 +7,6 @@ sub register {
 
     $self->update;
     $app->helper(epoch => sub { state $epoch = $self; });
-
-    $app->renderer_helper->add_function("Newslash", epoch => sub { return $self->get });
 }
 
 sub get {

diff --git a/src/newslash_web/lib/Newslash/Plugin/TT2Renderer.pm b/src/newslash_web/lib/Newslash/Plugin/TT2Renderer.pm
index 8550cfe..8894412 100644 (file)
--- a/src/newslash_web/lib/Newslash/Plugin/TT2Renderer.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/TT2Renderer.pm
@@ -157,22 +157,19 @@ sub register {
                                 }
 
                                 my $vars = $c->stash;
-
                                  $vars->{Newslash} = {};
                                  $vars->{Newslash}->{config} = $c->app->config;
 
-                                 $vars->{helpers} = {};
-
                                  # register helpers
+                                 $vars->{helpers} = {};
                                  my $helpers = $renderer->helpers;
                                  for my $helper (keys %$helpers) {
-                                     $vars->{helpers}->{$helper} = sub { $helpers->{$helper}->($c, @_); };
-                                 }
-
-                                 if ($app->renderer_helper) {
-                                     my $funcs = $app->renderer_helper->get_functions('Newslash');
-                                     for my $name (keys %$funcs) {
-                                         $vars->{Newslash}->{$name} = $funcs->{$name};
+                                     my $f = $helpers->{$helper};
+                                     if (ref($f) eq 'CODE') {
+                                         $vars->{helpers}->{$helper} = sub { $helpers->{$helper}->($c, @_); };
+                                     }
+                                     else {
+                                         $vars->{helpers}->{$helper} = $helpers->{$helper};
                                      }
                                  }
 

diff --git a/src/newslash_web/lib/Newslash/Plugin/RendererHelper.pm b/src/newslash_web/lib/Newslash/Plugin/deprecated/RendererHelper.pm
similarity index 100%
rename from src/newslash_web/lib/Newslash/Plugin/RendererHelper.pm
rename to src/newslash_web/lib/Newslash/Plugin/deprecated/RendererHelper.pm

diff --git a/src/newslash_web/lib/Newslash/Web.pm b/src/newslash_web/lib/Newslash/Web.pm
index ab3316a..d8d803e 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web.pm
+++ b/src/newslash_web/lib/Newslash/Web.pm
@@ -74,7 +74,7 @@ sub startup {
     $app->log->level('debug') if $app->mode eq 'test';
 
     # renderer helper
-    $app->plugin('Newslash::Plugin::RendererHelper');
+    # $app->plugin('Newslash::Plugin::RendererHelper');
 
     # enable logging
     $app->plugin('Newslash::Plugin::AccessLog::Debug', $app->config->{Log} || {});

diff --git a/src/newslash_web/templates/common/header.html.tt2 b/src/newslash_web/templates/common/header.html.tt2
index 01ee9b2..98efd9c 100644 (file)
--- a/src/newslash_web/templates/common/header.html.tt2
+++ b/src/newslash_web/templates/common/header.html.tt2
@@ -44,7 +44,7 @@
   [% NS.load_js("vue-newslash.js") %]
 
 
-  <script src="/siteconfig/[% Newslash.epoch() %]/siteconfig.js"></script>
+  <script src="/siteconfig/[% helpers.epoch.get() %]/siteconfig.js"></script>
 
   [%- ad_code("head-element") %]