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

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 57b2a91..fa0420b 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -9,7 +9,17 @@ our $VERSION = '1.00';
 
 
 sub new {
-	bless {}, $_[0];
+	my ($class, $default) = @_;
+	bless {default => $default}, $class;
+}
+
+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 {
@@ -49,48 +59,46 @@ 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) = @_;
-
-	#TODO: $attr
-
-	return $self->tag(input => {type => 'hidden', name => $name, value => $value});
-}
-
-sub input {
-	my ($self, $name, $value, $attr) = @_;
+	my $self = shift;
+	my ($name, $value, $attr) = $self->_attr(2, @_);
 
 	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;
+		my @return = map { $self->hidden($_, $name->{$_}, $attr) } sort keys %$name;
+		return wantarray ? @return : join(defined $, ? $, : '', @return);
 	}
-	else {
-		# name and value shorthands (all vars keep their assigned values)
-		$attr ||= {};
-		$attr->{name} = $name;
-		$attr->{value} = $value;
+
+	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->{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);
+}
+
+sub text {
+	my $self = shift;
+	my ($name, $value, $attr) = $self->_attr(2, @_);
+
+	$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};
@@ -103,40 +111,40 @@ sub input {
 }
 
 sub select {
-	my ($self, $name, $rows, $value, $attr) = @_;
+	my $self = shift;
+	my ($name, $rows, $default, $attr) = $self->_attr(3, @_);
 
-	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};
 
+	$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;
+
 	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),
 			'</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}
@@ -144,62 +152,76 @@ 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 ''
 				? '<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, $name, $value, $attr) = @_;
+	my $self = shift;
+	my ($name, $rows, $label, $attr) = $self->_attr(3, @_);
 
-	if (ref $value eq 'HASH') {
-		$attr = $value;
+	if (not defined $rows) {
+		if (defined $label) {
+			$rows = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
+		}
+		else {
+			$rows = [{}];
+		}
 	}
-	else {
-		$attr ||= {};
-		$attr->{value} = $value;
+	elsif (ref $rows ne 'ARRAY') {
+		$rows = [$rows];
+	}
+
+	if (defined $label) {
+		$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, [$attr], {type => 'radio'});
+	$self->select($name, $rows, {%$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') {
+			$rows->[$_]->{checked} = $checked->[$_] for 0 .. $#$rows;
+			push @$rows, map { {checked => $_} } @$checked[@$rows .. $#$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;
 
 =head1 NAME
 
-HTML::Form::Simple
+HTML::Form::Simple - Generate HTML form elements
 
 =head1 SYNOPSIS
 
@@ -213,7 +235,7 @@ HTML::Form::Simple
 			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'
@@ -224,3 +246,36 @@ HTML::Form::Simple
 	);
 	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>
+
+=head1 LICENSE
+
+This module is free software; you can redistribute it and/or modify it
+under the same L<terms|perlartistic> as Perl itself.
+