Modified regex for using floating point numbers in comparison and also added test cases

Author: yozna-kabra-sarda

lib/Template/Liquid/Condition.pm

@@ -91,9 +91,9 @@ sub _equal {    # XXX - Pray we don't have a recursive data structure...
     if (!$ref_l) {
         return
               !!(grep {defined} $l, $r)
-            ? (grep {m[\D]o} $l, $r)
-                ? $l eq $r
-                : $l == $r
+            ? (grep {m[^\d+(\.\d+)?$]o} $l, $r)
+                ? $l == $r
+                : $l eq $r
             : !1;
     }
     elsif ($ref_l eq 'ARRAY') {
@@ -129,9 +129,9 @@ sub gt {
     $r = $_r if defined $_r;
     return
           !!(grep {defined} $l, $r)
-        ? (grep {m[\D]o} $l, $r)
-            ? $l gt $r
-            : $l > $r
+        ? (grep {m[^\d+(\.\d+)?$]o} $l, $r)
+            ? $l > $r
+            : $l gt $r
         : 0;
 }
 sub lt { return !$_[0]->gt }

t/0200_tags/02006_if.t

@@ -10,16 +10,36 @@ is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', '1 == 1');
 INPUT
 One equals one
 EXPECTED
+is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', '1.1 == 1.1');
+{% if 1.1 == 1.1 %}1.1 equals 1.1{% endif %}
+INPUT
+1.1 equals 1.1
+EXPECTED
 is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', '1 != 1');
 {% if 1 != 1 %}One does not equal one{% endif %}
 INPUT
 
+EXPECTED
+is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', '1.1 != 1.1');
+{% if 1.1 != 1.1 %}1.1 does not equal 1.1{% endif %}
+INPUT
+
 EXPECTED
 is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', q[1 < 2]);
 {% if 1 < 2 %}Yep.{% endif %}
 INPUT
 Yep.
 EXPECTED
+is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', q[1.1 < 2.2]);
+{% if 1.1 < 2.2 %}Yep.{% endif %}
+INPUT
+Yep.
+EXPECTED
+is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', q[2.2 > 1.1]);
+{% if 2.2 > 1.1 %}Yep.{% endif %}
+INPUT
+Yep.
+EXPECTED
 is(Template::Liquid->parse(<<'INPUT')->render(), <<'EXPECTED', q[1 > 2]);
 {% if 1 > 2 %}Yep.{% endif %}
 INPUT

t/0200_tags/02101_whitespace_control.t

@@ -6,8 +6,9 @@ use Template::Liquid;
 $|++;
 is( Template::Liquid->parse(
         <<'TEMPLATE')->render(), 'Wow,John G. Chalmers-Smith, you have a long name!', 'whitespace control');
-{%- assign username = "John G. Chalmers-Smith" -%}
-{%- if username and username.size > 10 -%}
+{%- assign username = "John G. Chalmers-Smith" -%} 
+{%- assign username_size = username | size -%}
+{%- if username and username_size > 10 -%}
   Wow, {{- username -}} , you have a long name!
 {%- else -%}
   Hello there!
@@ -16,21 +17,24 @@ TEMPLATE
 is( Template::Liquid->parse(
          <<'TEMPLATE')->render(), <<'EXPECTED', 'without whitespace control');
 {% assign username = "John G. Chalmers-Smith" %}
-{% if username and username.size > 10 %}
+{% assign username_size = username | size %}
+{% if username and username_size > 10 %}
   Wow, {{ username }}, you have a long name!
 {% else %}
   Hello there!
 {% endif %}
 TEMPLATE
 
 
+
   Wow, John G. Chalmers-Smith, you have a long name!
 
 EXPECTED
 is( Template::Liquid->parse(
         <<'TEMPLATE')->render(), <<'EXPECTED', 'mixed with and without whitespace control');
 {%-assign username = "John G. Chalmers-Smith"-%}
-{%-if username and username.size > 10 %}
+{%-assign username_size = username | size-%}
+{%-if username and username_size > 10 %}
   Wow, {{- username -}} , you have a long name!
   Wow, {{  username -}} , you have a long name!
   Wow, {{- username  }} , you have a long name!