Moved condition parsing and evaluation to separate class (away from CondBlock)

lib/SugarTrail/Template/CondBlock.pm

@@ -7,6 +7,7 @@ package SugarTrail::Template::CondBlock;
 use strict;
 use warnings;
 
+use SugarTrail::Template::Condition;
 use Data::Dumper;
 
 sub init {
@@ -18,23 +19,12 @@ sub init {
 sub parse {
     my $self    = shift;
     my $string  = shift;
-
     my @parts = split ";", $string;
-
     foreach (@parts) {
-        s/^\s+//;
-        s/\s+$//;
-        my ($n, $o, $v) = m/([a-zA-Z0-9_ ]+)([<>=~+\-*@]*)(.*)/;
-        next unless $n;
-
-        $n =~ s/\s+$//;
-        $o =~ s/\s+$//;
-        $o =~ s/^\s+//;
-        $v =~ s/\s+$//;
-
-        my @v = split m/\s*,\s*/, $v;
-        push @{$self->{conds}}, { n => $n, o => $o, v => \@v };
+        my $c = SugarTrail::Template::Condition->new($_);
+        push @{$self->{conds}}, $c;
     }
+    return scalar @{ $self->{conds} };
 }
 
 

lib/SugarTrail/Template/Condition.pm

@@ -0,0 +1,78 @@
+package SugarTrail::Template::Condition;
+# condition
+# new()
+# parse(string)
+# match(data)
+
+use strict;
+use warnings;
+
+sub _equals {
+    my $a = shift;
+    my $b = $_[0]->[0];
+    return $a eq $b;
+}
+
+sub new {
+    my $class   = shift;
+    my $self    = {};
+    $self->{string} = shift;
+    $self->{handlers} = {
+        '==' => \&_equals,
+        '>=' => \&_greater_or_eq,
+        '<=' => \&_less_or_eq,
+        '=@' => \&_in,
+        '=~' => \&_regex,
+    };
+    $self->{parsed} = 0;
+    return bless $self, $class;
+}
+
+# parse condition from its string version
+sub parse {
+    my $self    = shift;
+    my $string  = $self->{string};
+    return if $self->{parsed};
+
+    # cut spaces
+    $string =~ s/^\s+//;
+    $string =~ s/\s+$//;
+
+    # get name, operator, value(s)
+    my ($n, $o, $v) = $string =~ m/([a-zA-Z0-9_ ]+)([<>=~+\-*@]*)(.*)/;
+    return unless $n;
+
+    # cut inner spaces
+    $n =~ s/\s+$//;
+    $o =~ s/\s+$//;
+    $o =~ s/^\s+//;
+    $v =~ s/\s+$//;
+
+    # split vlues
+    my @v = split m/\s*,\s*/, $v;
+
+    # assign
+    $self->{n} = $n;
+    $self->{o} = $o;
+    $self->{v} = \@v;
+
+    $self->{parsed}++;
+}
+
+# match the cond against params
+sub match {
+    my $self    = shift;
+    my $params  = shift;
+    $self->parse();
+
+    my $name    = $self->{n};       # what is the topic
+    my $op      = $self->{o};       # what op to use
+    my $have    = $self->{v};       # what we have in this step
+    my $want    = $params->{$name}; # what they want
+
+    # execute the right handler
+    return &{ $self->{handlers}->{$op} }($want, $have);
+}
+
+
+1;

t/Cond.t

@@ -3,14 +3,16 @@ use Test::More;
 use lib 'lib';
 use helper;
 
-BEGIN { use_ok( 'SugarTrail::Template::CondBlock' ); }
-require_ok( 'SugarTrail::Template::CondBlock' );
+BEGIN { use_ok( 'SugarTrail::Template::Condition' ); }
+require_ok( 'SugarTrail::Template::Condition' );
 
-my $cb = SugarTrail::Template::CondBlock->init();
-ok($cb, "cb is true");
+my $params = { os => "wxx", proto => "imap" };
 
-$cb->parse('os=@w7a,wxx;proto==imap;ver>=2012;');
-&helper::dmupp(cb=>$cb);
+my $c = SugarTrail::Template::Condition->new('proto==imap');
+ok($c, "c is true");
+ok($c->match($params), "params match");
 
 
+&helper::dmupp(condition=>$c);
 done_testing();
+# os=@w7a,wxx;proto==imap;ver>=2012;