Merge pull request #446 from Shopify/remove-end-tag

Remove unused Block#end_tag method.

History.md

@@ -3,6 +3,7 @@
 ## 3.0.0 / not yet released / branch "master"
 
 * ...
+* Removed Block#end_tag. Instead, override parse with `super` followed by your code. See #446 [Dylan Thacker-Smith, dylanahsmith]
 * Fixed condition with wrong data types, see #423 [Bogdan Gusiev]
 * Add url_encode to standard filters, see #421 [Derrick Reimer, djreimer]
 * Add uniq to standard filters [Florian Weingarten, fw42]

lib/liquid/block.rb

@@ -23,10 +23,7 @@ module Liquid
 
                 # if we found the proper block delimiter just end parsing here and let the outer block
                 # proceed
-                if block_delimiter == $1
-                  end_tag
-                  return
-                end
+                return if block_delimiter == $1
 
                 # fetch the tag from registered blocks
                 if tag = Template.tags[$1]
@@ -77,9 +74,6 @@ module Liquid
       all_warnings
     end
 
-    def end_tag
-    end
-
     def unknown_tag(tag, params, tokens)
       case tag
       when 'else'.freeze

lib/liquid/tags/raw.rb

@@ -8,10 +8,7 @@ module Liquid
       while token = tokens.shift
         if token =~ FullTokenPossiblyInvalid
           @nodelist << $1 if $1 != "".freeze
-          if block_delimiter == $2
-            end_tag
-            return
-          end
+          return if block_delimiter == $2
         end
         @nodelist << token if not token.empty?
       end