use strict;
use warnings;
use Moose;
+use MRO::Compat;
use NDWeb::Auth::User;
sub setup {
my $c = shift;
- $c->default_auth_store(
- Catalyst::Plugin::Authentication::Store::NDWeb->new(
- )
- );
+ $c->default_auth_store(
+ Catalyst::Plugin::Authentication::Store::NDWeb->new(
+ )
+ );
- $c->NEXT::setup(@_);
+ $c->next::method(@_);
}
-sub new {
- my ( $class ) = @_;
-
- my $self = {
- };
-
- bless $self, $class;
-}
-
sub from_session {
my ( $self, $c, $frozenuser ) = @_;
NDWeb::User->supports( @_ );
}
-__PACKAGE__;
+__PACKAGE__->meta->make_immutable;
__END__
package NDWeb;
-
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
use Catalyst::Runtime 5.80;
PageCache
/;
+extends 'Catalyst';
+
our $VERSION = '0.01';
+$VERSION = eval $VERSION;
sub signal_bots {
system 'killall','-USR1', 'ndbot.pl';
# Configure the application.
#
-# Note that settings in ndweb.yml (or other external
+# Note that settings in ndweb.conf (or other external
# configuration file that you set up manually) take precedence
# over this when using ConfigLoader. Thus configuration
# details given here can function as a default configuration,
# with an external configuration file acting as an override for
# local deployment.
-__PACKAGE__->config( name => 'NDWeb' );
+__PACKAGE__->config(
+ name => 'NDWeb',
+ # Disable deprecated behavior needed by old applications
+ disable_component_resolution_regex_fallback => 1,
+);
__PACKAGE__->config->{'Plugin::Authentication'}{'use_session'} = 1;
__PACKAGE__->config(session => {
storage => "/tmp/ndweb-$>/session",
expires => 300,
verify_address => 1,
});
-__PACKAGE__->config( cache => {
+__PACKAGE__->config( "Plugin::Cache" => {
backend => {
class => "Cache::FileCache",
cache_root => "/tmp/ndweb-$>",
--- /dev/null
+# rename this file to ndweb.yml and put a ':' after 'name' if
+# you want to use YAML like in old versions of Catalyst
+name NDWeb
+++ /dev/null
----
-name: NDWeb
#!/usr/bin/env perl
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
-
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use NDWeb;
-
-NDWeb->run;
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'CGI');
1;
=head1 COPYRIGHT
-
This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
+
use strict;
use warnings;
-use Getopt::Long;
-use Pod::Usage;
-eval "use Catalyst::Helper;";
-if ($@) {
- die <<END;
-To use the Catalyst development tools including catalyst.pl and the
-generated script/myapp_create.pl you need Catalyst::Helper, which is
-part of the Catalyst-Devel distribution. Please install this via a
-vendor package or by running one of -
-
- perl -MCPAN -e 'install Catalyst::Devel'
- perl -MCPANPLUS -e 'install Catalyst::Devel'
-END
-}
-
-my $force = 0;
-my $mech = 0;
-my $help = 0;
-
-GetOptions(
- 'nonew|force' => \$force,
- 'mech|mechanize' => \$mech,
- 'help|?' => \$help
- );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } );
-
-pod2usage(1) unless $helper->mk_component( 'NDWeb', @ARGV );
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'Create');
1;
ndweb_create.pl [options] model|view|controller name [helper] [options]
Options:
- -force don't create a .new file where a file to be created exists
- -mechanize use Test::WWW::Mechanize::Catalyst for tests if available
- -help display this help and exits
+ --force don't create a .new file where a file to be created exists
+ --mechanize use Test::WWW::Mechanize::Catalyst for tests if available
+ --help display this help and exits
Examples:
ndweb_create.pl controller My::Controller
#!/usr/bin/env perl
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use NDWeb;
-
-my $help = 0;
-my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr );
-
-GetOptions(
- 'help|?' => \$help,
- 'listen|l=s' => \$listen,
- 'nproc|n=i' => \$nproc,
- 'pidfile|p=s' => \$pidfile,
- 'manager|M=s' => \$manager,
- 'daemon|d' => \$detach,
- 'keeperr|e' => \$keep_stderr,
-);
-
-pod2usage(1) if $help;
-
-NDWeb->run(
- $listen,
- { nproc => $nproc,
- pidfile => $pidfile,
- manager => $manager,
- detach => $detach,
- keep_stderr => $keep_stderr,
- }
-);
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'FastCGI');
1;
Options:
-? -help display this help and exits
- -l -listen Socket path to listen on
+ -l --listen Socket path to listen on
(defaults to standard input)
can be HOST:PORT, :PORT or a
filesystem path
- -n -nproc specify number of processes to keep
+ -n --nproc specify number of processes to keep
to serve requests (defaults to 1,
requires -listen)
- -p -pidfile specify filename for pid file
+ -p --pidfile specify filename for pid file
(requires -listen)
- -d -daemon daemonize (requires -listen)
- -M -manager specify alternate process manager
+ -d --daemon daemonize (requires -listen)
+ -M --manager specify alternate process manager
(FCGI::ProcManager sub-class)
or empty string to disable
- -e -keeperr send error messages to STDOUT, not
+ -e --keeperr send error messages to STDOUT, not
to the webserver
=head1 DESCRIPTION
#!/usr/bin/env perl
BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = 39;
- require Catalyst::Engine::HTTP;
+ $ENV{CATALYST_SCRIPT_GEN} = 40;
}
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-
-#Need to preload, otherwise the first hit is slow
-use CGI qw/:standard/;
-escapeHTML('');
-
-my $debug = 0;
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = $ENV{NDWEB_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive = 0;
-my $restart = $ENV{NDWEB_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $background = 0;
-my $pidfile = undef;
-
-my $check_interval;
-my $file_regex;
-my $watch_directory;
-my $follow_symlinks;
-
-my @argv = @ARGV;
-
-GetOptions(
- 'debug|d' => \$debug,
- 'fork|f' => \$fork,
- 'help|?' => \$help,
- 'host=s' => \$host,
- 'port|p=s' => \$port,
- 'keepalive|k' => \$keepalive,
- 'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$check_interval,
- 'restartregex|rr=s' => \$file_regex,
- 'restartdirectory=s@' => \$watch_directory,
- 'followsymlinks' => \$follow_symlinks,
- 'background' => \$background,
- 'pidfile=s' => \$pidfile,
-);
-
-pod2usage(1) if $help;
-
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-
-# If we load this here, then in the case of a restarter, it does not
-# need to be reloaded for each restart.
-require Catalyst;
-
-# If this isn't done, then the Catalyst::Devel tests for the restarter
-# fail.
-$| = 1 if $ENV{HARNESS_ACTIVE};
-
-my $runner = sub {
- # This is require instead of use so that the above environment
- # variables can be set at runtime.
- require NDWeb;
-
- NDWeb->run(
- $port, $host,
- {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- background => $background,
- pidfile => $pidfile,
- }
- );
-};
-
-if ( $restart ) {
- die "Cannot run in the background and also watch for changed files.\n"
- if $background;
-
- require Catalyst::Restarter;
-
- my $subclass = Catalyst::Restarter->pick_subclass;
-
- my %args;
- $args{follow_symlinks} = 1
- if $follow_symlinks;
- $args{directories} = $watch_directory
- if defined $watch_directory;
- $args{sleep_interval} = $check_interval
- if defined $check_interval;
- $args{filter} = qr/$file_regex/
- if defined $file_regex;
-
- my $restarter = $subclass->new(
- %args,
- start_sub => $runner,
- argv => \@argv,
- );
-
- $restarter->run_and_watch;
-}
-else {
- $runner->();
-}
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'Server');
1;
=head1 NAME
-ndweb_server.pl - Catalyst Testserver
+ndweb_server.pl - Catalyst Test Server
=head1 SYNOPSIS
ndweb_server.pl [options]
- Options:
- -d -debug force debug mode
- -f -fork handle each request in a new process
- (defaults to false)
- -? -help display this help and exits
- -host host (defaults to all)
- -p -port port (defaults to 3000)
- -k -keepalive enable keep-alive connections
- -r -restart restart when files get modified
- (defaults to false)
- -rd -restartdelay delay between file checks
- (ignored if you have Linux::Inotify2 installed)
- -rr -restartregex regex match files that trigger
- a restart when modified
- (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
- -restartdirectory the directory to search for
- modified files, can be set mulitple times
- (defaults to '[SCRIPT_DIR]/..')
- -follow_symlinks follow symlinks in search directories
- (defaults to false. this is a no-op on Win32)
- -background run the process in the background
- -pidfile specify filename for pid file
+ -d --debug force debug mode
+ -f --fork handle each request in a new process
+ (defaults to false)
+ -? --help display this help and exits
+ -h --host host (defaults to all)
+ -p --port port (defaults to 3000)
+ -k --keepalive enable keep-alive connections
+ -r --restart restart when files get modified
+ (defaults to false)
+ -rd --restart_delay delay between file checks
+ (ignored if you have Linux::Inotify2 installed)
+ -rr --restart_regex regex match files that trigger
+ a restart when modified
+ (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
+ --restart_directory the directory to search for
+ modified files, can be set mulitple times
+ (defaults to '[SCRIPT_DIR]/..')
+ --follow_symlinks follow symlinks in search directories
+ (defaults to false. this is a no-op on Win32)
+ --background run the process in the background
+ --pidfile specify filename for pid file
See also:
perldoc Catalyst::Manual
it under the same terms as Perl itself.
=cut
+
#!/usr/bin/env perl
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Catalyst::Test 'NDWeb';
-
-my $help = 0;
-
-GetOptions( 'help|?' => \$help );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-print request($ARGV[0])->content . "\n";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'Test');
1;
ndweb_test.pl [options] uri
Options:
- -help display this help and exits
+ --help display this help and exits
Examples:
ndweb_test.pl http://localhost/some_action
projects / ndwebbie.git / commitdiff