Update construction of Template::Flute object in Flute component module.

interchange · Feb 9, 2017 · a0ceba9 · a0ceba9
1 parent 681edb9
commit a0ceba9
Showing 1 changed file with 13 additions and 24 deletions.
diff --git a/lib/WellWell/Compose/Component/Flute.pm b/lib/WellWell/Compose/Component/Flute.pm
@@ -40,41 +40,30 @@ sub new {
 
 sub process {
 	my ($self, $attributes) = @_;
-	my ($content, $xml_spec, $spec, $iter_name, $html_object, $flute);
+	my ($content, $spec, $flute);
 	my (%filters, $subname, $subref);
 
-	# parse specification
-	$xml_spec = new Template::Flute::Specification::XML;
-
-	unless ($spec = $xml_spec->parse_file($self->{specification})) {
-		die "$0: error parsing $self->{specification}: " . $xml_spec->error() . "\n";
-	}
-
-	$spec->set_iterator('cart', $Vend::Items);
-	$html_object = new Template::Flute::HTML;
-
-	$html_object->parse_file($self->{template}, $spec);
-
-	for my $list_object ($html_object->lists()) {
-		# seed and check input
-		$list_object->input($attributes);
-	}
-
 	# filters
 	$filters{link} = \&WellWell::Filter::Link::filter;
-
-	$flute = new Template::Flute (template => $html_object, filters => \%filters,
-				      values => $attributes,
-				      database => $self->{database});
+
+    my %args = ( template_file => $self->{template},
+                 filters => \%filters,
+                 values => $attributes,
+                 iterators => {
+                     cart => $Vend::Items,
+                 }
+             );
+
+	$flute = Template::Flute->new(%args);
 
 	# call component load subroutine
 	$subname = "component_$self->{name}_load";
 	$subref = $Vend::Cfg->{Sub}{$subname} || $Global::GlobalSub->{$subname};
 
 	if ($subref) {
-		$subref->($self->{name}, $spec, $html_object, $flute);
+		$subref->($self->{name}, $flute->specification, $flute->template, $flute);
 	}
-	
+
 	return $flute->process($attributes);
 }