Fix errors related to slurping and spewing

Kelp-framework · Jul 1, 2024 · 192d540 · 192d540
1 parent cc67c13
commit 192d540
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,10 @@
 Revision history for Kelp
 
+{NEXT}
+            [Changes]
+            - Fixed config files having incorrect line endings on Windows due to raw slurp
+            - Fixed generation templates not handling UTF8 correctly
+
 2.13 - 2024-07-01
             [New Interface]
             - Kelp::Base can now be imported with -attr

diff --git a/bin/kelp-generator b/bin/kelp-generator
@@ -65,7 +65,7 @@ for my $filedata (@$files) {
     }
 
     _say("Writing file: $filename");
-    $file->spew($contents);
+    $file->spew({binmode => ':encoding(UTF-8)'}, $contents);
 }
 
 sub _say {

diff --git a/lib/Kelp/Generator.pm b/lib/Kelp/Generator.pm
@@ -64,7 +64,7 @@ sub get_template
         $dest_file =~ s/DOT/./g;
 
         # process the template, if it is .gen (generated)
-        my $contents = $file->slurp;
+        my $contents = $file->slurp({binmode => ':encoding(UTF-8)'});
         if ($dest_file =~ /\.gen$/) {
             $dest_file =~ s/\.gen$//;
             $contents = $tt->process(\$contents, $vars);

diff --git a/lib/Kelp/Module/Config.pm b/lib/Kelp/Module/Config.pm
@@ -111,7 +111,7 @@ sub load
     # Open and read file
     my $text;
     try {
-        $text = path($filename)->slurp_utf8;
+        $text = path($filename)->slurp({binmode => ':encoding(UTF-8)'});
     };
 
     if (!defined $text) {