Changeset 33779 for lang/perl/MENTA

Timestamp:

06/04/09 13:11:42 (4 years ago)

Author:

kazuho

Message:

update HTML::AutoForm? in extlib to that of trunk

Location:

lang/perl/MENTA/trunk/extlib/HTML

Files:

• AutoForm.pm (modified) (7 diffs)
• AutoForm/Field.pm (modified) (1 diff)
• AutoForm/Field/InputCheckable.pm (modified) (1 diff)
• AutoForm/Field/Option.pm (modified) (2 diffs)
• AutoForm/Field/Select.pm (modified) (1 diff)

lang/perl/MENTA/trunk/extlib/HTML/AutoForm.pm

@@ -27 +27 @@
 our $CLASS_PREFIX;
 
+sub DEBUG () { $ENV{HTML_AUTOFORM_DEBUG} && 1 }
+
 BEGIN {
     $VERSION = '0.01';
@@ -74 +76 @@
         my $opts = $fields->[$i + 1];
         die 'field type is missing or invalid'
-            unless $opts->{type} =~ /^(text|hidden|password|radio|select|checkbox|textarea)$/;
+            unless $opts->{type} =~ /^(text|hidden|password|radio|select|checkbox|textarea|file)$/;
         my $field_klass = 'HTML::AutoForm::Field::' . ucfirst $opts->{type};
         push @{$self->{fields}}, $field_klass->new(
@@ -106 +108 @@
         '"',
         ($self->secure ? ' method="POST"' : ''),
+        ((grep {$_->type eq 'file'} @{$self->{fields}}) ?
+            ' enctype="multipart/form-data"' : ''),
         '>',
         '<table class="',
@@ -124 +128 @@
                 );
                 if ($do_validate) {
-                    print STDERR "validating: ", $field->name, "\n";
                     if (my $err = $field->validate($query)) {
                         push(
@@ -176 +179 @@
     for my $f (@{$self->{fields}}) {
         if (my $error = $f->validate($query)) {
+            print STDERR (
+                'validation error:', $f->name, ':', $error->message, "\n",
+            ) if DEBUG;
             return;
         } elsif (my $h = $f->custom) {
             if (my $error = $h->($f, $query)) {
+                print STDERR (
+                    'custom validation error:', $f->name, ':', $error->message,
+                    "\n",
+                ) if DEBUG;
                 return;
             }
@@ -188 +198 @@
             if ($check_csrf_callback->($csrf_value)) {
                 $ok = 1;
+            } else {
+                print STDERR 'csrf validation error:', "\n"
+                    if DEBUG;
             }
+        } else {
+            print STDERR 'no csrf key', "\n"
+                if DEBUG;
         }
         return
             unless $ok;
     }
+    print STDERR "no errors found in validation\n"
+        if DEBUG;
     1;
 }
@@ -202 +220 @@
             ($_ => $base->{$_})
         } grep {
-            ! exists $omit->{$_} && ! /^(allow_multiple|label|required)$/
+            ! exists $omit->{$_} && ! /^(allow_multiple|label|required|xhtml_compat)$/
         } keys %$base),
         %$extra,
     );
+    my $is_xhtml = $base->{xhtml_compat};
     my $html = join(
         '',
         '<' . $tag,
         (map {
-            ' ' . $_ . '="' . _escape_html($attr{$_}) . '"'
+            $is_xhtml || $_ ne $attr{$_} ||
+            ! /^(?:(?:check|disable|select)ed|readonly)$/
+                ? ' ' . $_ . '="' . _escape_html($attr{$_}) . '"'
+                : ' ' . $_;
         } sort grep {
             defined $attr{$_}
         } keys %attr),
-        defined $append ? ('>', $append, '</', $tag, '>') : ' />',
+        defined $append ? ('>', $append, '</', $tag, '>') : ($is_xhtml ? ' />' : '>'),
     );
     $html;

lang/perl/MENTA/trunk/extlib/HTML/AutoForm/Field.pm

@@ -15 +15 @@
         custom         => undef,
         allow_multiple => undef,
+        xhtml_compat   => 1,
     );
     Class::Accessor::Lite->mk_accessors(keys %Defaults);

lang/perl/MENTA/trunk/extlib/HTML/AutoForm/Field/InputCheckable.pm

@@ -39 +39 @@
                      ? grep { $_ eq $self->{value} } @$values
                          : $self->{checked})
-                    ? (checked => 1) : (),
+                    ? (checked => 'checked') : (),
             },
             {

lang/perl/MENTA/trunk/extlib/HTML/AutoForm/Field/Option.pm

@@ -6 +6 @@
 
 BEGIN {
-    Class::Accessor::Lite->mk_accessors(qw(value label selected));
+    Class::Accessor::Lite->mk_accessors(qw(value label selected xhtml_compat));
 };
 
@@ -23 +23 @@
         $self,
         ($values ? grep { $_ eq $self->{value} } @$values : $self->{selected})
-            ? { selected => 1 } : {},
+            ? { selected => 'selected' } : {},
         { selected => 1 },
         $self->{label},

lang/perl/MENTA/trunk/extlib/HTML/AutoForm/Field/Select.pm

@@ -30 +30 @@
                 %$attributes,
                 value  => $value,
+                xhtml_compat => $self->xhtml_compat,
             );
         }