New version of Template::Provider::Pandoc handles the frontmatter.

davorg-cpan · Nov 27, 2024 · 2e9c588 · 2e9c588
1 parent 7f39b4b
commit 2e9c588
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.2.4] - 2024-11-27
+
+### Fixed
+
+- Use new version of Template::Provider, which handles the frontmatter
+
 ## [0.2.3] - 2024-11-25
 
 ### Fixed

diff --git a/Makefile.PL b/Makefile.PL
@@ -17,7 +17,7 @@ WriteMakefile(
     Clone    => 0,
     Template => 0,
     Moose    => 0,
-    'Template::Provider::Pandoc' => 0,
+    'Template::Provider::Pandoc' => '0.1.0', # For STRIP_FRONT_MATTER
     'Text::FrontMatter::YAML' => 0,
     'Path::Tiny' => 0,
     'YAML::XS' => 0,

diff --git a/lib/App/Aphra.pm b/lib/App/Aphra.pm
@@ -39,7 +39,7 @@ use URI;
 
 use App::Aphra::File;
 
-our $VERSION = '0.2.3';
+our $VERSION = '0.2.4';
 
 has commands => (
   isa => 'HashRef',
@@ -151,9 +151,10 @@ sub _build_template {
   return Template->new(
     LOAD_TEMPLATES => [
       Template::Provider::Pandoc->new(
-        INCLUDE_PATH  => $self->include_path,
-        EXTENSIONS    => $exts,
-        OUTPUT_FORMAT => $self->config->{output},
+        INCLUDE_PATH       => $self->include_path,
+        EXTENSIONS         => $exts,
+        OUTPUT_FORMAT      => $self->config->{output},
+        STRIP_FRONT_MATTER => 1,
       ),
     ],
     VARIABLES    => {

diff --git a/lib/App/Aphra/File.pm b/lib/App/Aphra/File.pm
@@ -126,14 +126,13 @@ sub process {
     );
 
     my $front_matter_hashref = $front_matter->frontmatter_hashref // {};
-    my $template_data = $front_matter->data_text;
     my $orig_layout;
     if ($front_matter_hashref->{layout}) {
       $orig_layout = $self->app->template->{SERVICE}{WRAPPER};
       $self->app->template->{SERVICE}{WRAPPER} = [ $front_matter_hashref->{layout} ];
     }
 
-    $self->app->template->process(\$template_data, {
+    $self->app->template->process($template, {
       page => $front_matter_hashref,
       file => $self,
     }, $out)