X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FCLI.pm;h=0fd3fa3fe9c57589ef608b2c9e804288864367c5;hb=6f3e2ec142b6dd83d7d4960cf15acd6ca8b73e1d;hp=8b7107b7b164a33a421cff6963896fb98dacc35f;hpb=b717b7341c854837780913339fb625cbe19b5d67;p=maypole.git

diff --git a/lib/Maypole/CLI.pm b/lib/Maypole/CLI.pm
index 8b7107b..0fd3fa3 100644
--- a/lib/Maypole/CLI.pm
+++ b/lib/Maypole/CLI.pm
@@ -1,38 +1,56 @@
 package Maypole::CLI;
 use UNIVERSAL::require;
-use URI; use URI::QueryParam;
+use URI;
+use URI::QueryParam;
+use Maypole::Constants;
 
 use strict;
 use warnings;
 my $package;
 our $buffer;
-sub import { 
+
+sub import {
     $package = $_[1];
     $package->require;
     die "Couldn't require $package - $@" if $@;
     no strict 'refs';
-    unshift @{$package."::ISA"}, "Maypole::CLI";
+    unshift @{ $package . "::ISA" }, "Maypole::CLI";
 }
 
-sub get_request {}
+sub get_request       { }
 sub get_template_root { $ENV{MAYPOLE_TEMPLATES} || "." }
 
 sub parse_location {
     my $self = shift;
-    my $url = URI->new(shift @ARGV);
-    my $root = URI->new($self->config->{uri_base})->path;
+    my $url  = URI->new( shift @ARGV );
+    my $root = URI->new( $self->config->uri_base )->path;
     $self->{path} = $url->path;
     $self->{path} =~ s/^$root//i if $root;
+    $self->rewrite_path;
     $self->parse_path;
-    $self->{query} = $url->query_form_hash;
+    $self->parse_args($url);
+}
+
+sub parse_args {
+    my ( $self, $url ) = @_;
+    $self->{params} = $url->query_form_hash;
+    $self->{query}  = $url->query_form_hash;
 }
 
 sub send_output { $buffer = shift->{output} }
 
+sub call_url {
+    my $self = shift;
+    @ARGV = @_;
+    $package->handler() == OK and return $buffer;
+}
+
 # Do it!
-CHECK { if ((caller(0))[1] eq "-e") { 
-            $package->handler() and print $buffer; 
-       } }
+CHECK {
+    if ( ( caller(0) )[1] eq "-e" ) {
+        $package->handler() == OK and print $buffer;
+    }
+}
 
 1;