Skip to content

Commit

Permalink
Improved compatibility with Mojolicious 5.00
Browse files Browse the repository at this point in the history
  • Loading branch information
jberger committed May 31, 2014
1 parent f1e9ae4 commit 8d7cfd5
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Build.PL
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions 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
Expand Down
6 changes: 3 additions & 3 deletions META.json
Expand Up @@ -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"
],
Expand Down Expand Up @@ -47,7 +47,7 @@
"provides" : {
"Galileo" : {
"file" : "lib/Galileo.pm",
"version" : "0.033"
"version" : "0.034"
},
"Galileo::Admin" : {
"file" : "lib/Galileo/Admin.pm"
Expand Down Expand Up @@ -102,5 +102,5 @@
"url" : "http://github.com/jberger/Galileo"
}
},
"version" : "0.033"
"version" : "0.034"
}
40 changes: 20 additions & 20 deletions META.yml
Expand Up @@ -4,21 +4,21 @@ 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:
- README.pod
provides:
Galileo:
file: lib/Galileo.pm
version: 0.033
version: '0.034'
Galileo::Admin:
file: lib/Galileo/Admin.pm
Galileo::Command::dump:
Expand All @@ -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:
Expand All @@ -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'
2 changes: 1 addition & 1 deletion 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';
Expand Down
5 changes: 2 additions & 3 deletions lib/Galileo/Command/setup.pm
Expand Up @@ -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} || '',
Expand Down Expand Up @@ -159,7 +158,7 @@ __DATA__
%= tag li => begin
%= link_to 'Install or upgrade your database' => 'database'
<p>If this is a new installation you <b>must</b> to run the database setup utility.
<p>If this is a new installation you <b>must</b> 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.</p>
% end
Expand Down
3 changes: 1 addition & 2 deletions lib/Galileo/Plugin/Modal.pm
Expand Up @@ -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,
);
Expand Down

0 comments on commit 8d7cfd5

Please sign in to comment.