diff --git a/Build.PL b/Build.PL index 36f276a..d5b6116 100644 --- a/Build.PL +++ b/Build.PL @@ -13,7 +13,7 @@ my $builder = Module::Build->new( 'perl' => '5.10.1', 'Mojolicious' => '4.63', # secrets 'Mojolicious::Plugin::Memorize' => 0, - 'Mojolicious::Plugin::Humane' => '0.04', + 'Mojolicious::Plugin::Humane' => '0.07', 'DBD::SQLite' => 0, 'DBIx::Class' => 0, 'DBIx::Class::Candy' => 0, diff --git a/Changes b/Changes index e1817d2..ba0ecad 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,10 @@ Revision history for Perl module Galileo +0.034 2014-05-31 + - Improve compatibility with Mojolicious 5.0 (no bump required) + - Bump Mojolicious::Plugin::Humane to 0.07 + - Fix typo in setup command (crab++) + 0.033 2014-05-10 - Change dump command to accept encoding parameter (keedi++) - dump command now emits UTF-8 by default diff --git a/META.json b/META.json index b622e57..0cd04da 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Joel Berger" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4203", + "generated_by" : "Module::Build version 0.4205", "license" : [ "perl_5" ], @@ -47,7 +47,7 @@ "provides" : { "Galileo" : { "file" : "lib/Galileo.pm", - "version" : "0.033" + "version" : "0.034" }, "Galileo::Admin" : { "file" : "lib/Galileo/Admin.pm" @@ -102,5 +102,5 @@ "url" : "http://github.com/jberger/Galileo" } }, - "version" : "0.033" + "version" : "0.034" } diff --git a/META.yml b/META.yml index 8e1a98c..2c725cc 100644 --- a/META.yml +++ b/META.yml @@ -4,13 +4,13 @@ author: - 'Joel Berger' build_requires: {} configure_requires: - Module::Build: 0.38 + Module::Build: '0.38' dynamic_config: 1 -generated_by: 'Module::Build version 0.4203, CPAN::Meta::Converter version 2.132830' +generated_by: 'Module::Build version 0.4205, CPAN::Meta::Converter version 2.140640' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Galileo no_index: file: @@ -18,7 +18,7 @@ no_index: provides: Galileo: file: lib/Galileo.pm - version: 0.033 + version: '0.034' Galileo::Admin: file: lib/Galileo/Admin.pm Galileo::Command::dump: @@ -29,7 +29,7 @@ provides: file: lib/Galileo/DB/Deploy.pm Galileo::DB::Schema: file: lib/Galileo/DB/Schema.pm - version: 2 + version: '2' Galileo::DB::Schema::Result::Menu: file: lib/Galileo/DB/Schema/Result/Menu.pm Galileo::DB::Schema::Result::Page: @@ -47,23 +47,23 @@ provides: Galileo::User: file: lib/Galileo/User.pm requires: - Crypt::Eksblowfish::Bcrypt: 0 - DBD::SQLite: 0 - DBIx::Class: 0 - DBIx::Class::Candy: 0 - DBIx::Class::DeploymentHandler: 0 - DBIx::Class::EncodedColumn: 0 - File::Copy::Recursive: 0 - File::Next: 0 - File::ShareDir: 1.00 - Mojolicious: 4.63 - Mojolicious::Plugin::Humane: 0.04 - Mojolicious::Plugin::Memorize: 0 - SQL::Translator: 0 - Term::Prompt: 0 + Crypt::Eksblowfish::Bcrypt: '0' + DBD::SQLite: '0' + DBIx::Class: '0' + DBIx::Class::Candy: '0' + DBIx::Class::DeploymentHandler: '0' + DBIx::Class::EncodedColumn: '0' + File::Copy::Recursive: '0' + File::Next: '0' + File::ShareDir: '1.00' + Mojolicious: '4.63' + Mojolicious::Plugin::Humane: '0.04' + Mojolicious::Plugin::Memorize: '0' + SQL::Translator: '0' + Term::Prompt: '0' perl: v5.10.1 resources: bugtracker: http://github.com/jberger/Galileo/issues license: http://dev.perl.org/licenses/ repository: http://github.com/jberger/Galileo -version: 0.033 +version: '0.034' diff --git a/lib/Galileo.pm b/lib/Galileo.pm index d052355..4bac1d9 100644 --- a/lib/Galileo.pm +++ b/lib/Galileo.pm @@ -1,7 +1,7 @@ package Galileo; use Mojo::Base 'Mojolicious'; -our $VERSION = '0.033'; +our $VERSION = '0.034'; $VERSION = eval $VERSION; use File::Basename 'dirname'; diff --git a/lib/Galileo/Command/setup.pm b/lib/Galileo/Command/setup.pm index 02795e6..13921f0 100644 --- a/lib/Galileo/Command/setup.pm +++ b/lib/Galileo/Command/setup.pm @@ -32,8 +32,7 @@ sub run { my $contents = pop; my %args = @_; - $self->render( - partial => 1, + $self->include( #TODO use render_to_string when Mojo 5.00 is required template => 'control_group', 'control_group.contents' => ref $contents ? $contents->() : $contents, 'control_group.label' => $args{label} || '', @@ -159,7 +158,7 @@ __DATA__ %= tag li => begin %= link_to 'Install or upgrade your database' => 'database' -

If this is a new installation you must to run the database setup utility. +

If this is a new installation you must run the database setup utility. If you have not configured Galileo (see above), you will use the defaults, including using an SQLite database for the backend.

% end diff --git a/lib/Galileo/Plugin/Modal.pm b/lib/Galileo/Plugin/Modal.pm index 222b7f8..cda9991 100644 --- a/lib/Galileo/Plugin/Modal.pm +++ b/lib/Galileo/Plugin/Modal.pm @@ -10,9 +10,8 @@ sub register { $app->helper( modal => sub { my ($self, $id, $body) = @_; $body = $body->() if ref $body; - return $self->render( + return $self->include( #TODO use render_to_string when Mojo 5.00 is required template => 'galileo_modal', - partial => 1, 'galileo.modal.id' => $id, 'galileo.modal.body' => $body, );