XXX: hidden array

[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..e2a586d51987dc2914ea1b4c154caf2fff2dece7 100644 (file)
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -71,8 +71,19 @@ sub hidden {
        my $self = shift;
        my ($name, $value, $attr) = $self->_attr(2, @_);
 
-       $attr = {type => 'hidden', name => $name, value => $value};
-       #TODO: $attr
+       if (ref $name eq 'HASH') {
+               my @return = map { $self->hidden($_, $name->{$_}, $attr) } sort keys %$name;
+               return wantarray ? @return : join(defined $, ? $, : '', @return);
+       }
+
+       if (ref $value eq 'ARRAY') {
+               my @return = map { $self->hidden($name, $_, $attr) } @$value;
+               return wantarray ? @return : join(defined $, ? $, : '', @return);
+       }
+
+       $attr->{name } = $name  if defined $name;
+       $attr->{value} = $value if defined $value;
+       $attr->{type} = 'hidden' unless defined $attr->{type};
 
        return $self->tag(input => $attr);
 }
@@ -107,6 +118,8 @@ sub select {
 
        my @options = map { ref $_ ? $_ : {value => $_} } @$rows;
 
+       my @return;
+
        if ($attr->{type} eq 'select') {
                delete $attr->{type};
                if (defined $default) {
@@ -114,17 +127,17 @@ sub select {
                                $_->{selected} = 1 if defined $_->{value} and $_->{value} eq $default;
                        }
                }
-               my @return = (
+               @return = (
                        $self->tag(select => $attr),
                        (map { $self->tag(option => $_) } @options),
                        '</select>',
                );
-               return wantarray ? @return : join('', @return);
        }
        else {
-               if (defined $attr->{id}) {
-                       defined $_->{id} or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
-                               for @options;
+               if (defined $attr->{id} and $attr->{id} ne '') {
+                       defined $_->{id}
+                               or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
+                                       for @options;
                }
                if (defined $attr->{label}) {
                        defined $_->{value} and not defined $_->{label}
@@ -138,32 +151,59 @@ sub select {
                        }
                }
                $_ = {%$attr, %$_} for @options;
-               my @return = map {
+               @return = map {
                        my $label = delete $_->{label};
                        defined $label && $label ne ''
                                ? '<label>'.$self->tag(input => $_)." $label</label>"
                                :           $self->tag(input => $_)
                } @options;
-               return wantarray ? @return : join('', @return);
        }
+
+       return wantarray ? @return : join(defined $, ? $, : '', @return);
 }
 
 sub radio {
        my $self = shift;
-       my ($name, $value, $attr) = $self->_attr(2, @_);
+       my ($name, $label, $value, $attr) = $self->_attr(3, @_);
 
-       $self->select($name, [$value], {%$attr, type => 'radio'});
+       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'});
 }
 
 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;