This is an automated email from the git hooks/post-receive script. dmn pushed a commit to branch dam-bundle-2.0 in repository libcatalyst-modules-perl.
commit 72d429792554aa5b118cae4f51909fd6099481de Author: Damyan Ivanov <d...@debian.org> Date: Thu May 8 13:45:04 2014 +0000 update Catalyst-Plugin-ConfigLoader to 0.34 --- sources/Catalyst-Plugin-ConfigLoader/Changes | 12 ++- sources/Catalyst-Plugin-ConfigLoader/Makefile.PL | 2 +- .../lib/Catalyst/Plugin/ConfigLoader.pm | 5 +- .../t/21-mock_load_env.t | 2 +- .../t/25-setting-config-file.t | 113 +++++++++++++++++++++ .../Catalyst-Plugin-ConfigLoader/t/lib/TestApp1.pm | 20 ++++ .../t/lib/TestApp1/Controller/Config.pm | 19 ++++ .../t/lib/TestApp1/Controller/Root.pm | 16 +++ .../t/lib/TestApp1/customconfig.pl | 3 + .../t/lib/TestApp1/testapp1.pl | 5 + .../Catalyst-Plugin-ConfigLoader/t/lib/TestApp2.pm | 26 +++++ .../t/lib/TestApp2/Controller/Config.pm | 19 ++++ .../t/lib/TestApp2/Controller/Root.pm | 16 +++ .../t/lib/TestApp2/customconfig.pl | 3 + .../t/lib/TestApp2/testapp2.pl | 5 + .../Catalyst-Plugin-ConfigLoader/t/lib/TestApp3.pm | 26 +++++ .../t/lib/TestApp3/Controller/Config.pm | 18 ++++ .../t/lib/TestApp3/Controller/Root.pm | 16 +++ .../t/lib/TestApp3/config/another_file.pl | 3 + .../t/lib/TestApp3/config/testapp3.pl | 3 + .../t/lib/TestApp3/testapp3.pl | 5 + .../Catalyst-Plugin-ConfigLoader/t/lib/TestApp4.pm | 26 +++++ .../t/lib/TestApp4/Controller/Config.pm | 18 ++++ .../t/lib/TestApp4/Controller/Root.pm | 16 +++ .../t/lib/TestApp4/config.d/another_file.pl | 3 + .../t/lib/TestApp4/config.d/testapp4.pl | 3 + .../t/lib/TestApp4/testapp.pl | 5 + 27 files changed, 403 insertions(+), 5 deletions(-) diff --git a/sources/Catalyst-Plugin-ConfigLoader/Changes b/sources/Catalyst-Plugin-ConfigLoader/Changes index 5961ccd..2463863 100644 --- a/sources/Catalyst-Plugin-ConfigLoader/Changes +++ b/sources/Catalyst-Plugin-ConfigLoader/Changes @@ -1,5 +1,15 @@ Revision history for Perl extension Catalyst::Plugin::ConfigLoader. +0.34 Wed Apr 16 2014 + - Repackage without non-standard tarball headers. + +0.33 Mon Jan 13 2014 + - Fix config loading so that if passed a directory including + a . in the file name, then loading it as a directory works + (would have previously tried to force a specific filename + and failed) + - More comprehensive tests + 0.32 Thu Mar 14 2013 - Don't ship .git inside the tarball, whoops. @@ -30,7 +40,7 @@ Revision history for Perl extension Catalyst::Plugin::ConfigLoader. k-v pairs (RT #48557) 0.25 Fri Aug 07 2009 - - Fix get_config_local_suffix and get_config_path when finding values + - Fix get_config_local_suffix and get_config_path when finding values from ENV vars (RT #47937) 0.24 Mon Jun 29 2009 diff --git a/sources/Catalyst-Plugin-ConfigLoader/Makefile.PL b/sources/Catalyst-Plugin-ConfigLoader/Makefile.PL index 168def1..ba141db 100644 --- a/sources/Catalyst-Plugin-ConfigLoader/Makefile.PL +++ b/sources/Catalyst-Plugin-ConfigLoader/Makefile.PL @@ -15,8 +15,8 @@ requires 'Config::Any' => '0.20'; requires 'MRO::Compat' => '0.09'; test_requires 'Test::More'; +test_requires 'Path::Class'; resources repository => 'git://git.shadowcat.co.uk/catagits/Catalyst-Plugin-ConfigLoader.git'; WriteAll; - diff --git a/sources/Catalyst-Plugin-ConfigLoader/lib/Catalyst/Plugin/ConfigLoader.pm b/sources/Catalyst-Plugin-ConfigLoader/lib/Catalyst/Plugin/ConfigLoader.pm index 4fcfdf1..753b76f 100644 --- a/sources/Catalyst-Plugin-ConfigLoader/lib/Catalyst/Plugin/ConfigLoader.pm +++ b/sources/Catalyst-Plugin-ConfigLoader/lib/Catalyst/Plugin/ConfigLoader.pm @@ -8,7 +8,7 @@ use MRO::Compat; use Data::Visitor::Callback; use Catalyst::Utils (); -our $VERSION = '0.32'; +our $VERSION = '0.34'; =head1 NAME @@ -183,7 +183,8 @@ sub get_config_path { || $c->config->{ 'Plugin::ConfigLoader' }->{ file } || $c->path_to( $prefix ); - my ( $extension ) = ( $path =~ m{\.([^\/\\.]{1,4})$} ); + ## don't look for extension if this is a dir + my ( $extension ) = !-d $path ? ( $path =~ m{\.([^\/\\.]{1,4})$} ) : () ; if ( -d $path ) { $path =~ s{[\/\\]$}{}; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t b/sources/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t index 5cc3ff5..ad0dd2a 100644 --- a/sources/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t +++ b/sources/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t @@ -6,7 +6,7 @@ use Cwd; # Remove all relevant env variables to avoid accidental fail foreach my $name ( grep { m{^(CATALYST|MOCKAPP)} } keys %ENV ) { delete $ENV{ $name }; -} +} $ENV{ CATALYST_HOME } = cwd . '/t/mockapp'; $ENV{ MOCKAPP_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl'; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/25-setting-config-file.t b/sources/Catalyst-Plugin-ConfigLoader/t/25-setting-config-file.t new file mode 100644 index 0000000..7799937 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/25-setting-config-file.t @@ -0,0 +1,113 @@ +use strict; +use warnings; + +use FindBin; +use lib "$FindBin::Bin/lib"; + +use Test::More; + +BEGIN { + + # Remove all relevant env variables to avoid accidental fail + foreach my $name ( grep { m{^(CATALYST|MOCKAPP)} } keys %ENV ) { + delete $ENV{ $name }; + } + + eval { require Catalyst; Catalyst->VERSION( '5.80001' ); }; + + plan skip_all => 'Catalyst 5.80001 required' if $@; + plan tests => 18; + + use Catalyst::Test (); + +} + +## TestApp1: a .conf config file exists but should not be loaded +{ + + Catalyst::Test->import('TestApp1'); + + note( "TestApp1" ); + + ok my ( $res, $c ) = ctx_request( '/' ), 'context object'; + + isa_ok( $c, "TestApp1" ); + + subtest "normal config loaded" => sub { + + is( get( '/appconfig/foo' ), "bar1", "config var foo ok" ); + + ## a config var not set will give a blank web page hence "" + is( get( '/appconfig/bar' ), "", "config var in custom config" ); + + }; + is( get( '/appconfig/bar' ), "", "custom config not loaded" ); +} + +## TestApp2: config points to a file in addition to normal config and +## should get loaded +{ + Catalyst::Test->import('TestApp2'); + + note( "TestApp2" ); + + ok my ( $res, $c ) = ctx_request( '/' ), 'context object'; + + isa_ok( $c, "TestApp2" ); + + subtest "normal config loaded" => sub { + + is( get( '/appconfig/foo' ), "bar2", "config var foo" ); + + is( get( '/appconfig/unspecified_variable' ), "", "unknown config var" ); + + }; + + is( get( '/appconfig/bar' ), "baz2", "custom config loaded" ); +} + +## TestApp3: config points to a directory +{ + Catalyst::Test->import('TestApp3'); + + note( "TestApp3" ); + + ok my ( $res, $c ) = ctx_request( '/' ), 'context object'; + + isa_ok( $c, "TestApp3" ); + + subtest "normal config loaded" => sub { + + is( get( '/appconfig/foo' ), "bar3", "config var foo" ); + + is( get( '/appconfig/unspecified_variable' ), "", "unknown config var" ); + + }; + + is( get( '/appconfig/test3_conf3' ), "a_value", "custom config var3 set" ); + is( get( '/appconfig/test3_conf4' ), "", "custom config var4 not set" ); + +} + +## TestApp4: config points to a directory with a suffix +{ + Catalyst::Test->import('TestApp4'); + + note( "TestApp4" ); + + ok my ( $res, $c ) = ctx_request( '/' ), 'context object'; + + isa_ok( $c, "TestApp4" ); + + subtest "normal config loaded" => sub { + + is( get( '/appconfig/foo' ), "bar4", "config var foo" ); + + is( get( '/appconfig/unspecified_variable' ), "", "unknown config var" ); + + }; + + is( get( '/appconfig/test4_conf3' ), "a_value", "custom config var3 set" ); + is( get( '/appconfig/test4_conf4' ), "", "custom config var4 not set" ); + +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1.pm new file mode 100644 index 0000000..dd15629 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1.pm @@ -0,0 +1,20 @@ +package TestApp1; + +use strict; +use warnings; + +use MRO::Compat; + +use Catalyst qw/ConfigLoader/; + +our $VERSION = '0.01'; + +__PACKAGE__->setup; + +sub finalize_config { + my $c = shift; + $c->config( foo => 'bar1' ); + $c->next::method( @_ ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Config.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Config.pm new file mode 100644 index 0000000..95ddd93 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Config.pm @@ -0,0 +1,19 @@ +package TestApp1::Controller::Config; + +use strict; +use warnings; + +use base qw( Catalyst::Controller ); + +sub index : Private { + my ( $self, $c ) = @_; + $c->res->output( $self->{ foo } ); +} + +sub appconfig : Global { + my ( $self, $c, $var ) = @_; + + $c->res->body( $c->config->{ $var } ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Root.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Root.pm new file mode 100644 index 0000000..24f6d76 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/Controller/Root.pm @@ -0,0 +1,16 @@ +package TestApp1::Controller::Root; + +use strict; +use warnings; + +use base 'Catalyst::Controller'; + +__PACKAGE__->config->{namespace} = ''; + +sub default :Path { + my ( $self, $c ) = @_; + $c->response->body( 'Page not found' ); + $c->response->status(404); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/customconfig.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/customconfig.pl new file mode 100644 index 0000000..840708d --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/customconfig.pl @@ -0,0 +1,3 @@ +{ + bar => "baz" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/testapp1.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/testapp1.pl new file mode 100644 index 0000000..70dc31d --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp1/testapp1.pl @@ -0,0 +1,5 @@ +{ name => 'TestApp2', + Controller::Config => { foo => 'foo' }, + cache => '__HOME__/cache', + multi => '__HOME__,__path_to(x)__,__HOME__,__path_to(y)__', +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2.pm new file mode 100644 index 0000000..92b88e7 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2.pm @@ -0,0 +1,26 @@ +package TestApp2; + +use strict; +use warnings; + +use MRO::Compat; + +use Catalyst qw/ConfigLoader/; + +__PACKAGE__->config( "Plugin::ConfigLoader", + { + file => __PACKAGE__->path_to( "customconfig.pl" ) + } + ); + +our $VERSION = '0.01'; + +__PACKAGE__->setup; + +sub finalize_config { + my $c = shift; + $c->config( foo => 'bar2' ); + $c->next::method( @_ ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Config.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Config.pm new file mode 100644 index 0000000..ab2323d --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Config.pm @@ -0,0 +1,19 @@ +package TestApp2::Controller::Config; + +use strict; +use warnings; + +use base qw( Catalyst::Controller ); + +sub index : Private { + my ( $self, $c ) = @_; + $c->res->output( $self->{ foo } ); +} + +sub appconfig : Global { + my ( $self, $c, $var ) = @_; + + $c->res->body( $c->config->{ $var } ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Root.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Root.pm new file mode 100644 index 0000000..0b0257d --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/Controller/Root.pm @@ -0,0 +1,16 @@ +package TestApp2::Controller::Root; + +use strict; +use warnings; + +use base 'Catalyst::Controller'; + +__PACKAGE__->config->{namespace} = ''; + +sub default :Path { + my ( $self, $c ) = @_; + $c->response->body( 'Page not found' ); + $c->response->status(404); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/customconfig.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/customconfig.pl new file mode 100644 index 0000000..f03d4e9 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/customconfig.pl @@ -0,0 +1,3 @@ +{ + bar => "baz2" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/testapp2.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/testapp2.pl new file mode 100644 index 0000000..70dc31d --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp2/testapp2.pl @@ -0,0 +1,5 @@ +{ name => 'TestApp2', + Controller::Config => { foo => 'foo' }, + cache => '__HOME__/cache', + multi => '__HOME__,__path_to(x)__,__HOME__,__path_to(y)__', +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3.pm new file mode 100644 index 0000000..0324c95 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3.pm @@ -0,0 +1,26 @@ +package TestApp3; + +use strict; +use warnings; + +use MRO::Compat; + +use Catalyst qw/ConfigLoader/; + +our $VERSION = '0.01'; + +__PACKAGE__->config( + "Plugin::ConfigLoader" => { + file => __PACKAGE__->path_to( "config" ) + } +); + +__PACKAGE__->setup; + +sub finalize_config { + my $c = shift; + $c->config( foo => 'bar3' ); + $c->next::method( @_ ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Config.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Config.pm new file mode 100644 index 0000000..a19be2f --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Config.pm @@ -0,0 +1,18 @@ +package TestApp3::Controller::Config; + +use strict; +use warnings; + +use base qw( Catalyst::Controller ); + +sub index : Private { + my ( $self, $c ) = @_; + $c->res->output( $self->{ foo } ); +} + +sub appconfig : Global { + my ( $self, $c, $var ) = @_; + $c->res->body( $c->config->{ $var } ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Root.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Root.pm new file mode 100644 index 0000000..a682eaa --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/Controller/Root.pm @@ -0,0 +1,16 @@ +package TestApp3::Controller::Root; + +use strict; +use warnings; + +use base 'Catalyst::Controller'; + +__PACKAGE__->config->{namespace} = ''; + +sub default :Path { + my ( $self, $c ) = @_; + $c->response->body( 'Page not found' ); + $c->response->status(404); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/another_file.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/another_file.pl new file mode 100644 index 0000000..9644bf2 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/another_file.pl @@ -0,0 +1,3 @@ +{ + test4_conf => "this is not set" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/testapp3.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/testapp3.pl new file mode 100644 index 0000000..b224221 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/config/testapp3.pl @@ -0,0 +1,3 @@ +{ + test3_conf3 => "a_value" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/testapp3.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/testapp3.pl new file mode 100644 index 0000000..a872b6a --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp3/testapp3.pl @@ -0,0 +1,5 @@ +{ name => 'TestApp', + Controller::Config => { foo => 'foo' }, + cache => '__HOME__/cache', + multi => '__HOME__,__path_to(x)__,__HOME__,__path_to(y)__', +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4.pm new file mode 100644 index 0000000..99fd3df --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4.pm @@ -0,0 +1,26 @@ +package TestApp4; + +use strict; +use warnings; + +use MRO::Compat; + +use Catalyst qw/ConfigLoader/; + +our $VERSION = '0.01'; + +__PACKAGE__->config( + "Plugin::ConfigLoader" => { + file => __PACKAGE__->path_to( "config.d" ) + } +); + +__PACKAGE__->setup; + +sub finalize_config { + my $c = shift; + $c->config( foo => 'bar4' ); + $c->next::method( @_ ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Config.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Config.pm new file mode 100644 index 0000000..8f1d944 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Config.pm @@ -0,0 +1,18 @@ +package TestApp4::Controller::Config; + +use strict; +use warnings; + +use base qw( Catalyst::Controller ); + +sub index : Private { + my ( $self, $c ) = @_; + $c->res->output( $self->{ foo } ); +} + +sub appconfig : Global { + my ( $self, $c, $var ) = @_; + $c->res->body( $c->config->{ $var } ); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Root.pm b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Root.pm new file mode 100644 index 0000000..bf232ba --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/Controller/Root.pm @@ -0,0 +1,16 @@ +package TestApp4::Controller::Root; + +use strict; +use warnings; + +use base 'Catalyst::Controller'; + +__PACKAGE__->config->{namespace} = ''; + +sub default :Path { + my ( $self, $c ) = @_; + $c->response->body( 'Page not found' ); + $c->response->status(404); +} + +1; diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/another_file.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/another_file.pl new file mode 100644 index 0000000..9644bf2 --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/another_file.pl @@ -0,0 +1,3 @@ +{ + test4_conf => "this is not set" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/testapp4.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/testapp4.pl new file mode 100644 index 0000000..f870add --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/config.d/testapp4.pl @@ -0,0 +1,3 @@ +{ + test4_conf3 => "a_value" +} diff --git a/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/testapp.pl b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/testapp.pl new file mode 100644 index 0000000..a872b6a --- /dev/null +++ b/sources/Catalyst-Plugin-ConfigLoader/t/lib/TestApp4/testapp.pl @@ -0,0 +1,5 @@ +{ name => 'TestApp', + Controller::Config => { foo => 'foo' }, + cache => '__HOME__/cache', + multi => '__HOME__,__path_to(x)__,__HOME__,__path_to(y)__', +} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits