@@ -5,9 +5,9 @@ author 'Simon Cozens <simon@simon-cozens.org>'; include 'Module::AutoInstall'; license 'artistic'; perl_version '5.006'; -all_from "lib/Canary.pm"; +all_from "canary.pl"; requires "KinoSearch" => 0; -requires "HTTP::Engine" => 0; +requires "Plack::Request" => 0; requires "Plack" => 0; requires "Class::DBI" => 0; requires "Email::Date" => 0; Makefile.PL @@ -1,6 +1,7 @@ package MicroMaypole; use Template; -use HTTP::Engine; +use Plack::Request; +use Plack::Response; sub app { my ($self, %args) = @_; @@ -13,15 +14,12 @@ sub app { COMPILE_EXT => ".ttc" }); - my $engine = HTTP::Engine->new( interface => { module => 'PSGI', - request_handler => sub { - my $req = shift; - my $m = $self->new(%args); - $m->{template_engine} = $t; - $m->handler($req); - } - }); - sub { $engine->run(@_) }; + sub { + my $req = Plack::Request->new(shift); + my $m = $self->new(%args); + $m->{template_engine} = $t; + $m->handler($req)->finalize; + } } sub new { my $self = shift; return bless {@_} , $self } @@ -52,7 +50,8 @@ sub handler { sub respond { my ($self, $template, @args) = @_; my $out; - my $res = HTTP::Engine::Response->new(); + my $res = Plack::Response->new(200); + $res->content_type("text/html"); $self->{template_engine}->process($template, { self => $self, @args, lib/MicroMaypole.pm 2ca92cb80a8187e3b34c31b8a8e4ae00da70e0f4 Simon Cozens simoncozens simon@simon-cozens.org http://github.com/simoncozens/canary/commit/713e809c84fc606cf9baaccad00d97a58ccfbaaa 713e809c84fc606cf9baaccad00d97a58ccfbaaa 2009-11-05T09:50:47-08:00 2009-11-05T09:50:47-08:00 Ditch HTTP::Engine, go pure-PSGI. 2642e13c27d3c05dab60814e5a3cd9af741f92e4 Simon Cozens simoncozens simon@simon-cozens.org