From c16697746b23abbd9304c613aa70c8b29431c405 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@shopify.com>
Date: Thu, 27 Jun 2013 13:56:33 +0200
Subject: [PATCH] Clean up whitespace collapsing a bit

---
 lib/liquid/block.rb          | 7 +++----
 lib/liquid/tag.rb            | 4 ++--
 lib/liquid/tags/capture.rb   | 2 +-
 lib/liquid/tags/comment.rb   | 2 +-
 lib/liquid/tags/increment.rb | 4 +++-
 test/liquid/blank_test.rb    | 4 ++++
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index 022a5e5..261ae0f 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -7,8 +7,8 @@ module Liquid
     FullToken         = /^#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}$/o
     ContentOfVariable = /^#{VariableStart}(.*)#{VariableEnd}$/o
 
-    def self.blank?
-      false
+    def blank?
+      @blank || false
     end
 
     def parse(tokens)
@@ -25,14 +25,13 @@ module Liquid
             # proceed
             if block_delimiter == $1
               end_tag
-              @blank = true if self.class.blank?
               return
             end
 
             # fetch the tag from registered blocks
             if tag = Template.tags[$1]
               new_tag = tag.new($1, $2, tokens)
-              @blank = false if new_tag.is_a?(Block) && !new_tag.blank
+              @blank = false unless new_tag.blank?
               @nodelist << new_tag
             else
               # this tag is not registered with the system
diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb
index c672344..a4aac71 100644
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -19,8 +19,8 @@ module Liquid
       ''
     end
 
-    def self.blank?
-      true
+    def blank?
+      @blank || true
     end
   end # Tag
 end # Tag
diff --git a/lib/liquid/tags/capture.rb b/lib/liquid/tags/capture.rb
index 76c464f..4f5b34c 100644
--- a/lib/liquid/tags/capture.rb
+++ b/lib/liquid/tags/capture.rb
@@ -31,7 +31,7 @@ module Liquid
       ''
     end
 
-    def self.blank?
+    def blank?
       true
     end
   end
diff --git a/lib/liquid/tags/comment.rb b/lib/liquid/tags/comment.rb
index 99e08c1..1eaf71f 100644
--- a/lib/liquid/tags/comment.rb
+++ b/lib/liquid/tags/comment.rb
@@ -4,7 +4,7 @@ module Liquid
       ''
     end
 
-    def self.blank?
+    def blank?
       true
     end
   end
diff --git a/lib/liquid/tags/increment.rb b/lib/liquid/tags/increment.rb
index e6a30ca..e5c31fe 100644
--- a/lib/liquid/tags/increment.rb
+++ b/lib/liquid/tags/increment.rb
@@ -28,7 +28,9 @@ module Liquid
       value.to_s
     end
   
-    private
+    def blank?
+      false
+    end
   end
   
   Template.register_tag('increment', Increment)
diff --git a/test/liquid/blank_test.rb b/test/liquid/blank_test.rb
index e6e5224..aa0f6a7 100644
--- a/test/liquid/blank_test.rb
+++ b/test/liquid/blank_test.rb
@@ -61,6 +61,10 @@ class BlankTest < Test::Unit::TestCase
     assert_template_result(body*(N+1), wrap(body))
   end
 
+  def test_increment_is_not_blank
+    assert_template_result(" 0"*2*(N+1), wrap("{% assign foo = 0 %} {% increment foo %} {% decrement foo %}"))
+  end
+
   def test_raw_is_not_blank
     assert_template_result("  "*(N+1), wrap(" {% raw %} {% endraw %}"))
   end