clean up arg handling

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index febd830..1ec59aa 100644 (file)
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -94,13 +94,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 +117,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 +151,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);