X-Git-Url: http://git.shiar.nl/perl/html-form-simple.git/blobdiff_plain/be81b5d559a8ed87ee6493f27b698343fada60c4..2ee16ffeffbdd0998c60f36a976169789e3c8e27:/lib/HTML/Form/Simple.pm
diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 57b2a91..e2a586d 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -12,6 +12,15 @@ sub new {
bless {}, $_[0];
}
+sub _attr {
+ my $self = shift;
+ my $expect = shift;
+ my $attr = ref $_[-1] eq 'HASH' ? pop : {};
+ push @_, undef for @_+1 .. $expect;
+ push @_, $attr;
+ return @_;
+}
+
sub quote {
my $self = shift;
return XML::Quote::xml_quote_min($_[0]);
@@ -49,48 +58,42 @@ sub stop {
sub submit {
- my ($self, $value, $attr) = @_;
-
- if (ref $value eq 'HASH') {
- $attr = $value;
- }
- else {
- $attr ||= {};
- $attr->{value} = $value;
- }
+ my $self = shift;
+ my ($value, $attr) = $self->_attr(1, @_);
+ $attr->{value} = $value if defined $value;
$attr->{type} = 'submit' unless defined $attr->{type};
return $self->tag(input => $attr);
}
sub hidden {
- my ($self, $name, $value) = @_;
+ my $self = shift;
+ my ($name, $value, $attr) = $self->_attr(2, @_);
+
+ 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);
+ }
- #TODO: $attr
+ $attr->{name } = $name if defined $name;
+ $attr->{value} = $value if defined $value;
+ $attr->{type} = 'hidden' unless defined $attr->{type};
- return $self->tag(input => {type => 'hidden', name => $name, value => $value});
+ return $self->tag(input => $attr);
}
sub input {
- my ($self, $name, $value, $attr) = @_;
-
- if (ref $name eq 'HASH') {
- # only attributes provided (first argument)
- $attr = $name;
- }
- elsif (ref $value eq 'HASH') {
- # name shorthand (attributes in value parameter)
- $attr = $value;
- $attr->{name} = $name;
- }
- else {
- # name and value shorthands (all vars keep their assigned values)
- $attr ||= {};
- $attr->{name} = $name;
- $attr->{value} = $value;
- }
+ my $self = shift;
+ my ($name, $value, $attr) = $self->_attr(2, @_);
+ $attr->{name } = $name if defined $name;
+ $attr->{value} = $value if defined $value;
$attr->{id} = $attr->{name} unless defined $attr->{id};
$attr->{type} = 'text' unless defined $attr->{type} or defined $attr->{rows};
$value = delete $attr->{value} if defined $attr->{rows};
@@ -103,40 +106,38 @@ sub input {
}
sub select {
- my ($self, $name, $rows, $value, $attr) = @_;
+ my $self = shift;
+ my ($name, $rows, $default, $attr) = $self->_attr(3, @_);
+
+ $default = $attr->{value} unless defined $default;
+ delete $attr->{value}; # never a parent attribute
- if (ref $value eq 'HASH') {
- $attr = $value;
- $value = delete $attr->{value};
- }
- else {
- $attr ||= {};
- delete $attr->{value};
- }
$attr->{name} = $name;
$attr->{id} = $attr->{name} unless defined $attr->{id};
$attr->{type} = 'select' unless defined $attr->{type};
my @options = map { ref $_ ? $_ : {value => $_} } @$rows;
+ my @return;
+
if ($attr->{type} eq 'select') {
delete $attr->{type};
- if (defined $value) {
+ if (defined $default) {
for (@options) {
- $_->{selected} = 1 if defined $_->{value} and $_->{value} eq $value;
+ $_->{selected} = 1 if defined $_->{value} and $_->{value} eq $default;
}
}
- my @return = (
+ @return = (
$self->tag(select => $attr),
(map { $self->tag(option => $_) } @options),
'',
);
- 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}
@@ -144,55 +145,65 @@ sub select {
for @options;
delete $attr->{label};
}
- if (defined $value) {
+ if (defined $default) {
for (@options) {
- $_->{checked} = 1 if defined $_->{value} and $_->{value} eq $value;
+ $_->{checked} = 1 if defined $_->{value} and $_->{value} eq $default;
}
}
$_ = {%$attr, %$_} for @options;
- my @return = map {
+ @return = map {
my $label = delete $_->{label};
defined $label && $label ne ''
? '"
: $self->tag(input => $_)
} @options;
- return wantarray ? @return : join('', @return);
}
+
+ return wantarray ? @return : join(defined $, ? $, : '', @return);
}
sub radio {
- my ($self, $name, $value, $attr) = @_;
+ my $self = shift;
+ my ($name, $label, $value, $attr) = $self->_attr(3, @_);
- if (ref $value eq 'HASH') {
- $attr = $value;
+ if (not defined $value) {
+ if (defined $label) {
+ $value = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
+ }
+ else {
+ $value = [{}];
+ }
}
- else {
- $attr ||= {};
- $attr->{value} = $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, [$attr], {type => 'radio'});
+ $self->select($name, $value, {%$attr, type => 'radio'});
}
sub check {
- my ($self, $name, $label, $checked, $attr) = @_;
-
- if (ref $label eq 'HASH') {
- $attr = $label;
- undef $label;
- }
- elsif (ref $checked eq 'HASH') {
- $attr = $checked;
- $attr->{label} = $label;
- }
- else {
- $attr ||= {};
- $attr->{checked} = $checked;
- $attr->{label} = $label;
+ my $self = shift;
+ my ($name, $label, $checked, $attr) = $self->_attr(3, @_);
+
+ 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;
+ }
}
- $attr->{value} = '1' unless exists $attr->{value};
+ exists $rows->[$_]->{value} or $rows->[$_]->{value} = $_ + 1 for 0 .. $#$rows;
- $self->select($name, [$attr], {type => 'checkbox'});
+ $self->select($name, $rows, {%$attr, type => 'checkbox'});
}
1;