opulent 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d310bfbdbf90ef6c0fab56f07cd3f270b625be
-  data.tar.gz: 070eba90f7f4ec83d427642268b1e1138c0ca7df
+  metadata.gz: 2c8acd296b42eefdc3b2e9fb0a558e6a30a236b1
+  data.tar.gz: 23878031df261bc6e3379318ebac323b9293654b
 SHA512:
-  metadata.gz: 1497de762406f57d97afec44f8cd3f02b80a20202fbfeba31a1ce32fa324751e5fb5687f0408d5920c32b971873c47b9035946f452d129520f3f97066e9c4aee
-  data.tar.gz: 959f0e1d74856caccbada40bdfdddedd2de2548dc5bbb34eb35a785eab1911fdf8634374c7bbbcccf6b69de7f8872b26d49dc436c9e4afc6e31f2deaae61e87f
+  metadata.gz: 33463ff92a452d7c9d8bdc399c6cb3ea26b0bd51b981b187def57d6b66970449a157e40463f83642d596336030ac04fba6cf21effb6a0d69bd61f1ac200f0290
+  data.tar.gz: 756bd4620c6cb515357926ac658cfe666eccdb8423a2a739c190c3ae38defbcb6637ed22b928b9037cb35fc233046cf22f5408f4d0a4950459339c7740b57c97

data/lib/opulent/parser.rb

@@ -35,6 +35,10 @@ module Opulent
       # be used with the last parent path found
       @file = [[file, -1]]
 
+      # Create a definition stack to disallow recursive calls. When inside a
+      # definition and a named node is called, we render it as a plain node
+      @definition_stack = []
+
       # Initialize definitions for the parser
       @definitions = definitions
     end

data/lib/opulent/parser/define.rb

@@ -24,9 +24,7 @@ module Opulent
         # Set definition as root node and let the parser know that we're inside
         # a definition. This is used because inside definitions we do not process
         # nodes (we do not check if they are have a definition or not).
-        @inside_definition = name
-        root(definition, indent)
-        @inside_definition = nil
+        root definition, indent
 
         # Add to parent
         @definitions[name] = definition

data/lib/opulent/parser/node.rb

@@ -80,8 +80,10 @@ module Opulent
 
         # Create a clone of the definition model. Cloning the options is also
         # necessary because it's a shallow copy
-        if @inside_definition != node_name && @definitions.keys.include?(node_name)
+        if @definitions.keys.include?(node_name)
+          @definition_stack << node_name
           parent[@children] << process_definition(node_name, current_node)
+          @definition_stack.pop
         else
           parent[@children] << current_node
         end
@@ -111,7 +113,7 @@ module Opulent
     def process_definition_child(node)
       node[@children].map! do |child|
         if child[@type] == :node
-          if @definitions.keys.include? child[@value]
+          if !@definition_stack.include?(node[@value]) && @definitions.keys.include?(child[@value])
             process_definition child[@value], child
           else
             process_definition_child child if child[@children]

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Alex Grozav