merged Model-DBIC branch back into trunk

Author: fireartist

MANIFEST.SKIP

@@ -7,6 +7,7 @@
 ^client-side-constraint
 ^t\b.*\.disabled
 ^t\b.*CatalystApp
+^t\/test\.db$
 
 ^\.perltidyrc$
 

Makefile.PL

@@ -41,6 +41,8 @@ test_requires 'Test::NoWarnings';
 
 tests 't/*.t t/*/*.t';
 
+no_index directory => 'examples';
+
 install_script('bin/html_formfu_deploy.pl');
 install_share();
 

benchmarks/login.pl

@@ -32,7 +32,7 @@
 print "No submit\n";
 
 cmpthese(
-    500,
+    100,
     {
         'HTML::FormFu' => sub {
             $output = "$formfu";
@@ -58,7 +58,7 @@
 print "\nConstruction + submission\n";
 
 cmpthese(
-    500,
+    100,
     {
         'HTML::FormFu' => sub {
             my $formfu = HTML::FormFu->new

lib/HTML/FormFu.pm

@@ -46,7 +46,7 @@ __PACKAGE__->mk_accessors(
         localize_class submitted query input _auto_fieldset
         _elements _processed_params _valid_names
         _output_processors tt_module
-        nested_name nested_subscript /
+        nested_name nested_subscript model_class _model /
 );
 
 __PACKAGE__->mk_output_accessors(qw/ form_error_message /);
@@ -104,6 +104,7 @@ sub new {
         localize_class     => 'HTML::FormFu::I18N',
         auto_error_class   => 'error_%s_%t',
         auto_error_message => 'form_%s_%t',
+        model_class         => 'DBIC',
     );
 
     $self->populate( \%defaults );
@@ -147,6 +148,34 @@ sub default_values {
     return $self;
 }
 
+sub model {
+    my ($self) = @_;
+    
+    if ( defined ( my $model = $self->_model ) ) {
+        return $model;
+    }
+    
+    my $class = "HTML::FormFu::Model::" . $self->model_class;
+    
+    require_class($class);
+    
+    $self->_model( $class );
+    
+    return $class;
+}
+
+sub values_from_model {
+    my $self = shift;
+    
+    return $self->model->values_from_model( $self, @_ );
+}
+
+sub save_to_model {
+    my $self = shift;
+    
+    return $self->model->save_to_model( $self, @_ );
+}
+
 sub process {
     my $self = shift;
 

lib/HTML/FormFu/Element.pm

@@ -29,7 +29,7 @@ __PACKAGE__->mk_attr_accessors(qw/ id /);
 
 __PACKAGE__->mk_accessors(
     qw/
-        name type filename is_field
+        name type filename is_field is_repeatable db
         /
 );
 
@@ -50,6 +50,7 @@ sub new {
 
     $self->attributes( {} );
     $self->stash(      {} );
+    $self->db(         {} );
 
     if ( exists $attrs{parent} ) {
         $self->parent( delete $attrs{parent} );

lib/HTML/FormFu/Element/Block.pm

@@ -44,6 +44,18 @@ sub new {
     return $self;
 }
 
+sub values_from_model {
+    my $self = shift;
+    
+    return $self->form->model->values_from_model(@_);
+}
+
+sub save_to_model {
+    my $self = shift;
+    
+    return $self->form->model->save_to_model(@_);
+}
+
 sub process {
     my ($self) = @_;
 

lib/HTML/FormFu/Element/Radiogroup.pm

@@ -76,9 +76,7 @@ sub _prepare_attrs {
 
     if (   $submitted
         && defined $value
-        && (ref $value eq 'ARRAY'
-            ? grep { $_ eq $option->{value} } @$value
-            : $value eq $option->{value} ) )
+        && $value eq $option->{value} )
     {
         $option->{attributes}{checked} = 'checked';
     }

lib/HTML/FormFu/Element/Repeatable.pm

@@ -13,6 +13,7 @@ sub new {
     my $self = shift->next::method(@_);
 
     $self->filename('repeatable');
+    $self->is_repeatable(1);
 
     return $self;
 }
@@ -47,8 +48,6 @@ sub repeat {
         my @clones = map { $_->clone } @$children;
         my $block = $self->element('Block');
 
-        map { $_->parent($block) } @clones;
-        
         $block->_elements(\@clones);
         $block->attributes( $self->attributes );
         $block->tag( $self->tag );
@@ -58,21 +57,47 @@ sub repeat {
         if ( $self->increment_field_names ) {
             for my $field ( @{ $block->get_all_elements } ) {
                 next unless $field->is_field;
-                my $name = $field->name;
-                if ( defined $name && $name =~ /0/ ) {
-                    $name =~ s/0/$rep/;
+                
+                if ( defined( my $name = $field->name ) ) {
+                    $field->original_name($name);
+                    
+                    $name .= "_$rep";
                     $field->name($name);
                 }
             }
         }
 
+        _reparent_children( $block );
+        
+        for my $field (@{ $block->get_fields }) {
+            map { $_->parent($field) }
+                @{ $field->_deflators },
+                @{ $field->_filters },
+                @{ $field->_constraints },
+                @{ $field->_inflators },
+                @{ $field->_validators },
+                @{ $field->_transformers };
+        }
+        
         push @return, $block;
 
     }
 
     return \@return;
 }
 
+sub _reparent_children {
+    my $self = shift;
+    
+    return if $self->is_field;
+    
+    for my $child (@{ $self->get_elements }) {
+        $child->parent( $self );
+        
+        _reparent_children( $child );
+    }
+}
+
 sub process {
     my ($self) = @_;
 

lib/HTML/FormFu/Element/Select.pm

@@ -13,10 +13,47 @@ sub new {
 
     $self->filename('input');
     $self->field_filename('select_tag');
+    $self->multi_value(1);
 
     return $self;
 }
 
+sub process {
+    my ($self) = @_;
+    
+    my $context = $self->form->stash->{context};
+    my $args    = $self->db;
+    
+    if ( $args && $args->{schema} && $context ) {
+        my $model = $context->model( $args->{schema} );
+        return if !defined $model;
+        
+        my $rs    = $model->result_source;
+        my $id    = $args->{id_column};
+        my $label = $args->{label_column};
+        
+        if ( !defined $id ) {
+            ($id) = $rs->primary_columns;
+        }
+        
+        if ( !defined $label ) {
+            # use first text column
+            ($label) = grep {
+                $rs->column_info($_)->{data_type} =~ /text/i
+            } $rs->columns;
+        }
+        return if !defined $label;
+        
+        my $result = $model->search( {}, { -columns => [$id, $label] } );
+        
+        my @defaults = map {
+            [ $_->$id, $_->$label ]
+        } $result->all;
+        
+        $self->options( \@defaults );
+    }
+}
+
 sub _prepare_attrs {
     my ( $self, $submitted, $value, $default, $option ) = @_;
 

lib/HTML/FormFu/Element/_DateSelect.pm

@@ -29,6 +29,21 @@ sub nested_names {
    return ( $self->name );
 }
 
+sub nested_base {
+    my $self = shift;
+    
+    croak 'cannot set nested_base' if @_;
+    
+    # ignore immediate parent
+     my $parent = $self->parent;
+    
+    while ( defined $parent->parent ) {
+        $parent = $parent->parent;
+        
+        return $parent->nested_name if defined $parent->nested_name;
+    }
+}
+
 1;
 
 __END__

lib/HTML/FormFu/Element/_Field.pm

@@ -32,7 +32,7 @@ __PACKAGE__->mk_accessors(
         _constraints _filters _inflators _deflators _validators _transformers
         _errors container_tag
         field_filename label_filename label_tag retain_default force_default
-        javascript non_param reverse_multi /
+        javascript non_param reverse_multi multi_value original_name /
 );
 
 __PACKAGE__->mk_output_accessors(qw/ comment label value /);
@@ -145,6 +145,20 @@ sub nested_names {
    return ( $self->name );
 }
 
+sub nested_base {
+    my $self = shift;
+    
+    croak 'cannot set nested_base' if @_;
+    
+    my $parent = $self;
+    
+    while ( defined $parent->parent ) {
+        $parent = $parent->parent;
+        
+        return $parent->nested_name if defined $parent->nested_name;
+    }
+}
+
 sub deflator {
     my ( $self, $arg ) = @_;
     my @return;