XXX: multiple check 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..4eddc98188b7c543653465b52347dbc8fb1ee431 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,20 +150,46 @@ 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];
+       }
 
-       $self->select($name, [$value], {%$attr, type => 'radio'});
+       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'});
 }
 
 sub check {
        my $self = shift;
        my ($name, $label, $checked, $attr) = $self->_attr(3, @_);
 
-       $attr->{label  } = $label   if defined $label;
-       $attr->{checked} = $checked if defined $checked;
-       $attr->{value  } = '1' unless exists $attr->{value};
+       my $rows = defined $label ? ref $label eq 'ARRAY' ? $label : [$label] : [{}];
+       ref $_ eq 'HASH' or $_ = {label => $_} for @$rows;
+       if (defined $checked) {
+               if (ref $checked eq 'ARRAY') {
+                       $_->{checked} = shift @$checked for @$rows;
+                       push @$rows, map { {checked => $_} } @$checked;
+               }
+               else {
+                       $_->{checked} = $checked for @$rows;
+               }
+       }
+       exists $rows->[$_]->{value} or $rows->[$_]->{value} = $_ + 1 for 0 .. $#$rows;
 
-       $self->select($name, [$attr], {type => 'checkbox'});
+       $self->select($name, $rows, {%$attr, type => 'checkbox'});
 }
 
 1;