ensure parent is always weakened, to stop circular references / memory leaks

Author: fireartist

Diff for: lib/HTML/FormFu.pm

@@ -18,7 +18,7 @@ use HTML::FormFu::ObjectUtil qw/
     get_elements get_element get_all_elements get_all_element
     get_fields get_field get_errors get_error clear_errors
     populate load_config_file insert_before insert_after form
-    _render_class clone stash constraints_from_dbic /;
+    _render_class clone stash constraints_from_dbic parent /;
 use HTML::FormFu::Util qw/ require_class _get_elements xml_escape /;
 use List::MoreUtils qw/ uniq /;
 use Scalar::Util qw/ blessed refaddr weaken /;
@@ -38,8 +38,7 @@ __PACKAGE__->mk_attrs(qw/ attributes /);
 __PACKAGE__->mk_attr_accessors(qw/ id action enctype method /);
 
 __PACKAGE__->mk_accessors(
-    qw/ parent
-        indicator filename javascript javascript_src
+    qw/ indicator filename javascript javascript_src
         element_defaults query_type languages force_error_message
         localize_class submitted query input _auto_fieldset
         _elements _processed_params _valid_names
@@ -608,9 +607,10 @@ sub render {
             force_error_message => $self->force_error_message,
             form_error_message  => xml_escape( $self->form_error_message ),
             _elements           => [ map { $_->render } @{ $self->_elements } ],
-            parent              => $self,
         } );
 
+    $render->parent($self);
+
     $render->attributes( xml_escape $self->attributes );
     $render->stash( $self->stash );
 

Diff for: lib/HTML/FormFu/Deflator.pm

@@ -4,10 +4,10 @@ use strict;
 use base 'Class::Accessor::Chained::Fast';
 use Class::C3;
 
-use HTML::FormFu::ObjectUtil qw( populate form name );
+use HTML::FormFu::ObjectUtil qw( populate form name parent );
 use Carp qw( croak );
 
-__PACKAGE__->mk_accessors(qw/ parent type /);
+__PACKAGE__->mk_accessors(qw/ type /);
 
 sub new {
     my $class = shift;

Diff for: lib/HTML/FormFu/Element.pm

@@ -8,7 +8,7 @@ use HTML::FormFu::Attribute qw/ mk_attrs mk_attr_accessors
     mk_output_accessors mk_inherited_accessors
     mk_inherited_merging_accessors /;
 use HTML::FormFu::ObjectUtil qw/ load_config_file _render_class
-    populate form stash /;
+    populate form stash parent /;
 use HTML::FormFu::Util qw/ require_class xml_escape /;
 use Scalar::Util qw/ refaddr /;
 use Storable qw( dclone );
@@ -27,7 +27,7 @@ __PACKAGE__->mk_attr_accessors(qw/ id /);
 
 __PACKAGE__->mk_accessors(
     qw/
-        parent name type filename multi_filename is_field
+        name type filename multi_filename is_field
         render_class_suffix /
 );
 
@@ -133,9 +133,10 @@ sub render {
             multi_filename      => $self->multi_filename,
             is_field            => $self->is_field,
             stash               => $self->stash,
-            parent              => $self,
             @_ ? %{ $_[0] } : () } );
 
+    $render->parent($self);
+
     $self->prepare_id($render);
 
     $self->prepare_attrs($render);

Diff for: lib/HTML/FormFu/Exception.pm

@@ -3,8 +3,6 @@ package HTML::FormFu::Exception;
 use strict;
 use base 'Class::Accessor::Chained::Fast';
 
-use HTML::FormFu::ObjectUtil qw/ form /;
-
-__PACKAGE__->mk_accessors(qw/ parent /);
+use HTML::FormFu::ObjectUtil qw/ form parent /;
 
 1;

Diff for: lib/HTML/FormFu/Filter.pm

@@ -4,10 +4,10 @@ use strict;
 use base 'Class::Accessor::Chained::Fast';
 use Class::C3;
 
-use HTML::FormFu::ObjectUtil qw( populate form name );
+use HTML::FormFu::ObjectUtil qw( populate form name parent );
 use Carp qw( croak );
 
-__PACKAGE__->mk_accessors(qw/ parent type localize_args /);
+__PACKAGE__->mk_accessors(qw/ type localize_args /);
 
 sub new {
     my $class = shift;

Diff for: lib/HTML/FormFu/ObjectUtil.pm

@@ -17,7 +17,7 @@ our @EXPORT_OK = qw/
     deflator get_fields get_field get_elements get_element
     get_all_elements get_all_element get_errors get_error clear_errors
     load_config_file form insert_before insert_after clone name stash
-    constraints_from_dbic /;
+    constraints_from_dbic parent /;
 
 sub _single_element {
     my ( $self, $element ) = @_;
@@ -591,4 +591,18 @@ sub _add_constraint_set {
         } );
 }
 
+sub parent {
+    my $self = shift;
+    
+    if (@_) {
+        $self->{parent} = shift;
+        
+        weaken( $self->{parent} );
+        
+        return $self;
+    }
+    
+    return $self->{parent};
+};
+
 1;

Diff for: lib/HTML/FormFu/Processor.pm

@@ -5,7 +5,7 @@ use base 'Class::Accessor::Chained::Fast';
 use Class::C3;
 
 use HTML::FormFu::Attribute qw( mk_output_accessors );
-use HTML::FormFu::ObjectUtil qw( populate form name );
+use HTML::FormFu::ObjectUtil qw( populate form name parent );
 use Scalar::Util qw/ refaddr /;
 use Carp qw/ croak /;
 
@@ -15,7 +15,7 @@ use overload
     bool => sub {1},
     fallback => 1;
 
-__PACKAGE__->mk_accessors(qw/ type parent localize_args /);
+__PACKAGE__->mk_accessors(qw/ type localize_args /);
 
 __PACKAGE__->mk_output_accessors(qw/ message /);
 

Diff for: lib/HTML/FormFu/Render/base.pm

@@ -4,7 +4,7 @@ use strict;
 use base 'Class::Accessor::Chained::Fast';
 
 use HTML::FormFu::Attribute qw/ mk_attrs mk_attr_accessors /;
-use HTML::FormFu::ObjectUtil qw/ form stash /;
+use HTML::FormFu::ObjectUtil qw/ form stash parent /;
 use HTML::FormFu::Util qw/ _parse_args _get_elements process_attrs /;
 use Scalar::Util qw/ refaddr /;
 use Carp qw/ croak /;
@@ -20,7 +20,7 @@ __PACKAGE__->mk_attrs(qw/ attributes /);
 
 __PACKAGE__->mk_accessors(
     qw/ render_class_args render_class_suffix render_method
-        filename _elements parent template_alloy /
+        filename _elements template_alloy /
 );
 
 sub new {

Diff for: lib/HTML/FormFu/Upload.pm

@@ -3,8 +3,8 @@ package HTML::FormFu::Upload;
 use strict;
 use base 'Class::Accessor::Chained::Fast';
 
-use HTML::FormFu::ObjectUtil qw/ form /;
+use HTML::FormFu::ObjectUtil qw/ form parent /;
 
-__PACKAGE__->mk_accessors(qw/ _param parent /);
+__PACKAGE__->mk_accessors(qw/ _param /);
 
 1;