X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=ae8898a70c3bef29e71346db693b1424ef607112;hb=aa64badacdc24647a55bf96f3e682fdaf9461e22;hp=203238fad01b2175b6b1143d1303ab7b936099a6;hpb=91864987dc0e2256fe00b94853ba5b3a18f01ea2;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index 203238f..ae8898a 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -2,6 +2,7 @@ package Catalyst::Helper; use strict; use base 'Class::Accessor::Fast'; +use Config; use File::Spec; use File::Path; use IO::File; @@ -37,6 +38,8 @@ sub mk_app { $self->_mk_readme; $self->_mk_changes; $self->_mk_apptest; + $self->_mk_cgi; + $self->_mk_fcgi; $self->_mk_server; $self->_mk_test; $self->_mk_create; @@ -48,58 +51,75 @@ sub mk_app { =cut sub mk_component { - my ( $self, $app, $type, $name, $helper, @args ) = @_; - return 0 - if ( $name =~ /[^\w\:]/ || !\$type =~ /^model|m|view|v|controller|c\$/i ); - return 0 if $name =~ /[^\w\:]/; - $type = 'M' if $type =~ /model|m/i; - $type = 'V' if $type =~ /view|v/i; - $type = 'C' if $type =~ /controller|c/i; - $self->{type} = $type; - $self->{name} = $name; - $self->{class} = "$app\::$type\::$name"; - $self->{app} = $app; - - # Class - my $appdir = File::Spec->catdir( split /\:\:/, $app ); - my $path = File::Spec->catdir( $FindBin::Bin, '..', 'lib', $appdir, $type ); - my $file = $name; - if ( $name =~ /\:/ ) { - my @path = split /\:\:/, $name; - $file = pop @path; - $path = File::Spec->catdir( $path, @path ); - mkpath $path; - } - $file = File::Spec->catfile( $path, "$file.pm" ); - $self->{file} = $file; - - # Test - $self->{test_dir} = File::Spec->catdir( $FindBin::Bin, '..', 't' ); - $self->{test} = $self->next_test; - - # Helper - if ($helper) { - my $comp = 'Model'; - $comp = 'View' if $type eq 'V'; - $comp = 'Controller' if $type eq 'C'; - my $class = "Catalyst::Helper::$comp\::$helper"; + my $self = shift; + my $app = shift; + $self->{app} = $app; + $self->{base} = File::Spec->catdir( $FindBin::Bin, '..' ); + unless ( $_[0] =~ /^model|m|view|v|controller|c\$/i ) { + my $helper = shift; + my @args = @_; + my $class = "Catalyst::Helper::$helper"; eval "require $class"; die qq/Couldn't load helper "$class", "$@"/ if $@; - if ( $class->can('mk_compclass') ) { - return 1 unless $class->mk_compclass( $self, @args ); + if ( $class->can('mk_stuff') ) { + return 1 unless $class->mk_stuff( $self, @args ); } - else { return 1 unless $self->_mk_compclass } - - if ( $class->can('mk_comptest') ) { - $class->mk_comptest( $self, @args ); - } - else { $self->_mk_comptest } } - - # Fallback else { - return 1 unless $self->_mk_compclass; - $self->_mk_comptest; + my $type = shift; + my $name = shift; + my $helper = shift; + my @args = @_; + return 0 if $name =~ /[^\w\:]/; + $type = 'M' if $type =~ /model|m/i; + $type = 'V' if $type =~ /view|v/i; + $type = 'C' if $type =~ /controller|c/i; + $self->{type} = $type; + $self->{name} = $name; + $self->{class} = "$app\::$type\::$name"; + + # Class + my $appdir = File::Spec->catdir( split /\:\:/, $app ); + my $path = + File::Spec->catdir( $FindBin::Bin, '..', 'lib', $appdir, $type ); + my $file = $name; + if ( $name =~ /\:/ ) { + my @path = split /\:\:/, $name; + $file = pop @path; + $path = File::Spec->catdir( $path, @path ); + mkpath $path; + } + $file = File::Spec->catfile( $path, "$file.pm" ); + $self->{file} = $file; + + # Test + $self->{test_dir} = File::Spec->catdir( $FindBin::Bin, '..', 't' ); + $self->{test} = $self->next_test; + + # Helper + if ($helper) { + my $comp = 'Model'; + $comp = 'View' if $type eq 'V'; + $comp = 'Controller' if $type eq 'C'; + my $class = "Catalyst::Helper::$comp\::$helper"; + eval "require $class"; + die qq/Couldn't load helper "$class", "$@"/ if $@; + if ( $class->can('mk_compclass') ) { + return 1 unless $class->mk_compclass( $self, @args ); + } + else { return 1 unless $self->_mk_compclass } + + if ( $class->can('mk_comptest') ) { + $class->mk_comptest( $self, @args ); + } + else { $self->_mk_comptest } + } + + # Fallback + else { + return 1 unless $self->_mk_compclass; + $self->_mk_comptest; + } } return 1; } @@ -145,26 +165,18 @@ sub mk_file { sub next_test { my ( $self, $tname ) = @_; - my $dir = $self->{test_dir}; - my $num = '01'; - for my $i (<$dir/*.t>) { - $i =~ /(\d+)[^\/]*.t$/; - my $j = $1 || $num; - $num = $j if $j > $num; - } - $num++; - $num = sprintf '%02d', $num; - if ($tname) { $tname = "$num$tname.t" } + if ($tname) { $tname = "$tname.t" } else { my $name = $self->{name}; - my $type = $self->{type}; my $prefix = $name; $prefix =~ s/::/_/g; $prefix = lc $prefix; - $tname = lc( $num . $type . '_' . $prefix . '.t' ); + $tname = $prefix . '.t'; $self->{prefix} = $prefix; } - return "$dir/$tname"; + my $dir = $self->{test_dir}; + my $type = lc $self->{type}; + return File::Spec->catfile( $dir, $type, $tname ); } sub _mk_dirs { @@ -178,6 +190,9 @@ sub _mk_dirs { $self->mk_dir( $self->{root} ); $self->{t} = File::Spec->catdir( $self->{dir}, 't' ); $self->mk_dir( $self->{t} ); + $self->mk_dir( File::Spec->catdir( $self->{t}, 'm' ) ); + $self->mk_dir( File::Spec->catdir( $self->{t}, 'v' ) ); + $self->mk_dir( File::Spec->catdir( $self->{t}, 'c' ) ); $self->{class} = File::Spec->catdir( split( /\:\:/, $self->{name} ) ); $self->{mod} = File::Spec->catdir( $self->{lib}, $self->{class} ); $self->mk_dir( $self->{mod} ); @@ -208,14 +223,10 @@ $name->config( root => '$base/root', ); -$name->action( - - '!default' => sub { - my ( \$self, \$c ) = \@_; - \$c->res->output('Congratulations, $name is on Catalyst!'); - }, - -); +sub default : Private { + my ( \$self, \$c ) = \@_; + \$c->res->output('Congratulations, $name is on Catalyst!'); +} =head1 NAME @@ -255,7 +266,8 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => '$name', VERSION_FROM => 'lib/$class.pm', - PREREQ_PM => { Catalyst => 0 } + PREREQ_PM => { Catalyst => 0 }, + test => { TESTS => join ' ', ( glob('t/*.t'), glob('t/*/*.t') ) } ); EOF } @@ -291,7 +303,16 @@ use_ok( Catalyst::Test, '$name' ); ok( request('/')->is_success ); EOF - $self->mk_file( "$t\/02podcoverage.t", <<"EOF"); + $self->mk_file( "$t\/02pod.t", <<"EOF"); +use Test::More; + +eval "use Test::Pod 1.14"; +plan skip_all => 'Test::Pod 1.14 required' if \$@; +plan skip_all => 'set TEST_POD to enable this test' unless \$ENV{TEST_POD}; + +all_pod_files_ok(); +EOF + $self->mk_file( "$t\/03podcoverage.t", <<"EOF"); use Test::More; eval "use Test::Pod::Coverage 1.04"; @@ -302,19 +323,115 @@ all_pod_coverage_ok(); EOF } +sub _mk_cgi { + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/cgi.pl", <<"EOF"); +$Config{startperl} -w + +BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI' } + +use strict; +use FindBin; +use lib "\$FindBin::Bin/../lib"; +use $name; + +$name->run; + +1; +__END__ + +=head1 NAME + +cgi - Catalyst CGI + +=head1 SYNOPSIS + +See L + +=head1 DESCRIPTION + +Run a Catalyst application as cgi. + +=head1 AUTHOR + +Sebastian Riedel, C + +=head1 COPYRIGHT + +Copyright 2004 Sebastian Riedel. All rights reserved. + +This library is free software. You can redistribute it and/or modify it under +the same terms as perl itself. + +=cut +EOF + chmod 0700, "$script/cgi.pl"; +} + +sub _mk_fcgi { + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/fcgi.pl", <<"EOF"); +$Config{startperl} -w + +BEGIN { \$ENV{CATALYST_ENGINE} = 'FCGI' } + +use strict; +use FindBin; +use lib "\$FindBin::Bin/../lib"; +use $name; + +$name->run; + +1; +__END__ + +=head1 NAME + +fcgi - Catalyst FCGI + +=head1 SYNOPSIS + +See L + +=head1 DESCRIPTION + +Run a Catalyst application as fcgi. + +=head1 AUTHOR + +Sebastian Riedel, C + +=head1 COPYRIGHT + +Copyright 2004 Sebastian Riedel. All rights reserved. + +This library is free software. You can redistribute it and/or modify it under +the same terms as perl itself. + +=cut +EOF + chmod 0700, "$script/fcgi.pl"; +} + sub _mk_server { my $self = shift; my $name = $self->{name}; my $script = $self->{script}; $self->mk_file( "$script\/server.pl", <<"EOF"); -#!/usr/bin/perl -w +$Config{startperl} -w + +BEGIN { \$ENV{CATALYST_ENGINE} = 'HTTP' } use strict; use Getopt::Long; use Pod::Usage; use FindBin; use lib "\$FindBin::Bin/../lib"; -use Catalyst::Test '$name'; +use $name; my \$help = 0; my \$port = 3000; @@ -323,7 +440,7 @@ GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port ); pod2usage(1) if \$help; -Catalyst::Test::server(\$port); +$name->run(\$port); 1; __END__ @@ -369,13 +486,16 @@ sub _mk_test { my $name = $self->{name}; my $script = $self->{script}; $self->mk_file( "$script/test.pl", <<"EOF"); -#!/usr/bin/perl -w +$Config{startperl} -w + +BEGIN { \$ENV{CATALYST_ENGINE} = 'Test' } use strict; use Getopt::Long; use Pod::Usage; use FindBin; use lib "\$FindBin::Bin/../lib"; +use $name; my \$help = 0; @@ -383,10 +503,7 @@ GetOptions( 'help|?' => \\\$help ); pod2usage(1) if ( \$help || !\$ARGV[0] ); -require Catalyst::Test; -import Catalyst::Test '$name'; - -print get(\$ARGV[0]) . "\n"; +print $name->run(\$ARGV[0])->content . "\n"; 1; __END__ @@ -435,7 +552,7 @@ sub _mk_create { my $name = $self->{name}; my $script = $self->{script}; $self->mk_file( "$script\/create.pl", <<"EOF"); -#!/usr/bin/perl -w +$Config{startperl} -w use strict; use Getopt::Long; @@ -446,7 +563,7 @@ my \$help = 0; GetOptions( 'help|?' => \$help ); -pod2usage(1) if ( \$help || !\$ARGV[1] ); +pod2usage(1) if ( \$help || !\$ARGV[0] ); my \$helper = Catalyst::Helper->new; pod2usage(1) unless \$helper->mk_component( '$name', \@ARGV ); @@ -473,6 +590,7 @@ create.pl [options] model|view|controller name [helper] [options] create.pl model My::Model create.pl model SomeDB CDBI dbi:SQLite:/tmp/my.db create.pl model AnotherDB CDBI dbi:Pg:dbname=foo root 4321 + create.pl Ajax See also: perldoc Catalyst::Manual @@ -506,14 +624,11 @@ sub _mk_compclass { my $action = ''; $action = <<"EOF" if $type eq 'C'; -$app->action( - - '!?default' => sub { - my ( \$self, \$c ) = \@_; - \$c->res->output('Congratulations, $class is on Catalyst!'); - }, +sub default : Private { + my ( \$self, \$c ) = \@_; + \$c->res->output('Congratulations, $class is on Catalyst!'); +} -); EOF my $file = $self->{file}; return $self->mk_file( "$file", <<"EOF");