fix use of Mojo::Util::slurp|spurt and Mojo::Home::rel_dir

jberger · Mar 16, 2017 · 4820ebf · 4820ebf
1 parent 0dd725d
commit 4820ebf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/Build.PL b/Build.PL
@@ -11,7 +11,7 @@ my $builder = Module::Build->new(
 
   requires => {
     'perl' => '5.10.1',
-    'Mojolicious' => '5.54',  # Mojo::JSON booleans
+    'Mojolicious' => '7.15',  # Mojo::File
     'Mojolicious::Plugin::Memorize' => 0,
     'Mojolicious::Plugin::Humane' => '0.07',
     'DBD::SQLite' => 0,

diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl module Galileo
 
+0.042 2017-03-15
+    - Fix use of deprecated Mojolicous functions
+      - Bump Mojolicious requirement to 7.15
+
 0.041 2016-08-13
     - Bump Mojolicious requirement to 5.54
     - Fix compatibility with Mojolicious 7.0

diff --git a/lib/Galileo.pm b/lib/Galileo.pm
@@ -1,7 +1,7 @@
 package Galileo;
 use Mojo::Base 'Mojolicious';
 
-our $VERSION = '0.041';
+our $VERSION = '0.042';
 $VERSION = eval $VERSION;
 
 use File::Basename 'dirname';
@@ -118,7 +118,7 @@ sub load_config {
 sub _to_abs {
   my ($self, $dir) = @_;
   unless ( File::Spec->file_name_is_absolute( $dir ) ) {
-    $dir = $self->home->rel_dir( $dir );
+    $dir = $self->home->rel_file( $dir );
   }
   return $dir;
 }

diff --git a/lib/Galileo/Command/dump.pm b/lib/Galileo/Command/dump.pm
@@ -1,7 +1,7 @@
 package Galileo::Command::dump;
 use Mojo::Base 'Mojolicious::Command';
-use File::Spec;
-use Mojo::Util qw/encode spurt/;
+use Mojo::File;
+use Mojo::Util qw/encode/;
 use Getopt::Long qw/GetOptionsFromArray/;
 
 has description => "Dump all stored pages as markdown\n";
@@ -40,13 +40,14 @@ sub run {
 
   my $pages = $self->app->schema->resultset('Page')->search;
   while ( my $page = $pages->next ) {
-    my $file = $page->name . '.md';
-    $file = File::Spec->catfile( $dir, $file ) if $dir;
+    my $file = Mojo::File->new($page->name . '.md');
+    $file = Mojo::File->new($dir)->child("$file") if $dir;
 
     my $content = sprintf "$title\n", $page->title;
     $content .= $page->md;
     $content = encode($encoding, $content) if $encoding;
-    spurt $content, $file;
+
+    $file->spurt($content);
   }
 
   say "Export Complete";

diff --git a/lib/Galileo/Command/setup.pm b/lib/Galileo/Command/setup.pm
@@ -5,7 +5,6 @@ use Mojolicious::Command::daemon;
 
 use Mojolicious::Routes;
 use Mojo::JSON 'j';
-use Mojo::Util 'spurt';
 
 has description => "Configure your Galileo CMS via a web interface\n";
 
@@ -43,7 +42,7 @@ sub run {
       $params{$key} = j($params{$key});
     }
 
-    spurt $self->dumper(\%params), $self->app->config_file;
+    $self->app->config_file->spurt($self->dumper(\%params));
 
     $self->app->load_config;
     $self->humane_flash( 'Configuration saved' );

diff --git a/t/commands.t b/t/commands.t
@@ -7,10 +7,9 @@ use Test::More;
 use Test::Mojo;
 
 use Mojolicious::Commands;
-use Mojo::Util qw/ decode encode slurp /;
-use File::Spec;
-use File::Temp ();
+use Mojo::Util qw/decode encode/;
 use Mojo::JSON qw/true false/;
+use Mojo::File qw/tempdir/;
 
 # dump
 subtest 'Dump' => sub {
@@ -21,7 +20,7 @@ subtest 'Dump' => sub {
   like $dump->usage, qr/dump/, 'has usage information';
 
   # ready to test
-  my $dir = File::Temp->newdir( $ENV{KEEP_TEMP_DIR} ? (CLEANUP => 0) : () );
+  my $dir = tempdir( $ENV{KEEP_TEMP_DIR} ? (CLEANUP => 0) : () );
   my $t   = Galileo::DB::Deploy->create_test_object({test => 1});
   isa_ok $t->app, 'Galileo';
 
@@ -41,9 +40,9 @@ subtest 'Dump' => sub {
       },
     );
     for my $name ( keys %pages ) {
-      my $file = File::Spec->catfile( $dir, "$name.md" );
+      my $file = $dir->child("$name.md");
       ok -e $file, "sample data: $name - exists";
-      my $content = decode 'UTF-8', slurp $file;
+      my $content = decode 'UTF-8', $file->slurp;
       like $content, qr/\A<!-- $pages{$name}{title} -->/, "sample data: $name - title";
       like $content, $pages{$name}{content}, "sample data: $name - content";
     }
@@ -112,9 +111,9 @@ subtest 'Dump' => sub {
     );
     for my $name ( keys %pages ) {
       my $encoded_name = encode 'UTF-8', $name;
-      my $file         = File::Spec->catfile( $dir, "$name.md" );
+      my $file         = $dir->child("$name.md");
       ok -e $file, "sample data: $encoded_name - exists";
-      my $content = decode 'UTF-8', slurp $file;
+      my $content = decode 'UTF-8', $file->slurp;
       like $content, qr/\A<!-- $pages{$name}{title} -->/, "sample data: $encoded_name - title";
       like $content, $pages{$name}{content}, "sample data: $encoded_name - content";
     }