Refactored master parsing code for readability

lib/SugarTrail/Template/Master.pm

@@ -1,9 +1,9 @@
 package SugarTrail::Template::Master;
 # Master template holder
 # new()
-# parse_headers()
-
-
+# parse()
+# _parse_headers()
+# _parse_body()
 
 use strict;
 use warnings;
@@ -18,38 +18,35 @@ sub new {
     return bless $self, $class;
 }
 
-sub parse_headers {
+sub parse {
     my $self = shift;
-
     my ($head, $body) = split "\n\n", $self->{text}, 2;
-
-    my @lines = split "\n", $head;
-
     $self->{head} = $head;
     $self->{body} = $body;
+    return (
+        $self->_parse_headers(),
+        $self->_parse_body()
+    );
+}
 
-    foreach (@lines) {
+sub _parse_headers {
+    my $self    = shift;
+    foreach (split "\n", $self->{head}) {
         my ($n, $v) = split ": ", $_, 2;
         $self->{meta}->{$n} = $v;
     }
-
     return scalar keys %{ $self->{meta} };
 }
 
-sub parse_body {
+sub _parse_body {
     my $self = shift;
-    my @lines = split "\n", $self->{body};
-
     $self->{steps} = [];
-
-    foreach (@lines) {
-        chomp;
-        s/ *$//;
+    foreach (split "\n", $self->{body}) {
+        chomp; s/ *$//;
         my ($line, $cond) = $_ =~ m/^(.*?)(\{(.*)\})?$/;
         $line =~ s/ *$//;
         push @{ $self->{steps} }, { line => $line, cond => $cond };
     }
-
     return scalar @{ $self->{steps} };
 }
 

t/Repo.t

@@ -12,12 +12,12 @@ ok($repo,           "repo is true");
 my $stm = $repo->load_stm(stm=>'/release/rc.stm');
 ok($stm,            "master is true");
 
-ok($stm->parse_headers(), "parse_headers() returns 6");
-ok($stm->parse_headers(), "parse_headers() still returns 6");
-is($stm->parse_body(), 13, "parse_body() returns 13");
-is($stm->parse_body(), 13, "parse_body() still returns 13");
+my ($hc,$bc) = $stm->parse();
 
-&helper::dmupp(master=>$stm);
+is($hc, 6,  "parse() reported 6 headers");
+is($bc, 13, "parse() reported 13 non-header lines");
+
+&helper::dmup(master=>$stm);
 
 my $sts = $stm->generate_slave({ proto => "imap", os => "wxx" });
 ok($sts,            "slave is true");