liquid 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a34ea9118594ad84171322f5dbb0b07e5e7b148
-  data.tar.gz: e4b170c02fd107b8fa6210554d5a3b647e65a4be
+  metadata.gz: 7b16a9ef0a4f67b44c9fca4d7ef63db9d254220e
+  data.tar.gz: d53a4e4ab6ba227b62684325c0c374c5e132c342
 SHA512:
-  metadata.gz: b09f3628e0002d6193fa3c7e0629e0c0c075a50e9d96561dc5a40e8f461793b04c948e4a4aebf4885afe738d58ace2e5ec149b0956fd6f5be1448dbe9b3fa02d
-  data.tar.gz: b9a76c51a795058d2b447b95c85a689b6e628b99ada9e0a4db97aebd3a2dda3cc29d790bcef72bb0b86c3fe49b45da9e8fba6eb63ac6e081178542f6dd79b63e
+  metadata.gz: e82a6fe4e69228e0e9beddbff8f9e138005f9cd6ea3dd478aedff2b3315c7fcb45428d2175eebd48e0060757b4e3e718242786ca0d7c066834c651697aa5d268
+  data.tar.gz: f62a4f5ff4b5482cf230b5ce74a362a4516eb4f65eaf2526adacb79ed5d8063e68ae22c6491e8464b719ca2fc1f64d2be7f652c68cb8b69bc5afd53fc4c8564a

data/History.md

@@ -1,6 +1,10 @@
 # Liquid Version History
 
-## 3.0.2 / 2015-04-24 / branch "3-0-stable"
+## 3.0.3 / 2015-05-28 / branch "3-0-stable"
+
+* Fix condition parse order in strict mode (#569) [Justin Li, pushrax]
+
+## 3.0.2 / 2015-04-24
 
 * Expose VariableLookup private members (#551) [Justin Li, pushrax]
 * Documentation fixes

data/lib/liquid/tags/if.rb

@@ -78,16 +78,16 @@ module Liquid
 
       def strict_parse(markup)
         p = Parser.new(markup)
+        condition = parse_binary_comparison(p)
+        p.consume(:end_of_string)
+        condition
+      end
 
+      def parse_binary_comparison(p)
         condition = parse_comparison(p)
-
-        while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
-          new_cond = parse_comparison(p)
-          new_cond.send(op, condition)
-          condition = new_cond
+        if op = (p.id?('and'.freeze) || p.id?('or'.freeze))
+          condition.send(op, parse_binary_comparison(p))
         end
-        p.consume(:end_of_string)
-
         condition
       end
 

data/lib/liquid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Liquid
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/test/integration/tags/if_else_tag_test.rb

@@ -166,4 +166,25 @@ class IfElseTagTest < Minitest::Test
       assert_template_result('', %({% if 1 or throw or or 1 %}yes{% endif %}))
     end
   end
+
+  def test_multiple_conditions
+    tpl = "{% if a or b and c %}true{% else %}false{% endif %}"
+
+    tests = {
+      [true, true, true] => true,
+      [true, true, false] => true,
+      [true, false, true] => true,
+      [true, false, false] => true,
+      [false, true, true] => true,
+      [false, true, false] => false,
+      [false, false, true] => false,
+      [false, false, false] => false,
+    }
+
+    tests.each do |vals, expected|
+      a, b, c = vals
+      assigns = { 'a' => a, 'b' => b, 'c' => c }
+      assert_template_result expected.to_s, tpl, assigns, assigns.to_s
+    end
+  end
 end

data/test/test_helper.rb

@@ -32,13 +32,13 @@ module Minitest
     include Liquid
 
     def assert_template_result(expected, template, assigns = {}, message = nil)
-      assert_equal expected, Template.parse(template).render!(assigns)
+      assert_equal expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_template_result_matches(expected, template, assigns = {}, message = nil)
       return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
 
-      assert_match expected, Template.parse(template).render!(assigns)
+      assert_match expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_match_syntax_error(match, template, registers = {})

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -47,6 +47,10 @@ extra_rdoc_files:
 - History.md
 - README.md
 files:
+- History.md
+- MIT-LICENSE
+- README.md
+- lib/liquid.rb
 - lib/liquid/block.rb
 - lib/liquid/block_body.rb
 - lib/liquid/condition.rb
@@ -64,8 +68,8 @@ files:
 - lib/liquid/module_ex.rb
 - lib/liquid/parser.rb
 - lib/liquid/parser_switching.rb
-- lib/liquid/profiler/hooks.rb
 - lib/liquid/profiler.rb
+- lib/liquid/profiler/hooks.rb
 - lib/liquid/range_lookup.rb
 - lib/liquid/standardfilters.rb
 - lib/liquid/strainer.rb
@@ -92,10 +96,6 @@ files:
 - lib/liquid/variable.rb
 - lib/liquid/variable_lookup.rb
 - lib/liquid/version.rb
-- lib/liquid.rb
-- MIT-LICENSE
-- README.md
-- History.md
 - test/fixtures/en_locale.yml
 - test/integration/assign_test.rb
 - test/integration/blank_test.rb
@@ -151,17 +151,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
@@ -211,4 +211,3 @@ test_files:
 - test/unit/template_unit_test.rb
 - test/unit/tokenizer_unit_test.rb
 - test/unit/variable_unit_test.rb
-has_rdoc: