opulent 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a13ab0ad288c702f2f5a1c24f686c0bcea8ce6
-  data.tar.gz: cc8762cd9d9701340ae1c1f59e2d7250464d162f
+  metadata.gz: 00de440bb2707f1677577c3166c6afc30dd12d0e
+  data.tar.gz: 451a6be59313e43cd42dc4cb2eff4ea57891e2d2
 SHA512:
-  metadata.gz: 746952640cfc38ffa597c75227f9233d36cce8782a41ecf8f82d726896fe6e95c18692d2ef5091f246d6a5294eea65e2a047b633cb3feb128bf2f32c37a1c15a
-  data.tar.gz: 673e591e2cf98021ff8eae91e9675a20a200d0845e6c2589b904e9d4278fc309c4c8e92220d11591026e6354ba0e774c27b0183fe658846865e2f8b034069346
+  metadata.gz: b612ad8fc5aba54968c011607fb277bcee38360e874339ff2cd3decc0ddaab3e04a2fc5f34472e9c1a07b7b7b7e0ca4ced47b7b7106ac5b0a3d8b04fa439fbcd
+  data.tar.gz: 8367054aebf9153a816f76aa51a9b72f66fc7885ea7ecbef9804eadb8ccfc08edb832980b22a8a1ef8075b865036ae4bb1238fc81fff76513e964a43c7389a83

data/lib/opulent/parser/define.rb

@@ -23,7 +23,13 @@ module Opulent
       name = accept(:node, :*).to_sym
 
       # Create node
-      definition = [:def, name, { parameters: attributes }, [], indent]
+      definition = [
+        :def,
+        name,
+        { parameters: attributes({}, true) },
+        [],
+        indent
+      ]
 
       # 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

data/lib/opulent/parser/node.rb

@@ -189,11 +189,12 @@ module Opulent
 
     # Get element attributes
     #
-    # @atts [Hash] Accumulator for node attributes
+    # @param atts [Hash] Accumulator for node attributes
+    # @param for_definition [Boolean] Set default value in wrapped to nil
     #
-    def attributes(atts = {})
-      wrapped_attributes atts
-      attributes_assignments atts, false
+    def attributes(atts = {}, for_definition = false)
+      wrapped_attributes atts, for_definition
+      attributes_assignments atts, false, for_definition
       atts
     end
 
@@ -203,27 +204,26 @@ module Opulent
     #
     # @param as_parameters [Boolean] Accept or reject identifier nodes
     #
-    def wrapped_attributes(list)
-      if (bracket = accept :brackets)
-        accept_newline
-        attributes_assignments list, true
-        accept_newline
+    def wrapped_attributes(list = {}, for_definition = false)
+      return unless (bracket = accept :brackets)
 
-        accept_stripped bracket.to_sym, :*
-      end
+      accept_newline
+      attributes_assignments list, true, for_definition
+      accept_newline
+
+      accept_stripped bracket.to_sym, :*
 
       list
     end
 
-    # Check if we match an expression node or
-    # a node node
+    # Get all attribute assignments as key=value pairs or standalone keys
     #
     # [ assignments ]
     #
     # @param list [Hash] Parent to which we append nodes
     # @param as_parameters [Boolean] Accept or reject identifier nodes
     #
-    def attributes_assignments(list, wrapped = true)
+    def attributes_assignments(list, wrapped = true, for_definition = false)
       if wrapped && lookahead(:exp_identifier_stripped_lookahead).nil? ||
          !wrapped && lookahead(:assignment_lookahead).nil?
         return list
@@ -253,7 +253,8 @@ module Opulent
         end
       else
         unless list[argument]
-          list[argument] = [:expression, 'true', { escaped: false }]
+          default_value = for_definition ? 'nil' : 'true'
+          list[argument] = [:expression, default_value, { escaped: false }]
         end
       end
 
@@ -267,13 +268,13 @@ module Opulent
 
         # Lookahead for attributes on the current line and the next one
         if lookahead(:exp_identifier_stripped_lookahead)
-          attributes_assignments list, wrapped
+          attributes_assignments list, wrapped, for_definition
         elsif lookahead_next_line(:exp_identifier_stripped_lookahead)
           accept_newline
-          attributes_assignments list, wrapped
+          attributes_assignments list, wrapped, for_definition
         end
       elsif !wrapped && lookahead(:assignment_lookahead)
-        attributes_assignments list, wrapped
+        attributes_assignments list, wrapped, for_definition
       end
 
       list

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.6.7'
+  VERSION = '1.6.8'
 end

metadata

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