XXX: multiple radio values

[perl/html-form-simple.git] / lib / HTML / Form / Simple.pm

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 2c8ce8de0d2938855c6fed97f31fb4c5ee819b8b..6fb908046cc538e16210b77f4f9b46436ceec56d 100644 (file)
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -122,7 +122,7 @@ sub select {
                return wantarray ? @return : join('', @return);
        }
        else {
-               if (defined $attr->{id}) {
+               if (defined $attr->{id} and $attr->{id} ne '') {
                        defined $_->{id} or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
                                for @options;
                }
@@ -150,9 +150,26 @@ sub select {
 
 sub radio {
        my $self = shift;
-       my ($name, $value, $attr) = $self->_attr(2, @_);
+       my ($name, $label, $value, $attr) = $self->_attr(3, @_);
+
+       if (not defined $value) {
+               if (defined $label) {
+                       $value = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
+               }
+               else {
+                       $value = [{}];
+               }
+       }
+       elsif (ref $value ne 'ARRAY') {
+               $value = [$value];
+       }
+
+       if (defined $label) {
+               $_ = ref $_ eq 'HASH' ? {%$_} : {value => $_} for @$value;
+               $_->{label} = ref $label eq 'ARRAY' ? shift @$label : $label for @$value;
+       }
 
-       $self->select($name, [$value], {%$attr, type => 'radio'});
+       $self->select($name, $value, {%$attr, type => 'radio'});
 }
 
 sub check {