Changeset 50 in text-formbuilder for trunk/lib

Timestamp:

12/16/04 13:55:34 (20 years ago)

Author:

peichman

Message:

fallthrough to CGI::FormBuilder builtin lists working (again); added a !note directive; discovered bug in parsing of !directive and !note

Location:

trunk/lib/Text

Files:

• FormBuilder.pm (modified) (9 diffs)
• FormBuilder/grammar (modified) (2 diffs)

trunk/lib/Text/FormBuilder.pm

@@ -7 +7 @@
 use vars qw($VERSION @EXPORT);
 
-$VERSION = '0.07_03';
+$VERSION = '0.07';
 @EXPORT = qw(create_form);
 
@@ -30 +30 @@
 th.label { font-weight: normal; text-align: right; vertical-align: top; }
 td ul { list-style: none; padding-left: 0; margin-left: 0; }
+.note { background: #eee; }
 .sublabel { color: #999; }
 .invalid { background: red; }
@@ -246 +247 @@
     }
     
+    # get user-defined lists; can't make this conditional because
+    # we need to be able to fall back to CGI::FormBuilder's lists
+    # even if the user didn't define any
+    my %lists = %{ $self->{form_spec}{lists} || {} };
+    
     # substitute in list names
-    if (my %lists = %{ $self->{form_spec}{lists} || {} }) {
-        foreach (@{ $self->{form_spec}{fields} }) {
-            next unless $$_{list};
-            
-            $$_{list} =~ s/^\@//;   # strip leading @ from list var name
-            
-            # a hack so we don't get screwy reference errors
-            if (exists $lists{$$_{list}}) {
-                my @list;
-                push @list, { %$_ } foreach @{ $lists{$$_{list}} };
-                $$_{options} = \@list;
-            } else {
-                # assume that the list name is a builtin 
-                # and let it fall through to CGI::FormBuilder
-                $$_{options} = $$_{list};
-            }
-        } continue {
-            delete $$_{list};
+    foreach (@{ $self->{form_spec}{fields} }) {
+        next unless $$_{list};
+        
+        $$_{list} =~ s/^\@//;   # strip leading @ from list var name
+        
+        # a hack so we don't get screwy reference errors
+        if (exists $lists{$$_{list}}) {
+            my @list;
+            push @list, { %$_ } foreach @{ $lists{$$_{list}} };
+            $$_{options} = \@list;
+        } else {
+            # assume that the list name is a builtin 
+            # and let it fall through to CGI::FormBuilder
+            $$_{options} = $$_{list};
         }
+    } continue {
+        delete $$_{list};
     }
     
@@ -535 +539 @@
             if ($$line[0] eq 'head') {
                 $OUT .= qq[  <tr><th class="subhead" colspan="2"><h3>$$line[1]</h3></th></tr>\n]
+            } elsif ($$line[0] eq 'note') {
+                $OUT .= qq[  <tr><td class="note" colspan="2">$$line[1]</td></tr>\n]
             } elsif ($$line[0] eq 'field') {
                 local $_ = $field{$$line[1]};
@@ -959 +965 @@
     
     !head ...
+    
+    !note {
+        ...
+    }
 
 =head2 Directives
@@ -983 +993 @@
 =item C<!title>
 
+Title of the form.
+
 =item C<!author>
+
+Author of the form.
 
 =item C<!description>
@@ -1001 +1015 @@
 next to each other.
 
+=item C<!note>
+
+A text note that can be inserted as a row in the form. This is useful for
+special instructions at specific points in a long form.
+
 =back
+
+B<Known BUG:> If you include an odd number of C<'> or C<"> characters in a
+C<!description> or C<!note>, then that directive will mistakenly be skipped.
+This is a bug casued by me taking a shortcut in the parser C<:-/>
 
 =head2 Fields
@@ -1185 +1208 @@
 =head1 BUGS
 
+Having a single C<'> or C<"> in a C<!description> or C<!note> directive causes that
+directive to get skipped. This is an issue with the C<perl_codeblock> shortcut in
+Parse::RecDescent.
+
 Creating two $parsers in the same script causes the second one to get the data
 from the first one.
@@ -1194 +1221 @@
 =head1 SEE ALSO
 
-L<CGI::FormBuilder>
+L<http://textformbuilder.berlios.de>
+
+L<CGI::FormBuilder>, L<http://formbuilder.org>
 
 =head1 THANKS

trunk/lib/Text/FormBuilder/grammar

@@ -25 +25 @@
 }
 
-form_spec: (list_def | description_def | validate_def | group_def | line)(s)
+form_spec: (list_def | description_def | validate_def | group_def | note | line)(s)
     {
         # grab the last section, if there is any
@@ -84 +84 @@
     }
 
+note: '!note' <perl_codeblock>
+    {   
+        (my $note = $item[2]) =~ s/^{\s*|\s*}$//g;
+        push @lines, [ 'note', $note ];
+    }
+
+
 field_line: <skip:'[ \t]*'> ( field | comment | blank ) "\n"
 line: <skip:'[ \t]*'> ( title | author | pattern_def | section_head | heading | group_field | unknown_directive | field | comment | blank ) "\n"