oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated to reflect changes in Plack::Request API

Browse source
This commit is contained in:
Patrick Donelan 2010-03-05 20:11:06 -05:00
parent cde333e931
commit 97432e2407
3 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI.pm
View file

@ -165,7 +165,7 @@ sub handler {
my ($server, $config); my ($server, $config);
if ($request->isa('WebGUI::Session::Plack')) { if ($request->isa('WebGUI::Session::Plack')) {
$server = $request->server; $server = $request->server;
$config = WebGUI->config; $config = WebGUI->config; # use our cached version
} else { } else {
$request = Apache2::Request->new($request); $request = Apache2::Request->new($request);
$server = Apache2::ServerUtil->server; #instantiate the server api $server = Apache2::ServerUtil->server; #instantiate the server api

22
lib/WebGUI/Session/Http.pm
View file

@ -93,7 +93,7 @@ sub getCookies {
my $self = shift; my $self = shift;
if ($self->session->request) { if ($self->session->request) {
if ($self->session->request->isa('WebGUI::Session::Plack')) { if ($self->session->request->isa('WebGUI::Session::Plack')) {
return $self->session->request->get_request_cookies; return $self->session->request->{request}->cookies;
} }
# Have to require this instead of using it otherwise it causes problems for command-line scripts on some platforms (namely Windows) # Have to require this instead of using it otherwise it causes problems for command-line scripts on some platforms (namely Windows)
@ -389,17 +389,15 @@ sub setCookie {
$ttl = (defined $ttl ? $ttl : '+10y'); $ttl = (defined $ttl ? $ttl : '+10y');
if ($self->session->request) { if ($self->session->request) {
if ( $self->session->request->isa('WebGUI::Session::Plack') ) { if ( $self->session->request->isa('WebGUI::Session::Plack') ) {
$self->session->request->set_response_cookie( $self->session->request->{response}->cookies->{$name} = {
$name => { value => $value,
value => $value, path => '/',
path => '/', expires => $ttl ne 'session' ? $ttl : undef,
expires => $ttl ne 'session' ? $ttl : undef, domain => $domain,
domain => $domain, };
} }
); return;
return;
}
require Apache2::Cookie; require Apache2::Cookie;
my $cookie = Apache2::Cookie->new($self->session->request, my $cookie = Apache2::Cookie->new($self->session->request,

21
lib/WebGUI/Session/Plack.pm
View file

@ -39,9 +39,9 @@ sub AUTOLOAD {
} }
# Emulate/delegate/fake Apache2::* subs # Emulate/delegate/fake Apache2::* subs
sub uri { shift->{request}->request_uri(@_) } sub uri { shift->{request}->path_info }
sub param { shift->{request}->param(@_) } sub param { shift->{request}->param(@_) }
sub params { shift->{request}->params(@_) } sub params { shift->{request}->prameters->mixed(@_) }
sub headers_in { shift->{request}->headers(@_) } sub headers_in { shift->{request}->headers(@_) }
sub headers_out { shift->{headers_out} } sub headers_out { shift->{headers_out} }
sub protocol { shift->{request}->protocol(@_) } sub protocol { shift->{request}->protocol(@_) }
@ -60,23 +60,6 @@ sub content_type {
$self->{headers_out}->set( 'Content-Type' => $ct ); $self->{headers_out}->set( 'Content-Type' => $ct );
} }
# These two cookie subs are called from our wG Plack-specific code
sub get_request_cookies {
# Get the hash of { name => CGI::Simple::Cookie }
my $cookies = shift->{request}->cookies;
# Convert into { name => value } as expected by wG
my %c = map { $_->name => $_->value } values %{$cookies};
return \%c;
}
sub set_response_cookie {
my ( $self, $name, $val ) = @_;
$self->{response}->cookies->{$name} = $val;
}
# TODO: I suppose this should do some sort of IO::Handle thing # TODO: I suppose this should do some sort of IO::Handle thing
sub print { sub print {
my $self = shift; my $self = shift;