X-Git-Url: http://git.shiar.net/perl/html-form-simple.git/blobdiff_plain/bb5bd81e03c47ff9cc779c5109bd6e042219a1f8..42e413b01d9303fffba217b94f5bc7b46ee7dac9:/lib/HTML/Form/Simple.pm

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 3a58c79..fa0420b 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -9,7 +9,8 @@ our $VERSION = '1.00';
 
 
 sub new {
-	bless {}, $_[0];
+	my ($class, $default) = @_;
+	bless {default => $default}, $class;
 }
 
 sub _attr {
@@ -83,6 +84,8 @@ sub hidden {
 
 	$attr->{name } = $name  if defined $name;
 	$attr->{value} = $value if defined $value;
+	$attr->{value} = $self->{default}->{$name}
+		if not defined $attr->{value} and defined $name and defined $self->{default};
 	$attr->{type} = 'hidden' unless defined $attr->{type};
 
 	return $self->tag(input => $attr);
@@ -94,6 +97,8 @@ sub text {
 
 	$attr->{name } = $name  if defined $name;
 	$attr->{value} = $value if defined $value;
+	$attr->{value} = $self->{default}->{$name}
+		if not defined $attr->{value} and defined $name and defined $self->{default};
 	$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};
@@ -109,13 +114,15 @@ sub select {
 	my $self = shift;
 	my ($name, $rows, $default, $attr) = $self->_attr(3, @_);
 
-	$default = $attr->{value} unless defined $default;
-	delete $attr->{value};  # never a parent attribute
-
 	$attr->{name} = $name;
 	$attr->{id}   = $attr->{name} unless defined $attr->{id};
 	$attr->{type} = 'select' unless defined $attr->{type};
 
+	$default = $attr->{value} unless defined $default;
+	delete $attr->{value};  # never a parent attribute
+	$default = $self->{default}->{$name}
+		if not defined $default and defined $name and defined $self->{default};
+
 	my @options = map { ref $_ ? $_ : {value => $_} } @$rows;
 
 	my @return;
@@ -164,38 +171,42 @@ sub select {
 
 sub radio {
 	my $self = shift;
-	my ($name, $label, $value, $attr) = $self->_attr(3, @_);
+	my ($name, $rows, $label, $attr) = $self->_attr(3, @_);
 
-	if (not defined $value) {
+	if (not defined $rows) {
 		if (defined $label) {
-			$value = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
+			$rows = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
 		}
 		else {
-			$value = [{}];
+			$rows = [{}];
 		}
 	}
-	elsif (ref $value ne 'ARRAY') {
-		$value = [$value];
+	elsif (ref $rows ne 'ARRAY') {
+		$rows = [$rows];
 	}
 
 	if (defined $label) {
-		$_ = ref $_ eq 'HASH' ? {%$_} : {value => $_} for @$value;
-		$_->{label} = ref $label eq 'ARRAY' ? shift @$label : $label for @$value;
+		$rows = [ map { ref $_ eq 'HASH' ? {%$_} : {value => $_} } @$rows ];
+		if (ref $label eq 'ARRAY') {
+			$rows->[$_]->{label} = $label->[$_] for 0 .. $#$rows;
+		} else {
+			$_->{label} = $label for @$rows;
+		}
 	}
 
-	$self->select($name, $value, {%$attr, type => 'radio'});
+	$self->select($name, $rows, {%$attr, type => 'radio'});
 }
 
 sub check {
 	my $self = shift;
 	my ($name, $label, $checked, $attr) = $self->_attr(3, @_);
 
-	my $rows = defined $label ? ref $label eq 'ARRAY' ? $label : [$label] : [{}];
+	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;
+			$rows->[$_]->{checked} = $checked->[$_] for 0 .. $#$rows;
+			push @$rows, map { {checked => $_} } @$checked[@$rows .. $#$checked];
 		}
 		else {
 			$_->{checked} = $checked for @$rows;
@@ -224,7 +235,7 @@ HTML::Form::Simple - Generate HTML form elements
 			msg => 'Textarea default', {rows => 4, style => 'background:red'}
 		) ],
 		[ Gender => join ' or ', $input->radio(
-			sex => ['m', 'f']
+			sex => [qw(m f)], [qw(Male Female)]
 		) ],
 		[ Colour => scalar $input->select(
 			favcolour => [qw(Blue Green Red)], 'Green'
@@ -235,6 +246,30 @@ HTML::Form::Simple - Generate HTML form elements
 	);
 	say $input->stop; # </form>
 
+=head1 TODO
+
+=over
+
+=item C<default()> method
+
+	$input->hidden(foo => $input->default('foo'));
+	$hash_ref = $input->default;
+	$input->default('foo') = 'new value';
+	undef $input->default;  # clear all
+		# XXX: does this equal $input->default=undef;?
+	$input->default = {amend => 'stuff'};
+
+=item documentation
+
+Actual descriptions instead of just a synopsis.
+
+=item C<quote> override
+
+Allow custom value quotation function.
+Makes L<XML::Quote|XML::Quote> dependency optional.
+
+=back
+
 =head1 AUTHOR
 
 Mischa POSLAWSKY <perl@shiar.org>