throw error on failed new in run_if_script

[catagits/Web-Simple.git] / lib / Web / Simple / Application.pm

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index febd830..7ef273b 100644 (file)
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -1,6 +1,7 @@
 package Web::Simple::Application;
 
 use Scalar::Util 'weaken';
+use Try::Tiny;
 
 use Moo;
 
@@ -25,7 +26,6 @@ has '_dispatcher' => (is => 'lazy');
 sub _build__dispatcher {
   my $self = shift;
   require Web::Dispatch;
-  require Web::Simple::DispatchNode;
   my $final = $self->_build_final_dispatcher;
 
   # We need to weaken both the copy of $self that the
@@ -37,13 +37,12 @@ sub _build__dispatcher {
   # closes back over $self
 
   weaken($self);
-  my $node_args = { app_object => $self };
-  weaken($node_args->{app_object});
-  Web::Dispatch->new(
-    app => sub { $self->dispatch_request(@_), $final },
-    node_class => 'Web::Simple::DispatchNode',
-    node_args => $node_args
+  my %dispatch_args = (
+    dispatch_app => sub { $self->dispatch_request(@_), $final },
+    dispatch_object => $self
   );
+  weaken($dispatch_args{dispatch_object});
+  Web::Dispatch->new(%dispatch_args);
 }
 
 sub _build_final_dispatcher {
@@ -51,12 +50,22 @@ sub _build_final_dispatcher {
 }
 
 sub run_if_script {
+  my ( $self ) = @_;
   # ->to_psgi_app is true for require() but also works for plackup
-  return $_[0]->to_psgi_app if caller(1);
-  my $self = ref($_[0]) ? $_[0] : $_[0]->new;
+  return $self->to_psgi_app if caller(1);
+  $self = ref($self) ? $self : $self->_build_for_run_if_script;
   $self->run(@_);
 }
 
+sub _build_for_run_if_script {
+  my ( $self ) = @_;
+  try { $self->new }
+  catch {
+    die "Failed to create new '$self' object during run_if_script"
+      . " (should your .pm file end with just '1;'?) : $_\n";
+  };
+}
+
 sub _run_cgi {
   my $self = shift;
   require Plack::Handler::CGI;
@@ -94,13 +103,13 @@ sub run {
   } elsif ($ENV{GATEWAY_INTERFACE}) {
     return $self->_run_cgi;
   }
-  unless (@ARGV && $ARGV[0] =~ m{^[A-Z/]}) {
+  unless (@ARGV && $ARGV[0] =~ m{(^[A-Z/])|\@}) {
     return $self->_run_cli(@ARGV);
   }
 
   my @args = @ARGV;
 
-  unshift(@args, 'GET') if $args[0] =~ m{^/} or $args[0] =~ m{\@};
+  unshift(@args, 'GET') if $args[0] !~ /^[A-Z]/;
 
   $self->_run_cli_test_request(@args);
 }
@@ -117,8 +126,6 @@ sub _test_request_spec_to_http_request {
     unshift @rest, 'Authorization:', 'Basic '.MIME::Base64::encode($basic);
   }
 
-  require HTTP::Request;
-
   my $request = HTTP::Request->new($method => $path);
 
   my @params;
@@ -153,6 +160,8 @@ sub _test_request_spec_to_http_request {
 sub run_test_request {
   my ($self, @req) = @_;
 
+  require HTTP::Request;
+
   require Plack::Test;
 
   my $request = $self->_test_request_spec_to_http_request(@req);