[Bps-public-commit] r17068 - in Prophet/branches/actions/lib/Prophet: Server

[jesse at bestpractical.com]

Author: jesse
Date: Tue Dec  2 17:34:53 2008
New Revision: 17068

Modified:
   Prophet/branches/actions/lib/Prophet/Server.pm
   Prophet/branches/actions/lib/Prophet/Server/Controller.pm

Log:
* current actions code compiles


Modified: Prophet/branches/actions/lib/Prophet/Server.pm
==============================================================================
--- Prophet/branches/actions/lib/Prophet/Server.pm	(original)
+++ Prophet/branches/actions/lib/Prophet/Server.pm	Tue Dec  2 17:34:53 2008
@@ -2,6 +2,7 @@
 use Moose;
 extends qw'HTTP::Server::Simple::CGI';
 
+use Prophet::Server::Controller;
 use Prophet::Server::View;
 use Prophet::Server::Dispatcher;
 use Params::Validate qw/:all/;

Modified: Prophet/branches/actions/lib/Prophet/Server/Controller.pm
==============================================================================
--- Prophet/branches/actions/lib/Prophet/Server/Controller.pm	(original)
+++ Prophet/branches/actions/lib/Prophet/Server/Controller.pm	Tue Dec  2 17:34:53 2008
@@ -2,10 +2,11 @@
 use Moose;
 
 
-has cgi => (isa => 'CGI');
+has cgi => (is => 'rw', isa => 'CGI');
+has failed => ( is => 'rw', isa => 'Bool');
+has failure_message => ( is => 'rw', isa => 'Str');
+
 
-has failed => ( isa => 'Bool');
-has failure_message => ( isa => 'Bool');
 
 =head1 NAME
 
@@ -25,6 +26,8 @@
     my $cgi = $self->cgi;
     my @params = $cgi->all_parameters;
 
+    my @action_hashes;
+
     my $bundles = $self->_bundle_params_by_action(\@params);   
     for (values %$bundles) {
         push  @action_hashes, $self->_bundle_to_hash($_);
@@ -41,8 +44,7 @@
     my @actions = $self->_find_actions_from_cgi_params($params);
     foreach my $param (@$params) {
         my $action = $self->_parse_cgi_param_name($param);
-    
-        $bundles{$action} 
+        $bundles->{$action};
     }
     
 
@@ -57,13 +59,18 @@
     my $actions = {};
    foreach my $param (@$params) {
         next unless $param =~ /^prophet-action(.*)$/;
-        my %attr = map {split(/=/) grep {$_} split(/|/,$1)};
+        my $action_data = $1;
+
+       my @bits = grep { defined $_ } split( /|/, $action_data );
+        my %attr ={
+            split(/=/, @bits)
+        };
+
         $attr{value} = $cgi->param($param);
 
-        warn "Duplicate action definition for @{[$attr{name}]}." if ($actions{$attr{name}};
-        $actions{$attr{name}} = \%attr;
-        $actions{$attr{name}}->{params} = 
-            $self->params_for_action_from_cgi($attr{name});
+        warn "Duplicate action definition for @{[$attr{name}]}." if ($actions->{$attr{name}});
+        $actions->{$attr{name}} = \%attr;
+        $actions->{$attr{name}}->{params} = $self->params_for_action_from_cgi($attr{name});
    } 
 
 }
@@ -81,11 +88,11 @@
     my $self = shift;
     my $param = shift;
 
-    my ($uuid, $prop, $value);
-    if ($param =~ /|uuid-(.*?)|) {
+    my ($uuid, $prop);
+    if ($param =~ /|uuid-(.*?)|/) {
         $uuid = $1;
     }
-    if ($param =~ /|prop-(.*?)|) {
+    if ($param =~ /|prop-(.*?)|/) {
         $prop = $1;
     }
     my $value = $self->cgi->param($param); 
@@ -116,10 +123,6 @@
 }
 
 
-sub extract_actions_from_cgi {
-    my $self = shift;
-}
-
 sub canonicalize_actions {
     my $self = shift;
 }