--- trunk/lib/Frey/Action.pm	2008/11/17 15:42:12	372
+++ trunk/lib/Frey/Action.pm	2008/11/19 00:39:23	430
@@ -4,6 +4,7 @@
 with 'Frey::Web';
 with 'Frey::Config';
 
+use Clone qw/clone/;
 use Data::Dump qw/dump/;
 
 =head1 DESCRIPTION
@@ -36,15 +37,22 @@
 	my ( $self ) = @_;
 	$self->load_class( $self->class );
 	my @required = 
-		grep {
-			defined $_ && $_->can('name') && !defined( $self->params->{ $_->name } )
-		}
+		grep { defined $_ }
 		map {
-			my $attr = $self->class->meta->get_attribute($_);
-			$attr->is_required && $attr;
+			eval {
+				$_->can('name') && !defined( $self->params->{ $_->name } )
+			};
+		}
+		grep {
+			my $required = eval {
+				my $attr = $self->class->meta->get_attribute($_);
+				$attr->is_required;
+			};
+			warn "# attribute $_ error: $@" if $@;
+			$required;
 		} $self->class->meta->get_attribute_list;
 
-	warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class;
+	warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug;
 	return @required if wantarray;
 	return \@required;
 }
@@ -65,14 +73,15 @@
 	my @attrs = @{ $self->attribute_order };
 	@attrs = map {  $a->{$_}++; $_ } @attrs;
 	push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @{ $self->required };
-	warn "# attributes = ",dump( @attrs );
+	warn "# attributes = ",dump( @attrs ) if $self->debug;
 	return @attrs if wantarray;
 	return \@attrs;
 }
 
 =head2 params_form
 
-  my $html = $self->params_form;
+  my  $html                  = $self->params_form;
+  my ($html,$default_params) = $self->params_form;
 
 =cut
 
@@ -80,41 +89,45 @@
 	my ( $self ) = @_;
 	my @required = $self->required;
 	if ( ! @required ) {
-		warn "all params available ", dump( $self->params ), " not creating form";
+		warn "all params available ", dump( $self->params ), " not creating form" if $self->debug;
+		return (undef,$self->params) if wantarray;
 		return;
 	} else {
-		warn $self->class, " required params ", dump( @required );
+		warn $self->class, " required params ", map { $_->dump(2) } @required if $self->debug;
 	}
 
 	my $class = $self->class;
 
 	$self->load_class( $class );
 
-	my $params = {};
-	$params = $self->config($class);
-	warn "# $class config = ",dump( $params ) if $self->debug;
+	my $default = clone $self->params; # XXX we really don't want to modify params!
+
+	my $config_params = {};
+	$config_params = $self->config($class);
+	warn "# $class config = ",dump( $config_params ) if $self->debug;
 
-	my $html = qq|<h1>$class params</h1><form method="post">|;
+	my $form;
 
 	foreach my $name ( grep { ! $class->meta->get_attribute($_)->is_lazy } $self->attributes ) {
-		my $attr_type;
+		my $attr_type = '';
 		my $type = $name =~ m/^pass/ ? 'password' : 'text';
 		my $label = $name;
 		my $value = '';
 		my $label_title = '';
 		my $value_html = '';
-		if ( ref($params) eq 'HASH' ) {
-			$value = $params->{$name};
-		} elsif ( ref($params) eq 'ARRAY' ) {
+		if ( ref($config_params) eq 'HASH' ) {
+			$value = $config_params->{$name};
+		} elsif ( ref($config_params) eq 'ARRAY' ) {
 			$value_html = qq|<select name="$name">| . join("\n",
 				map {
 					my $v = $_->{$name};
 					qq|<option value="$v">$v</option>|
-				} @$params
+				} @$config_params
 			) . qq|</select>|;
+			$default->{$name} = $config_params->[0]->{$name};
 		} elsif ( my $attr = $class->meta->get_attribute( $name ) ) {
-			$attr_type = $attr->type_constraint->name;
 			if ( $attr->has_type_constraint ) {
+				$attr_type = $attr->type_constraint->name;
 				if ( $attr->type_constraint->can('values') ) {
 					$value_html = qq|<select name="$name">| . join("\n",
 						map { qq|<option value="$_">$_</option>| } @{ $attr->type_constraint->values }
@@ -131,11 +144,20 @@
 
 		$value_html = qq|<input type="$type" name="$name" title="$attr_type" value="$value">| unless $value_html;
 
+		$default->{$name} = $value unless defined $default->{$name};
+
 #		warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
-		$html .= qq|<label for="$name"$label_title>$label</label>| . $value_html;
+		$form .= qq|<label for="$name"$label_title>$label</label>| . $value_html;
 	}
-	$html .= qq|<input type="submit" value="Run $class"></form>|;
+	my $html = qq|<h1>$class params</h1><form method="post">$form<input type="submit" value="Run $class"></form>|;
+	push @{ $self->status }, { 'Params' =>
+		{
+			'Config'  => $config_params,
+			'Default' => $default
+		},
+	};
 
+	return ($html,$default) if wantarray;
 	return $html;
 }