locomotivecms-liquid 4.0.0.alpha1 → 4.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9146b6c0f563f43a00efbd5656d8642c0cc356b0
-  data.tar.gz: 5f181a813cd6c5df89507c7d5e0c2dd31c4e378b
+  metadata.gz: e16a21f99a84106828a5080a84a4317e45413c40
+  data.tar.gz: 1073604f97eec71567d78f24e5c35525aa12069d
 SHA512:
-  metadata.gz: 062c89b8f9c5b313705384a2cb16886d87ce8a483546099c0b78fb0da0a339b4de6997a0fbab2f234b62c057451cc7114bacb01b9b2ab6fc3592d704ff1a8300
-  data.tar.gz: 2ade61abd56b055a10feb20de21f58a1cc2152c94c10408f024cb3d2879b2a9ccf9ab70e666dad3708396ca046a68265c345d973d28ef909f4fb9d5480bd7444
+  metadata.gz: 6363e603880d7f4a13831d3f14056776efe69906b585119637acb5033df0057b2e7ec0523b7ef342d5a04c1bc9f1ffe53469c16db008c667a7b6f3d5229ba721
+  data.tar.gz: 720b3a157620a8d2c7e8b23fc61aeda65d348baf448ae8e0414f9075c6e63b299895e129940a52c596ffc4c470f701fb008e7df40d579108f0f7dac6da7eafb2

data/lib/liquid/tags/inherited_block.rb

@@ -65,10 +65,8 @@ module Liquid
         # look for the very first descendant
         block = self_or_first_descendant
 
-        if block != self
-          # the block drop is in charge of rendering "{{ block.super }}"
-          context['block'] = InheritedBlockDrop.new(block)
-        end
+        # the block drop is in charge of rendering "{{ block.super }}"
+        context['block'] = InheritedBlockDrop.new(block)
 
         block.render_without_inheritance(context)
       end
@@ -94,7 +92,8 @@ module Liquid
     end
 
     def inherited_blocks
-      options[:inherited_blocks] || {
+      # initialize it in the case the template does not include an extend tag
+      options[:inherited_blocks] ||= {
         all:    {},
         nested: []
       }

data/lib/liquid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Liquid
-  VERSION = "4.0.0.alpha1"
+  VERSION = "4.0.0.alpha2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms-liquid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha1
+  version: 4.0.0.alpha2
 platform: ruby
 authors:
 - Tobias Luetke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake