r39283 - in /branches/upstream/libhtml-formfu-perl/current: ./ lib/HTML/ lib/HTML/FormFu/ lib/HTML/FormFu/Element/ lib/HTML/FormFu/Model/ t/bugs/ t/elements/ t/filters/ t/form/ t/i18n/

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Fri Jul 3 23:33:39 UTC 2009


Author: ansgar-guest
Date: Fri Jul  3 23:33:35 2009
New Revision: 39283

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39283
Log:
[svn-upgrade] Integrating new upstream version, libhtml-formfu-perl (0.05001)

Added:
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Label.pm
    branches/upstream/libhtml-formfu-perl/current/t/bugs/datetime_hour_lt_10.t
    branches/upstream/libhtml-formfu-perl/current/t/elements/label.t
    branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.t
    branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.yml
Modified:
    branches/upstream/libhtml-formfu-perl/current/Changes
    branches/upstream/libhtml-formfu-perl/current/MANIFEST
    branches/upstream/libhtml-formfu-perl/current/META.yml
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Date.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/DateTime.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Localize.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Model/HashRef.pm
    branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Util.pm
    branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.t
    branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.yml
    branches/upstream/libhtml-formfu-perl/current/t/form/get_all_elements.t

Modified: branches/upstream/libhtml-formfu-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/Changes?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/Changes (original)
+++ branches/upstream/libhtml-formfu-perl/current/Changes Fri Jul  3 23:33:35 2009
@@ -1,3 +1,21 @@
+0.05001 2009-07-03
+
+    - get_field(s), get_element(s), get_all_elements() now support a Regex
+      object for any conditional argument.
+    
+    - Model::Hashref now searches for Multi and Repeatable elements using the
+      regexes qr/Multi/ and qr/Repeatable/ to all for custom/derived classes.
+    
+    - New $form->add_localize_object_from_class() method.
+    
+    - New Element::Label.
+    
+    - Bugfix: DateTime element, hour/minute select menus didn't display correct
+      value when hour/minute value was less than 10, and $form->process()
+      wasn't called after $form->model->default_values().
+    
+    - Silence "undef value in string eq" warnings.
+
 0.05000 2009-05-26
 
     - Nested repeatable blocks now create field names such as

Modified: branches/upstream/libhtml-formfu-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/MANIFEST?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/MANIFEST (original)
+++ branches/upstream/libhtml-formfu-perl/current/MANIFEST Fri Jul  3 23:33:35 2009
@@ -144,6 +144,7 @@
 lib/HTML/FormFu/Element/Hidden.pm
 lib/HTML/FormFu/Element/Hr.pm
 lib/HTML/FormFu/Element/Image.pm
+lib/HTML/FormFu/Element/Label.pm
 lib/HTML/FormFu/Element/Multi.pm
 lib/HTML/FormFu/Element/Number.pm
 lib/HTML/FormFu/Element/Password.pm
@@ -256,6 +257,7 @@
 t/block_insert_before.t
 t/bugs/constructor_arg_overwrites_default.t
 t/bugs/date_element_empty_input.t
+t/bugs/datetime_hour_lt_10.t
 t/bugs/element_class.t
 t/bugs/element_parent.t
 t/bugs/error_msg.t
@@ -403,6 +405,7 @@
 t/elements/hidden.t
 t/elements/hr.t
 t/elements/image.t
+t/elements/label.t
 t/elements/label.yml
 t/elements/multi.t
 t/elements/multi_errors.t
@@ -567,6 +570,8 @@
 t/form/submitted_and_valid.t
 t/form/valid.t
 t/i18n/add_localize_object.t
+t/i18n/add_localize_object_from_class.t
+t/i18n/add_localize_object_from_class.yml
 t/inflators/array.t
 t/inflators/callback.t
 t/inflators/compounddatetime.t

Modified: branches/upstream/libhtml-formfu-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/META.yml?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/META.yml (original)
+++ branches/upstream/libhtml-formfu-perl/current/META.yml Fri Jul  3 23:33:35 2009
@@ -58,4 +58,4 @@
   perl: 5.8.1
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.05000
+version: 0.05001

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu.pm Fri Jul  3 23:33:35 2009
@@ -112,7 +112,7 @@
 *plugins           = \&plugin;
 *add_plugins       = \&add_plugin;
 
-our $VERSION = '0.05000';
+our $VERSION = '0.05001';
 $VERSION = eval $VERSION;
 
 Class::C3::initialize();
@@ -2775,6 +2775,12 @@
         type => 'Radio',
     });
 
+Accepts also an Regexp to search for results.
+
+    $form->get_elements({
+        name => qr/oo/,
+    });
+
 =head2 get_field
 
 Arguments: [%options]
@@ -2804,6 +2810,12 @@
         type => 'Radio',
     });
 
+Accepts also an Regexp to search for results.
+
+    $form->get_elements({
+        name => qr/oo/,
+    });
+
 =head2 get_element
 
 Arguments: [%options]
@@ -2834,6 +2846,12 @@
     
     $form->get_all_elements({
         type => 'Text',
+    });
+
+Accepts also an Regexp to search for results.
+
+    $form->get_elements({
+        name => qr/oo/,
     });
 
 See L</get_elements> for a non-recursive version.
@@ -2856,6 +2874,12 @@
         type => 'Text',
     });
 
+Accepts also an Regexp to search for results.
+
+    $form->get_elements({
+        name => qr/oo/,
+    });
+
 See L</get_all_elements> for a non-recursive version.
 
 =head2 get_deflators

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element.pm Fri Jul  3 23:33:35 2009
@@ -542,6 +542,8 @@
 
 =item L<HTML::FormFu::Element::Hr>
 
+=item L<HTML::FormFu::Element::Label>
+
 =item L<HTML::FormFu::Element::Multi>
 
 =item L<HTML::FormFu::Element::Repeatable>

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Date.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Date.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Date.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Date.pm Fri Jul  3 23:33:35 2009
@@ -17,6 +17,9 @@
 
 __PACKAGE__->mk_accessors( qw(
         _known_fields
+        printf_day
+        printf_month
+        printf_year
 ) );
 
 __PACKAGE__->mk_item_accessors( qw(
@@ -60,6 +63,10 @@
 
     $self->_known_fields( [qw/ day month year /] );
 
+    $self->printf_day  ('%d');
+    $self->printf_month('%d');
+    $self->printf_year ('%d');
+
     $self->field_order( [qw/ day month year /] );
 
     $self->day( {
@@ -99,8 +106,13 @@
             for my $i ( 0 .. $#order ) {
                 my $field = $order[$i];
 
-                $self->_elements->[$i]
-                    ->default( $value ? $self->$field->{default} : undef );
+                my $printf_method = "printf_$field";
+
+                my $default = $value
+                    ? sprintf( $self->$printf_method, $self->$field->{default} )
+                    : undef;
+
+                $self->_elements->[$i]->default($default);
             }
         }
 

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/DateTime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/DateTime.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/DateTime.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/DateTime.pm Fri Jul  3 23:33:35 2009
@@ -6,6 +6,8 @@
 use Scalar::Util qw( blessed );
 
 __PACKAGE__->mk_attrs(qw/ hour minute /);
+
+__PACKAGE__->mk_accessors(qw/ printf_hour printf_minute /);
 
 sub new {
     my $self = shift->next::method(@_);
@@ -30,6 +32,9 @@
             type   => '_MultiSelect',
             prefix => [],
         } );
+
+    $self->printf_hour  ('%02d');
+    $self->printf_minute('%02d');
 
     return $self;
 }

Added: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Label.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Label.pm?rev=39283&op=file
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Label.pm (added)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Element/Label.pm Fri Jul  3 23:33:35 2009
@@ -1,0 +1,129 @@
+package HTML::FormFu::Element::Label;
+
+use strict;
+use base 'HTML::FormFu::Element::_Field';
+use Class::C3;
+
+use HTML::FormFu::ObjectUtil qw( _coerce );
+use HTML::FormFu::Util qw( process_attrs );
+
+__PACKAGE__->mk_item_accessors(qw( field_type tag label_filename ));
+
+sub new {
+    my $self = shift->next::method(@_);
+
+    $self->tag('span');
+    $self->filename('label_tag');
+
+    #$self->field_type('label');
+    #$self->retain_default(1);
+    $self->model_config->{read_only} = 1;
+    return $self;
+}
+
+sub string {
+    my ( $self, $args ) = @_;
+
+    $args ||= {};
+
+    my $render
+        = exists $args->{render_data}
+        ? $args->{render_data}
+        : $self->render_data;
+
+    # field wrapper template - start
+
+    my $html = $self->_string_field_start($render);
+
+    # input_tag template
+
+    $html .= $self->_string_field($render);
+
+    # field wrapper template - end
+
+    $html .= $self->_string_field_end($render);
+
+    return $html;
+}
+
+sub _string_field {
+    my ( $self, $render ) = @_;
+
+    my $html .= "<" . $self->tag;
+
+    $html .= sprintf "%s", process_attrs( $render->{attributes} || {} );
+
+    if ( defined $render->{nested_name} ) {
+        $html .= sprintf qq{ name="%s"}, $render->{nested_name};
+    }
+    $html .= ">";
+    if ( defined $render->{value} ) {
+        $html .= sprintf qq{%s}, $render->{value};
+    }
+    $html .= "</" . $self->tag . ">";
+
+    return $html;
+}
+
+sub process_input {
+    my ( $self, $input ) = @_;
+
+    my $form = $self->form;
+    my $name = $self->nested_name;
+
+    if ( $form->submitted && $form->nested_hash_key_exists( $input, $name ) ) {
+        $form->delete_nested_hash_value( $input, $name );
+    }
+
+    return;
+}
+
+sub render_data_non_recursive {
+    my ( $self, $args ) = @_;
+
+    my $render = $self->next::method( {
+            tag => $self->tag,
+            $args ? %$args : (),
+        } );
+
+    return $render;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+HTML::FormFu::Element::Label - field for displaying only
+
+=head1 DESCRIPTION
+
+This element displays a value. This is useful if you use a model like
+L<HTML::FormFu::Model::DBIC> and want to display a value from the database.
+The value of this field cannot be set by the client.
+
+See L<HTML::FormFu::Model::DBIC/"Set a field read only"> for more information
+on read only fields.
+
+=head1 METHODS
+
+=head2 tag
+
+Set the tag for this element.
+
+=head1 SEE ALSO
+
+Is a sub-class of, and inherits methods from 
+L<HTML::FormFu::Element::_Field>, L<HTML::FormFu::Element>
+
+L<HTML::FormFu>
+
+=head1 AUTHOR
+
+Moritz Onken, C<< onken at houseofdesign.de >>
+
+=head1 LICENSE
+
+This library is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Localize.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Localize.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Localize.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Localize.pm Fri Jul  3 23:33:35 2009
@@ -12,6 +12,7 @@
 our @EXPORT = qw(
     localize
     add_localize_object
+    add_localize_object_from_class
     get_localize_object_from_class
     get_localize_object_dies_on_missing_key
     add_default_localize_object
@@ -85,6 +86,16 @@
     }
 
     return $self;
+}
+
+sub add_localize_object_from_class {
+    my ( $self, @class ) = @_;
+    
+    return $self->add_localize_object(
+        map {
+            $self->get_localize_object_from_class( $_ )
+        } @class
+    );
 }
 
 sub get_localize_object_from_class {

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Model/HashRef.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Model/HashRef.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Model/HashRef.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Model/HashRef.pm Fri Jul  3 23:33:35 2009
@@ -248,7 +248,7 @@
     my $element = shift;
     unless ( $self->_multi ) {
         my %multis = ();
-        my $multis = $self->form->get_all_elements( { type => "Multi" } );
+        my $multis = $self->form->get_all_elements( { type => qr/Multi/ } );
         foreach my $multi ( @{ $multis || [] } ) {
             my @multis;
             map { push( @multis, $_->name ) } @{ $multi->get_elements };
@@ -265,7 +265,7 @@
     my $element = shift;
     unless ( $self->_repeatable ) {
         my %rep = ();
-        my $rep = $self->form->get_all_elements( { type => "Repeatable" } );
+        my $rep = $self->form->get_all_elements( { type => qr/Repeatable/ } );
 # TODO - Mario Minati 19.05.2009
 # use $_->delimiter to split the keys
         foreach my $rep_element (@{ $rep || [] }) {

Modified: branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Util.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Util.pm?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Util.pm (original)
+++ branches/upstream/libhtml-formfu-perl/current/lib/HTML/FormFu/Util.pm Fri Jul  3 23:33:35 2009
@@ -125,11 +125,11 @@
 
     for my $name ( keys %$args ) {
         my $value;
-
+        next unless defined $args->{$name};
         @$elements = grep {
                    $_->can($name)
                 && defined( $value = $_->$name )
-                && $value eq $args->{$name}
+                && (ref($args->{$name}) eq 'Regexp' ? $value =~ $args->{$name} : $value eq $args->{$name})
         } @$elements;
     }
 

Added: branches/upstream/libhtml-formfu-perl/current/t/bugs/datetime_hour_lt_10.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/bugs/datetime_hour_lt_10.t?rev=39283&op=file
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/bugs/datetime_hour_lt_10.t (added)
+++ branches/upstream/libhtml-formfu-perl/current/t/bugs/datetime_hour_lt_10.t Fri Jul  3 23:33:35 2009
@@ -1,0 +1,181 @@
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+use HTML::FormFu;
+use DateTime;
+
+my $dt = DateTime->new(
+    day    => 6,
+    month  => 8,
+    year   => 2007,
+    hour   => 1,
+    minute => 0,
+);
+
+my $form = HTML::FormFu->new(
+    { tt_args => { INCLUDE_PATH => 'share/templates/tt/xhtml' } } );
+
+$form->load_config_file('t/elements/datetime.yml');
+
+$form->process;
+
+# simulate calling $form->model->default_values
+# without then calling $form->process
+
+my $foo_field = $form->get_field('foo');
+
+$foo_field->default($dt);
+
+my $xhtml = qq{<div class="datetime">
+<span class="elements">
+<select name="foo_day">
+<option value="">-- Day --</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6" selected="selected">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="foo_month">
+<option value="">-- Month --</option>
+<option value="1">Jan</option>
+<option value="2">Feb</option>
+<option value="3">Mar</option>
+<option value="4">Apr</option>
+<option value="5">May</option>
+<option value="6">Jun</option>
+<option value="7">Jul</option>
+<option value="8" selected="selected">Aug</option>
+<option value="9">Sep</option>
+<option value="10">Oct</option>
+<option value="11">Nov</option>
+<option value="12">Dec</option>
+</select>
+<select name="foo_year">
+<option value="">-- Year --</option>
+<option value="2007" selected="selected">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010">2010</option>
+<option value="2011">2011</option>
+</select>
+<select name="foo_hour">
+<option value="00">00</option>
+<option value="01" selected="selected">01</option>
+<option value="02">02</option>
+<option value="03">03</option>
+<option value="04">04</option>
+<option value="05">05</option>
+<option value="06">06</option>
+<option value="07">07</option>
+<option value="08">08</option>
+<option value="09">09</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+</select>
+<select name="foo_minute">
+<option value="00" selected="selected">00</option>
+<option value="01">01</option>
+<option value="02">02</option>
+<option value="03">03</option>
+<option value="04">04</option>
+<option value="05">05</option>
+<option value="06">06</option>
+<option value="07">07</option>
+<option value="08">08</option>
+<option value="09">09</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+<option value="32">32</option>
+<option value="33">33</option>
+<option value="34">34</option>
+<option value="35">35</option>
+<option value="36">36</option>
+<option value="37">37</option>
+<option value="38">38</option>
+<option value="39">39</option>
+<option value="40">40</option>
+<option value="41">41</option>
+<option value="42">42</option>
+<option value="43">43</option>
+<option value="44">44</option>
+<option value="45">45</option>
+<option value="46">46</option>
+<option value="47">47</option>
+<option value="48">48</option>
+<option value="49">49</option>
+<option value="50">50</option>
+<option value="51">51</option>
+<option value="52">52</option>
+<option value="53">53</option>
+<option value="54">54</option>
+<option value="55">55</option>
+<option value="56">56</option>
+<option value="57">57</option>
+<option value="58">58</option>
+<option value="59">59</option>
+</select>
+</span>
+</div>};
+
+is( "$foo_field", $xhtml );

Added: branches/upstream/libhtml-formfu-perl/current/t/elements/label.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/elements/label.t?rev=39283&op=file
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/elements/label.t (added)
+++ branches/upstream/libhtml-formfu-perl/current/t/elements/label.t Fri Jul  3 23:33:35 2009
@@ -1,0 +1,18 @@
+use strict;
+use warnings;
+
+use HTML::FormFu;
+use Test::More qw(tests 2);
+
+my $f = HTML::FormFu->new(
+    { tt_args => { INCLUDE_PATH => 'share/templates/tt/xhtml' } } );
+
+$f->load_config_file('t/elements/label.yml');
+
+$f->process;
+
+like($f->render, qr/<span name="foo"><\/span>/, "element found");
+
+like($f->render, qr/<div name="foo3">bar<\/div>/, "element with value and different tag found");
+
+

Modified: branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.t?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.t (original)
+++ branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.t Fri Jul  3 23:33:35 2009
@@ -5,22 +5,22 @@
 
 use HTML::FormFu;
 
-my $form = HTML::FormFu->new;
+my $form = HTML::FormFu->new(
+    { tt_args => { INCLUDE_PATH => 'share/templates/tt/xhtml' } } );
 
 $form->load_config_file('t/filters/compoundjoin.yml');
 
-$form->process({
-    'address.number' => '10',
-    'address.street' => 'Downing Street',
-});
+$form->process;
+
+$form->process(
+    {
+        'rep_1.address.number' => '10',
+        'rep_1.address.street' => 'Downing Street',
+    }
+);
 
 ok( $form->submitted_and_valid );
 
-is( $form->param_value('address'), '10 Downing Street' );
+is( $form->param_value('rep_1.address'), '10 Downing Street' );
 
-is_deeply(
-    $form->params,
-    {
-        address => '10 Downing Street',
-    },
-);
+is_deeply( $form->params, { rep_1 => { address => '10 Downing Street' }, }, );

Modified: branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.yml?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.yml (original)
+++ branches/upstream/libhtml-formfu-perl/current/t/filters/compoundjoin.yml Fri Jul  3 23:33:35 2009
@@ -1,12 +1,16 @@
 ---
 
 elements:
-  - type: Multi
-    name: address
+  - type: Repeatable
+    nested_name: rep
+
+    elements:
+      - type: Multi
+        name: address
     
-    elements:
-      - name: number
-      - name: street
+        elements:
+          - name: number
+          - name: street
     
-    filters:
-      type: CompoundJoin
+        filters:
+          type: CompoundJoin

Modified: branches/upstream/libhtml-formfu-perl/current/t/form/get_all_elements.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/form/get_all_elements.t?rev=39283&op=diff
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/form/get_all_elements.t (original)
+++ branches/upstream/libhtml-formfu-perl/current/t/form/get_all_elements.t Fri Jul  3 23:33:35 2009
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 25;
+use Test::More tests => 28;
 
 use HTML::FormFu;
 
@@ -86,3 +86,12 @@
 
     ok( $elems->[0] == $e2 );
 }
+
+{
+    my $elems = $form->get_all_elements( { name => qr/oo/ } );
+
+    is( @$elems, 2 );
+
+    ok( $elems->[0] == $e1 );
+    ok( $elems->[1] == $e2 );
+}

Added: branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.t?rev=39283&op=file
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.t (added)
+++ branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.t Fri Jul  3 23:33:35 2009
@@ -1,0 +1,15 @@
+use strict;
+use warnings;
+use Test::More tests => 2;
+use HTML::FormFu;
+
+use lib 't/lib';
+use HTMLFormFu::RegressLocalization;
+
+my $form = HTML::FormFu->new({ tt_args => { INCLUDE_PATH => 'share/templates/tt/xhtml' } });
+
+$form->load_config_file('t/i18n/add_localize_object_from_class.yml');
+
+like( "$form", qr/\bThis field is required\b/, "properly localized" );
+
+like( "$form", qr/\bFoo blah Baz\b/, "properly localized (added object took effect)" );

Added: branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.yml?rev=39283&op=file
==============================================================================
--- branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.yml (added)
+++ branches/upstream/libhtml-formfu-perl/current/t/i18n/add_localize_object_from_class.yml Fri Jul  3 23:33:35 2009
@@ -1,0 +1,9 @@
+---
+add_localize_object_from_class: 'HTMLFormFu::RegressLocalization'
+
+elements:
+    - name: foo
+      label_loc: form_constraint_required
+    
+    - name: bar
+      label_loc: foobar




More information about the Pkg-perl-cvs-commits mailing list