opulent 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757e6f7f89de04fb7289c260d40433dea0285b77
-  data.tar.gz: ebea7a80a01aa78fe4c677b1f7a8f91df824c2b6
+  metadata.gz: 2cc679a1295d1bf93f8b99c868fce7dedc384b22
+  data.tar.gz: e611419e1736b5e2b648c0d4bfef2214cddaf1c1
 SHA512:
-  metadata.gz: 2995a418ea66cbf6246045085df69983dbe0402f48613c4426acae9b4f3f5c28da3f62b09bf37ea24ed8d5c3673e90b4d441387afe9a7df2785d4e17d6f03b23
-  data.tar.gz: 5e6f0f2e9ad09e052ed93ecec48882b7595751b5002647fc86fb790323479dac92da435beee7daf5d9141835e91896a0308d3e7bf1e3ccd48483d6b6b555ebc8
+  metadata.gz: 6b019b7a8acc18c742719c1c1804b45a5f207a939d33f7d94616f5d9aafdd30bf5a2a9d3987746a91373432fb5edbf944b3e7775c8250d6647ffe05456463494
+  data.tar.gz: 8d4281c2386d63aecc1857bf71c94826814ee9b3e9ca882d372d4ba157517f446add48f19177c0f2169aecf4c640988ed62ccb05be65fd7e8734a2f539fc7547

data/lib/opulent/compiler/define.rb

@@ -40,24 +40,24 @@ module Opulent
       # method name
       key = "_opulent_definition_#{node[@value].to_s.tr '-', '_'}"
 
-      # Set call variable
-      call_node = node[@options][:call]
 
       # If we have attributes set for our defined node, we will need to create
       # an extension parameter which will be o
-      if call_node[@options][:attributes].empty?
+      if node[@options][:attributes].empty?
         # Call method without any extension
         method_call = "#{key}"
 
         # Call arguments set to true, in correct order
         arguments = []
-        @definitions[call_node[@value]][@options][:parameters].keys.each do |k|
-          arguments << 'true'
+        @definitions[node[@value]][@options][:parameters].keys.each do |k|
+          arguments << @definitions[
+            node[@value]
+          ][@options][:parameters][k][@value]
         end
         arguments << '{}'
 
         method_call += '(' + arguments.join(', ') + ')'
-        method_call += ' do' unless call_node[@children].empty?
+        method_call += ' do' unless node[@children].empty?
 
         buffer_eval method_call
       else
@@ -66,27 +66,27 @@ module Opulent
         # Extract node definition arguments in the correct order. If the given
         # key does not exist, set the value to default or true
         @definitions[
-          call_node[@value]
+          node[@value]
         ][@options][:parameters].keys.each do |k|
-          if call_node[@options][:attributes].keys.include? k
-            arguments << call_node[@options][:attributes].delete(k)[@value]
+          if node[@options][:attributes].key? k
+            arguments << node[@options][:attributes].delete(k)[@value]
           else
             arguments << @definitions[
-              call_node[@value]
+              node[@value]
             ][@options][:parameters][k][@value]
           end
         end
 
         call_attributes = buffer_attributes_to_hash(
-          call_node[@options][:attributes]
+          node[@options][:attributes]
         )
 
         # If the call node is extended as well, merge the call attributes hash
         # with the extension hash
-        if call_node[@options][:extension]
+        if node[@options][:extension]
           # .merge!(var_name)
           call_attributes += '.merge!(' \
-                             "#{call_node[@options][:extension][@value]}" \
+                             "#{node[@options][:extension][@value]}" \
                              ')'
 
           # { |key, value1, value2|
@@ -106,19 +106,19 @@ module Opulent
         arguments << call_attributes
 
         call = "#{key}(#{arguments.join ', '})"
-        call += ' do' unless call_node[@children].empty?
+        call += ' do' unless node[@children].empty?
 
         buffer_eval call
       end
 
       # Set call node children as block evaluation. Very useful for
       # performance and evaluating them in the parent context
-      call_node[@children].each do |child|
+      node[@children].each do |child|
         root child, indent + @settings[:indent]
       end
 
       # End block
-      buffer_eval 'end' unless call_node[@children].empty?
+      buffer_eval 'end' unless node[@children].empty?
     end
   end
 end

data/lib/opulent/parser.rb

@@ -70,9 +70,56 @@ module Opulent
       # nodes and definitions
       root @root
 
+      # Check whether nodes inside definitions have a custom definition
+      @definitions.each do |name, node|
+        @current_def = name
+        apply_definitions node
+      end
+      @current_def = nil
+
+      # Check whether nodes have a custom definition
+      apply_definitions @root
+
+      # Return root element
       [@root, @definitions]
     end
 
+    # Set each node as a defined node if a definition exists with the given
+    # node name, unless we're inside a definition with the same name as the node
+    # because we want to avoid recursion.
+    #
+    # @param node [Node] Input Node to checked for existence of definitions
+    #
+    def apply_definitions(node)
+      # Apply definition check to all of the node's children
+      process_definitions = proc do |children|
+        children.each do |child|
+          # Check if we have a definition
+          is_definition = if child[@value] == @current_def
+                            child[@options][:recursive]
+                          else
+                            @definitions.key?(child[@value])
+                          end
+
+          # Set child as a defined node
+          child[@type] = :def if is_definition
+
+          # Recursively apply definitions to child nodes
+          apply_definitions child if child[@children]
+        end
+      end
+
+      # Apply definitions to each case of the control node
+      if %i(if unless case each while until).include? node[@type]
+        node[@children].each do |array|
+          process_definitions[array]
+        end
+      # Apply definition to all of the node's children
+      else
+        process_definitions[node[@children]]
+      end
+    end
+
     # Check and accept or reject a given token as long as we have tokens
     # remaining. Shift the code with the match length plus any extra character
     # count around the capture group

data/lib/opulent/parser/node.rb

@@ -13,6 +13,7 @@ module Opulent
       return unless (name = lookahead(:node_lookahead) ||
                             lookahead(:shorthand_lookahead))
 
+      # Skip node if it's a reserved keyword
       return nil if KEYWORDS.include? name[0].to_sym
 
       # Accept either explicit node_name or implicit :div node_name
@@ -27,6 +28,9 @@ module Opulent
       # Node creation options
       options = {}
 
+      # Get leading whitespace
+      options[:recursive] = accept(:recursive)
+
       # Get leading whitespace
       options[:leading_whitespace] = accept_stripped(:leading_whitespace)
 
@@ -78,64 +82,57 @@ module Opulent
       # Add the current node to the root
       root current_node, indent
 
-      # Create a clone of the definition model. Cloning the options is also
-      # necessary because it's a shallow copy
-      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
+      # Add the parsed node to the parent
+      parent[@children] << current_node
     end
 
+    # Deprecated @version 1.6.6
+    #
     # When entering a definition model, we replace all the node types with their
     # know definitions at definition call time.
     #
     # @param node_name [Symbol] Node identifier
     # @param call_context [Node] Initial node call with its attributes
     #
-    def process_definition(node_name, call_context)
-      model = [
-        :def,
-        node_name,
-        {},
-        [],
-        call_context[@indent]
-      ]
-      model[@options] = {}.merge model[@options]
-      model[@options][:call] = call_context
-
-      # Deprecated @version 1.6.4
-      #
-      # Recursively map each child nodes to their definitions
-      # for the initial call node children and for the model
-      # children
-      # process_definition_child model[@options][:call]
-      # process_definition_child model
-
-      model
-    end
-
+    # def process_definition(node_name, call_context)
+    # model = [
+    #   :def,
+    #   node_name,
+    #   {},
+    #   [],
+    #   call_context[@indent]
+    # ]
+    #
+    # model[@options] = {}.merge model[@options]
+    # model[@options][:call] = call_context
+    #
+    # Recursively map each child nodes to their definitions
+    # for the initial call node children and for the model
+    # children
+    # process_definition_child model[@options][:call]
+    # process_definition_child model
+    # model
+    # end
+    #
     # Process definition children for the current node.
     #
     # @param node [Node] Callee node
     #
-    def process_definition_child(node)
-      node[@children].map! do |child|
-        if child[@type] == :node
-          if !@definition_stack.include?(child[@value]) &&
-             @definitions.key?(child[@value])
-            process_definition child[@value], child
-          else
-            process_definition_child child if child[@children]
-            child
-          end
-        else
-          child
-        end
-      end
-    end
+    # def process_definition_child(node)
+    #   node[@children].map! do |child|
+    #     if child[@type] == :node
+    #       if !@definition_stack.include?(child[@value]) &&
+    #          @definitions.key?(child[@value])
+    #         process_definition child[@value], child
+    #       else
+    #         process_definition_child child if child[@children]
+    #         child
+    #       end
+    #     else
+    #       child
+    #     end
+    #   end
+    # end
 
     # Helper method to create an array of values when an attribute is set
     # multiple times. This happens unless the key is id, which is unique

data/lib/opulent/tokens.rb

@@ -127,6 +127,9 @@ module Opulent
       # Whitespace
       whitespace: /\A\s+/,
 
+      # Recursive Node Definitions
+      recursive: /\A\*/,
+
       # Evaluation
       eval: /\A\-/,
 

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.6.5'
+  VERSION = '1.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Alex Grozav
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Intelligent Templating Engine for Creative Web Developers.