From 9d67ed89ce7359646fa8dcde07b47028330e9257 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Fri, 6 Mar 2020 17:16:19 +0530
Subject: [PATCH] Allow multiple binary operator in where_exp filter

---
 lib/jekyll/filters.rb | 10 +++++++---
 test/test_filters.rb  | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 31b24d7a9b3..fcfe6477903 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -432,10 +432,14 @@ def parse_condition(exp)
     #
     # Returns an instance of Liquid::Condition
     def parse_binary_comparison(parser)
-      parse_comparison(parser).tap do |condition|
-        binary_operator = parser.id?("and") || parser.id?("or")
-        condition.send(binary_operator, parse_comparison(parser)) if binary_operator
+      condition = parse_comparison(parser)
+      first_condition = condition
+      while (binary_operator = parser.id?("and") || parser.id?("or"))
+        child_condition = parse_comparison(parser)
+        condition.send(binary_operator, child_condition)
+        condition = child_condition
       end
+      first_condition
     end
 
     # Generates a Liquid::Condition object from a Liquid::Parser object based on whether the parsed
diff --git a/test/test_filters.rb b/test/test_filters.rb
index c9358a610a1..89a586cca4e 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -997,6 +997,23 @@ def to_liquid
         )
       end
 
+      should "filter objects across multiple conditions" do
+        sample = [
+          { "color" => "teal", "size" => "large", "type" => "variable" },
+          { "color" => "red",  "size" => "large", "type" => "fixed" },
+          { "color" => "red",  "size" => "medium", "type" => "variable" },
+          { "color" => "blue", "size" => "medium", "type" => "fixed" },
+        ]
+        assert_equal(
+          [
+            { "color" => "red", "size" => "large", "type" => "fixed" },
+          ],
+          @filter.where_exp(
+            sample, "item", "item.type == 'fixed' and item.color == 'red' or item.color == 'teal'"
+          )
+        )
+      end
+
       should "stringify during comparison for compatibility with liquid parsing" do
         hash = {
           "The Words" => { "rating" => 1.2, "featured" => false },