From: Errietta Kostala Date: Wed, 27 Aug 2014 09:16:20 +0000 (+0100) Subject: -POND +JSONY X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3c0f77d2c102e47147fb984935b9f921e31e4382;p=scpubgit%2FApp-SCS.git -POND +JSONY --- diff --git a/Makefile.PL b/Makefile.PL index 59c1e05..3fa8805 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -12,7 +12,6 @@ WriteMakefile( 'HTML::Zoom' => 0, 'IO::All' => 0, 'Text::MultiMarkdown' => 0, - 'Data::Pond' => 0, 'Safe::Isa' => 0, 'Syntax::Keyword::Gather' => 0, 'Try::Tiny' => 0, diff --git a/lib/App/SCS/Page.pm b/lib/App/SCS/Page.pm index 28edde4..9a01b9e 100644 --- a/lib/App/SCS/Page.pm +++ b/lib/App/SCS/Page.pm @@ -2,7 +2,6 @@ package App::SCS::Page; use IO::All; use Time::Local qw(timelocal); -use Data::Pond qw(pond_read_datum pond_write_datum); use List::Util qw(reduce); use Module::Runtime qw(use_module); use HTML::Zoom; diff --git a/lib/App/SCS/PageSet.pm b/lib/App/SCS/PageSet.pm index d276840..5de5f7c 100644 --- a/lib/App/SCS/PageSet.pm +++ b/lib/App/SCS/PageSet.pm @@ -12,7 +12,6 @@ use Module::Runtime qw(use_module); use JSON::MaybeXS; use Moo; use Hash::Merge qw(merge); -use Data::Pond qw(pond_read_datum pond_write_datum); use JSONY; with 'App::SCS::Role::PageChildren'; @@ -94,7 +93,7 @@ sub _inflate { my $jsony = JSONY->new; my $config = reduce { merge($a, $jsony->load($b->all)) } [], @config_files; - $extracted->{plugins} = pond_read_datum('[' . $extracted->{plugins} . ']'); + $extracted->{plugins} = $jsony->load($extracted->{plugins}); my $setup = $extracted;