Refactored according to new naming convention

lib/SugarTrail/Repo.pm

@@ -7,7 +7,7 @@ use strict;
 use warnings;
 use Carp;
 use helper;
-use SugarTrail::STM;
+use SugarTrail::Template::Master;
 
 # initialize repo
 sub new {
@@ -24,7 +24,7 @@ sub load_stm {
     my $self = shift;
     my $args = { @_ };
 
-    my $stm = SugarTrail::STM->new();
+    my $stm = SugarTrail::Template::Master->new();
     $stm->{text} = $self->load_text(stm => $args->{stm})
         or return;
     $stm->{stm} = $args->{stm};

lib/SugarTrail/CondBlock.pm → lib/SugarTrail/Template/CondBlock.pm

@@ -1,4 +1,4 @@
-package SugarTrail::CondBlock;
+package SugarTrail::Template::CondBlock;
 # condition block
 # init()
 # parse(string)

lib/SugarTrail/STM.pm → lib/SugarTrail/Template/Master.pm

@@ -1,5 +1,5 @@
-package SugarTrail::STM;
-# STM holder
+package SugarTrail::Template::Master;
+# Master template holder
 # new()
 # parse_headers()
 
@@ -8,7 +8,7 @@ package SugarTrail::STM;
 use strict;
 use warnings;
 use Carp;
-use SugarTrail::STS;
+use SugarTrail::Template::Slave;
 
 sub new {
     my $class = shift;
@@ -53,11 +53,11 @@ sub parse_body {
     return scalar @{ $self->{steps} };
 }
 
-sub generate_sts {
+sub generate_slave {
     my $self = shift;
     my $args = shift;
 
-    my $sts = SugarTrail::STS->new($args);
+    my $slave = SugarTrail::Template::Slave->new($args);
 
     my @lines;
 
@@ -70,12 +70,12 @@ sub generate_sts {
         }
     }
 
-    $sts->{meta}->{'Stm'} = $self->{stm};
-    $sts->{meta}->{'Stm Revision'} = $self->get_current_revision();
-    $sts->{meta}->{'Params'} = mkmymime($args);
+    $slave->{meta}->{'Stm'} = $self->{stm};
+    $slave->{meta}->{'Stm Revision'} = $self->get_current_revision();
+    $slave->{meta}->{'Params'} = mkmymime($args);
 
-    $sts->{lines} = \@lines;
-    return $sts;
+    $slave->{lines} = \@lines;
+    return $slave;
 }
 
 # skel: matches if cond has m

lib/SugarTrail/STS.pm → lib/SugarTrail/Template/Slave.pm

@@ -1,4 +1,4 @@
-package SugarTrail::STS;
+package SugarTrail::Template::Slave;
 # STS holder
 # new()
 

t/Cond.t

@@ -3,10 +3,10 @@ use Test::More;
 use lib 'lib';
 use helper;
 
-BEGIN { use_ok( 'SugarTrail::CondBlock' ); }
-require_ok( 'SugarTrail::CondBlock' );
+BEGIN { use_ok( 'SugarTrail::Template::CondBlock' ); }
+require_ok( 'SugarTrail::Template::CondBlock' );
 
-my $cb = SugarTrail::CondBlock->init();
+my $cb = SugarTrail::Template::CondBlock->init();
 ok($cb, "cb is true");
 
 $cb->parse('os=@w7a,wxx;proto==imap;ver>=2012;');

t/Repo.t

@@ -10,17 +10,17 @@ my $repo = SugarTrail::Repo->new(root => './t/data/strepo', vcs => 'git');
 ok($repo,           "repo is true");
 
 my $stm = $repo->load_stm(stm=>'/release/rc.stm');
-ok($stm,            "stm is true");
+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");
 
-&helper::dmupp(stm=>$stm);
+&helper::dmupp(master=>$stm);
 
-my $sts = $stm->generate_sts({ proto => "imap", os => "wxx" });
-ok($sts,            "sts is true");
-&helper::dmupp(sts=>$sts);
+my $sts = $stm->generate_slave({ proto => "imap", os => "wxx" });
+ok($sts,            "slave is true");
+&helper::dmupp(slave=>$sts);
 
 done_testing();