X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=1382d22ec3d296d39202c73c8c05cc42e594d2d2;hb=caca1b02bf3a1559079047dde1edf73bfee358da;hp=e86d6d5b62bbd8b9fd5fe96328cf2f32338bb106;hpb=ad41e7776d7302814aa2cc38869d25e524304bae;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index e86d6d5..1382d22 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; @@ -34,8 +35,12 @@ sub mk_app { $self->_mk_dirs; $self->_mk_appclass; $self->_mk_makefile; + $self->_mk_readme; + $self->_mk_changes; $self->_mk_apptest; + $self->_mk_cgi; $self->_mk_server; + $self->_mk_cgiserver; $self->_mk_test; $self->_mk_create; return 1; @@ -46,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 ); - } - else { return 1 unless $self->_mk_compclass } - - if ( $class->can('mk_comptest') ) { - $class->mk_comptest( $self, @args ); + if ( $class->can('mk_stuff') ) { + return 1 unless $class->mk_stuff( $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; } @@ -143,39 +165,34 @@ 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 { my $self = shift; $self->mk_dir( $self->{dir} ); - $self->{bin} = File::Spec->catdir( $self->{dir}, 'bin' ); - $self->mk_dir( $self->{bin} ); + $self->{script} = File::Spec->catdir( $self->{dir}, 'script' ); + $self->mk_dir( $self->{script} ); $self->{lib} = File::Spec->catdir( $self->{dir}, 'lib' ); $self->mk_dir( $self->{lib} ); $self->{root} = File::Spec->catdir( $self->{dir}, 'root' ); $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} ); @@ -253,11 +270,33 @@ 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 } +sub _mk_readme { + my $self = shift; + my $dir = $self->{dir}; + $self->mk_file( "$dir\/README", <<"EOF"); +Run script/server.pl to test the application. +EOF +} + +sub _mk_changes { + my $self = shift; + my $name = $self->{name}; + my $dir = $self->{dir}; + my $time = localtime time; + $self->mk_file( "$dir\/Changes", <<"EOF"); +This file documents the revision history for Perl extension $name. + +0.01 $time + - initial revision, generated by Catalyst +EOF +} + sub _mk_apptest { my $self = shift; my $t = $self->{t}; @@ -279,19 +318,74 @@ all_pod_coverage_ok(); EOF } +sub _mk_cgi { + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/nph-cgi.pl", <<"EOF"); +$Config{startperl} -w + +BEGIN { + \$ENV{CATALYST_ENGINE} = 'CGI'; + \$ENV{CATALYST_TEST} = 1; +} + +use strict; +use FindBin; +use lib "\$FindBin::Bin/../lib"; +use $name; + +$name->run; + +1; +__END__ + +=head1 NAME + +nph-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/nph-cgi.pl"; +} + sub _mk_server { - my $self = shift; - my $name = $self->{name}; - my $bin = $self->{bin}; - $self->mk_file( "$bin\/server", <<"EOF"); -#!/usr/bin/perl -w + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/server.pl", <<"EOF"); +$Config{startperl} -w + +BEGIN { + \$ENV{CATALYST_ENGINE} = 'Server'; + \$ENV{CATALYST_TEST} = 1; +} 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; @@ -300,7 +394,7 @@ GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port ); pod2usage(1) if \$help; -Catalyst::Test::server(\$port); +$name->run(\$port); 1; __END__ @@ -311,7 +405,7 @@ server - Catalyst Testserver =head1 SYNOPSIS -server [options] +server.pl [options] Options: -? -help display this help and exits @@ -338,15 +432,86 @@ the same terms as perl itself. =cut EOF - chmod 0700, "$bin/server"; + chmod 0700, "$script/server.pl"; +} + +sub _mk_cgiserver { + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/cgi-server.pl", <<"EOF"); +$Config{startperl} -w + +BEGIN { + \$ENV{CATALYST_ENGINE} = 'Server'; + \$ENV{CATALYST_TEST} = 1; +} + +use strict; +use Getopt::Long; +use Pod::Usage; +use FindBin; +use lib "\$FindBin::Bin/../lib"; +use File::Spec; +use $name; + +my \$help = 0; +my \$port = 3000; + +GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port ); + +pod2usage(1) if \$help; + +$name->run( \$port, File::Spec->catfile( \$FindBin::Bin, 'nph-cgi.pl' ) ); + +1; +__END__ + +=head1 NAME + +cgi-server - Catalyst CGI Testserver + +=head1 SYNOPSIS + +cgi-server.pl [options] + + Options: + -? -help display this help and exits + -p -port port (defaults to 3000) + + See also: + perldoc Catalyst::Manual + perldoc Catalyst::Manual::Intro + +=head1 DESCRIPTION + +Run a Catalyst CGI Testserver for this application. + +Similar to the regular server but doesn't require a restart +after code changes! + +=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-server.pl"; } sub _mk_test { - my $self = shift; - my $name = $self->{name}; - my $bin = $self->{bin}; - $self->mk_file( "$bin/test", <<"EOF"); -#!/usr/bin/perl -w + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script/test.pl", <<"EOF"); +$Config{startperl} -w use strict; use Getopt::Long; @@ -374,14 +539,14 @@ test - Catalyst Test =head1 SYNOPSIS -test [options] uri +test.pl [options] uri Options: -help display this help and exits Examples: - perl test http://localhost/some_action - perl test /some_action + test.pl http://localhost/some_action + test.pl /some_action See also: perldoc Catalyst::Manual @@ -404,15 +569,15 @@ the same terms as perl itself. =cut EOF - chmod 0700, "$bin/test"; + chmod 0700, "$script/test.pl"; } sub _mk_create { - my $self = shift; - my $name = $self->{name}; - my $bin = $self->{bin}; - $self->mk_file( "$bin\/create", <<"EOF"); -#!/usr/bin/perl -w + my $self = shift; + my $name = $self->{name}; + my $script = $self->{script}; + $self->mk_file( "$script\/create.pl", <<"EOF"); +$Config{startperl} -w use strict; use Getopt::Long; @@ -423,7 +588,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 ); @@ -437,19 +602,20 @@ create - Create a new Catalyst Component =head1 SYNOPSIS -create [options] model|view|controller name [helper] [options] +create.pl [options] model|view|controller name [helper] [options] Options: -help display this help and exits Examples: - perl create controller My::Controller - perl create view My::View - perl create view MyView TT - perl create view TT TT - perl create model My::Model - perl create model SomeDB CDBI dbi:SQLite:/tmp/my.db - perl create model AnotherDB CDBI dbi:Pg:dbname=foo root 4321 + create.pl controller My::Controller + create.pl view My::View + create.pl view MyView TT + create.pl view TT TT + 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 @@ -472,7 +638,7 @@ the same terms as perl itself. =cut EOF - chmod 0700, "$bin/create"; + chmod 0700, "$script/create.pl"; } sub _mk_compclass {