Better config logic

[scpubgit/App-SCS.git] / lib / App / SCS / Page.pm

diff --git a/lib/App/SCS/Page.pm b/lib/App/SCS/Page.pm
index 8cc33d9..28edde4 100644 (file)
--- a/lib/App/SCS/Page.pm
+++ b/lib/App/SCS/Page.pm
@@ -17,17 +17,10 @@ sub _my_path { io->dir($_[0]->_top_dir)->catdir($_[0]->path) }
 with 'App::SCS::Role::PageChildren';
 
 has $_ => (is => 'ro') for qw(
-  title subtitle description keywords plugins html created path
+  title subtitle description keywords  html created path
 );
 
-has plugin_config => (is => 'lazy');
-
-sub _build_plugin_config {
-  my ($self) = @_;
-  $self->plugins
-    ? pond_read_datum('[ '.$self->plugins.' ]')
-    : []
-}
+has plugin_config => (is => 'rw', 'required' => 1);
 
 sub has_plugin_config { exists $_[0]->plugin_config->{$_[1]} }
 
@@ -42,12 +35,10 @@ sub with_plugin_config {
         : ($name, $config)
     );
   }
-  return $self->with(plugins => pond_write_datum(\@new));
+  return $self->with(plugin_config => \@new);
 }
 
-has _page_plugins => (is => 'lazy');
-
-sub _build__page_plugins {
+has _raw_page_plugins => (is => 'lazy', builder => sub {
   my ($self) = @_;
   my $plugin_config = $self->plugin_config;
   my ($plugin_map, $defaults) = @{$self->_page_set->plugin_config}
@@ -58,11 +49,18 @@ sub _build__page_plugins {
     my $info = $plugin_map->{$name};
     push @plugins,
       use_module($info->{class})->new(
-        ($info->{config}||sub{})->(), %$config, page => $self
+        ($info->{config}||sub{})->(), %$config, page => $self,
+        plugin_map => $plugin_map, # some things will need this
       );
   }
   return \@plugins;
-}
+});
+
+has _page_plugins => (is => 'lazy', builder => sub {
+  my ($self) = @_;
+  my $raw = $self->_raw_page_plugins;
+  reduce { $b->filter_plugins($a) } $raw, @$raw;
+});
 
 sub published_at {
   $_[0]->created