From 1e0e9f1f31ca7c0241d2f94fcde11b9d5a16e686 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@hackvalue.de>
Date: Tue, 22 Jul 2014 21:16:59 +0000
Subject: [PATCH] Remove unnecessary blank? code

---
 lib/liquid/block.rb                       | 4 ++--
 lib/liquid/tag.rb                         | 7 ++++---
 lib/liquid/tags/capture.rb                | 1 -
 lib/liquid/tags/cycle.rb                  | 5 +----
 lib/liquid/tags/include.rb                | 4 ----
 lib/liquid/tags/increment.rb              | 4 ----
 test/integration/tags/include_tag_test.rb | 4 ----
 7 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index 81e4b368..7717f0bd 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -11,7 +11,7 @@ module Liquid
     end 
 
     def blank?
-      @blank || false
+      @blank
     end
 
     def parse(tokens)
@@ -49,7 +49,7 @@ module Liquid
             else
               raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
             end
-          when token.start_with?(VARSTART) 
+          when token.start_with?(VARSTART)
             new_var = create_variable(token)
             @nodelist << new_var
             @children << new_var
diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb
index 3df10458..e894e353 100644
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -31,7 +31,7 @@ module Liquid
     end
 
     def blank?
-      @blank || false
+      false
     end
 
     def parse_with_selected_parser(markup)
@@ -50,11 +50,12 @@ module Liquid
     end
 
     private
+
     def strict_parse_with_error_context(markup)
       strict_parse(markup)
     rescue SyntaxError => e
       e.message << " in \"#{markup.strip}\"" 
       raise e
     end
-  end # Tag
-end # Liquid
+  end
+end
diff --git a/lib/liquid/tags/capture.rb b/lib/liquid/tags/capture.rb
index 4bcd1185..3ec0d676 100644
--- a/lib/liquid/tags/capture.rb
+++ b/lib/liquid/tags/capture.rb
@@ -1,5 +1,4 @@
 module Liquid
-
   # Capture stores the result of a block into a variable without rendering it inplace.
   #
   #   {% capture heading %}
diff --git a/lib/liquid/tags/cycle.rb b/lib/liquid/tags/cycle.rb
index c3c7d87b..744565e5 100644
--- a/lib/liquid/tags/cycle.rb
+++ b/lib/liquid/tags/cycle.rb
@@ -43,11 +43,8 @@ module Liquid
       end
     end
 
-    def blank?
-      false
-    end
-
     private
+
     def variables_from_string(markup)
       markup.split(',').collect do |var|
         var =~ /\s*(#{QuotedFragment})\s*/o
diff --git a/lib/liquid/tags/include.rb b/lib/liquid/tags/include.rb
index d8319327..d4b2ee02 100644
--- a/lib/liquid/tags/include.rb
+++ b/lib/liquid/tags/include.rb
@@ -38,10 +38,6 @@ module Liquid
     def parse(tokens)
     end
 
-    def blank?
-      false
-    end
-
     def render(context)
       partial = load_cached_partial(context)
       variable = context[@variable_name || @template_name[1..-2]]
diff --git a/lib/liquid/tags/increment.rb b/lib/liquid/tags/increment.rb
index 4592d1cb..baa0cbb6 100644
--- a/lib/liquid/tags/increment.rb
+++ b/lib/liquid/tags/increment.rb
@@ -25,10 +25,6 @@ module Liquid
       context.environments.first[@variable] = value + 1
       value.to_s
     end
-
-    def blank?
-      false
-    end
   end
 
   Template.register_tag('increment'.freeze, Increment)
diff --git a/test/integration/tags/include_tag_test.rb b/test/integration/tags/include_tag_test.rb
index eca109f3..e4fab371 100644
--- a/test/integration/tags/include_tag_test.rb
+++ b/test/integration/tags/include_tag_test.rb
@@ -60,10 +60,6 @@ class CustomInclude < Liquid::Tag
   def parse(tokens)
   end
 
-  def blank?
-    false
-  end
-
   def render(context)
     @template_name[1..-2]
   end