--- trunk/lib/Frey/Action.pm	2008/12/09 20:31:42	782
+++ trunk/lib/Frey/Action.pm	2009/06/28 14:05:08	1085
@@ -12,6 +12,11 @@
 Invoke any L<Frey> object creating html for with various default parameters
 if not supplied at invocation.
 
+You can force rendering of fields if you define C<render_attribute> sub with
+desired rendering as in:
+
+  sub render_pipe { 'radio' }
+
 =cut
 
 has 'class' => (
@@ -38,11 +43,12 @@
 
   my @required_attributes = $self->required;
   my $required_attributes = $self->required;
+  my $required_hash       = $self->required('as_hash');
 
 =cut
 
 sub required {
-	my ( $self ) = @_;
+	my ($self,$param) = @_;
 	$self->load_class( $self->class );
 
 	my @required = 
@@ -56,7 +62,14 @@
 			blessed $attr && $attr->is_required && $attr;
 		} $self->class->meta->get_attribute_list;
 
-	warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug;
+	@required = map { $_->name } @required;
+	warn "## required = ",dump( @required ), " for ", $self->class if @required && $self->debug;
+
+	if ( $param eq 'as_hash' ) {
+		my $hash;
+		map { $hash->{$_}++ } @required;
+		return $hash;
+	}
 	return @required if wantarray;
 	return \@required;
 }
@@ -76,7 +89,7 @@
 	my $a;
 	my @attrs = @{ $self->attribute_order };
 	@attrs = map {  $a->{$_}++; $_ } @attrs;
-	push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @{ $self->required };
+	push @attrs, $_ foreach grep { ! $a->{$_} } @{ $self->required };
 	warn "# attributes = ",dump( @attrs ) if $self->debug;
 	return @attrs if wantarray;
 	return \@attrs;
@@ -91,13 +104,21 @@
 
 sub params_form {
 	my ( $self ) = @_;
-	my @required = $self->required;
-	if ( ! @required ) {
+
+	foreach my $checkbox ( split(/\s+/, $self->params->{'frey-checkboxes'} ) ) {
+		next if defined $self->params->{ $checkbox };
+
+		$self->params->{ $checkbox } = 0;
+		warn "# checkbox $checkbox not ticked";
+	}
+
+	my $required = $self->required('as_hash');
+	if ( $required ) {
+		warn $self->class, " required params ", dump( keys %$required ) if $self->debug;
+	} else {
 		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 ", map { $_->dump(2) } @required if $self->debug;
 	}
 
 	my $class = $self->class;
@@ -111,27 +132,38 @@
 	warn "# $class config = ",dump( $params_config ) if $self->debug;
 
 	my $form;
+	my $form_id = $class;
+	$form_id =~ s{\W+}{_}g;
 
 	sub select_values {
 		my ( $name, $attr_type, $values ) = @_;
 
+		$attr_type ||= '?' and warn "$name doesn't have attr_type";
+
 		my $max_value_len = 0;
 		my @values;
+		my $display;
 		my $html = '';
 
 		foreach ( @$values ) {
 			my $v = ref($_) eq 'HASH' ? $_->{$name} : $_;
+			if ( $v =~ s/\t+(.+)$// ) {
+				$display->{$v} = $1;
+			}
 			warn "## value '$v'";
 			push @values, $v;
 			$max_value_len = length($v) if length($v) > $max_value_len;
 		}
 
 		warn "# max_value_len: $max_value_len";
+		my $render = eval $class . '->render_' . $name;
+		warn "## render $@";
 
-		if ( $#values > 3 ) {
+		if ( $#values > 3 && $render !~ m{radio} ) {
 			my $options = join("\n",
 				map {
-					qq|<option value="$_">$_</option>|;
+					my $d = $display->{$_} || $_;
+					qq|<option value="$_">$d</option>|;
 				} @values
 			);
 			# onchange="alert(this.options[this.selectedIndex].value);"
@@ -153,6 +185,18 @@
 						$delimiter
 				|) } @values
 			);
+			if ( $radio ) {
+				
+				my $size = int( $max_value_len / $self->input_step_size ) + 1;
+				$size = 5 if $size > 5;
+				$size *= $self->input_step_size;
+				$radio .= qq|
+					<span>
+					<input type="radio" name="$name" value=" " onclick="document.getElementById('new-$name').focus();" >
+					<input type="text" name="new-$name" id="new-$name" onchange="clear_radio('$form_id','$name'); this.disable = false;" onblur="this.disable = true;" title="enter new value" size="$size">
+					</span>
+				|;
+			}
 			$html = qq|<div style="display: block;">$radio</div>|;
 		}
 
@@ -161,20 +205,15 @@
 			$html
 	}
 
-	foreach my $checkbox ( split(/\s+/, $default->{'frey-checkboxes'} ) ) {
-		next if defined $default->{ $checkbox };
-
-		$default->{ $checkbox } = 0;
-		$self->params->{ $checkbox } = 0;
-		warn "# checkbox $checkbox not ticked";
-	}
 
 	my @checkboxes;
 
 	my $label_width = 1; # minimum
 
+
 	foreach my $name (
 		grep {
+			die "$_ doesn't have meta" unless $class->can('meta');
 			! $class->meta->get_attribute($_)->is_lazy
 			&& ! defined $default->{$_}
 			&& ! m{^_} # skip _private
@@ -192,23 +231,29 @@
 		my $value =
 			defined $default->{$name} ? $default->{$name}       :
 			$attr->has_default        ? $attr->default( $name ) :
-			'';
+			undef;
 
-		if ( ref($params_config) eq 'HASH' ) {
+		if ( ref($params_config) eq 'HASH' && defined $params_config->{$name} ) {
 			$value = $params_config->{$name};
 		} elsif ( ref($params_config) eq 'ARRAY' ) {
 			$value_html = select_values( $name, $attr_type, $params_config );
 			$default->{$name} = $params_config->[0]->{$name};
 		} elsif ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) {
 			$value_html = select_values( $name, $attr_type, $attr->type_constraint->values );
+		} elsif ( $class->can( $name . '_available' ) ) {
+			my $available = eval $class . '->' . $name . '_available';
+			confess $@ if $@;
+			$available =~ s/^\s+//gs;
+			$available =~ s/\s+$//gs;
+			$value_html = select_values( $name, $attr_type, [ split(/\n/,$available) ]);
 		} elsif ( $attr_type =~ m{^Bool} ) {
 			my $suffix = '';
-			$suffix = ' checked' if $value;
-			$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value="$value"$suffix>|;
+			$suffix = ' checked=1' if $value;
+			$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value=1$suffix>|;
 			push @checkboxes, $name;
-		} elsif ( ! defined $value ) {
+		} elsif ( ! defined $value && ! $required->{$name} ) {
 			$value_html = qq|<tt id="$name">undef</tt><!-- $name = undef -->|; # FIXME if $self->debug
-		} elsif ( $attr_type !~ m{^(Str|Int)$} || $value =~ $Frey::Web::re_html ) {
+		} elsif ( $attr_type !~ m{^(Str|Int)$} || $value =~ $Frey::Web::re_html || $name =~ m{text} ) {
 			$value_html = qq|<textarea name="$name" title="$attr_type">$value</textarea>|;
 		}
 
@@ -220,12 +265,20 @@
 		$value_html = qq|<input type="$type" name="$name" title="$attr_type" value="$value" size="$size">| unless $value_html;
 
 #		warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
+
+		$label_title .= qq| class="required"| if $required->{$name};
+		$label =~ s/_/ /g;
+
 		$form .= qq|<label for="$name"$label_title>$label</label>$value_html<br>|;
 		my $ll = length($label);
 		$label_width = $ll if $ll > $label_width;
 	}
 	$form .= qq|<input type="hidden" name="frey-checkboxes" value="| . join(' ', @checkboxes) . qq|">| if @checkboxes;
 
+	$label_width += 2; # XXX padding left+right em
+
+	$self->add_js('static/Frey/Action.js');
+
 	$self->add_css(qq|
 		label,input {
 			display: block;
@@ -233,10 +286,20 @@
 			margin-bottom: 10px;
 		}
 
+		input:focus {
+			border-color: #cc0;
+			background: #ffc;
+		}
+
 		label {
 			text-align: right;
 			width: ${label_width}ex;
-			padding-right: 20px;
+			padding-right: 1ex;
+			white-space: nowrap;
+		}
+
+		label.required {
+			font-weight: bold;
 		}
 
 		br {
@@ -251,7 +314,7 @@
 
 	$html = qq|
 		<h1>$class params</h1>
-		<form method="post">
+		<form name="$form_id" id="$form_id" method="post">
 		$form
 		<input type="submit" value="Run $class">
 		</form>