opulent 1.5.5 → 1.6.0

data/lib/opulent/compiler/control.rb

@@ -6,9 +6,8 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def if_node(node, indent, context)
+    def if_node(node, indent)
       # Check if we have any condition met, or an else branch
       node[@value].each_with_index do |value, index|
         # If we have a branch that meets the condition, generate code for the
@@ -21,7 +20,7 @@ module Opulent
 
         # Evaluate child nodes
         node[@children][index].each do |child|
-          root child, indent, context
+          root child, indent
         end
       end
 
@@ -33,9 +32,8 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def unless_node(node, indent, context)
+    def unless_node(node, indent)
       # Check if we have any condition met, or an else branch
       node[@value].each_with_index do |value, index|
         # If we have a branch that meets the condition, generate code for the
@@ -47,7 +45,7 @@ module Opulent
 
         # Evaluate child nodes
         node[@children][index].each do |child|
-          root child, indent, context
+          root child, indent
         end
       end
 
@@ -59,9 +57,8 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def case_node(node, indent, context)
+    def case_node(node, indent)
       # Evaluate the switching condition
       buffer_eval "case #{node[@options][:condition]}"
 
@@ -70,67 +67,64 @@ module Opulent
         # If we have a branch that meets the condition, generate code for the
         # children related to that specific branch
         case value
-        when node[@value].last then buffer_eval "else"
+        when node[@value].last then buffer_eval 'else'
         else buffer_eval "when #{value}"
         end
 
         # Evaluate child nodes
         node[@children][index].each do |child|
-          root child, indent, context
+          root child, indent
         end
       end
 
       # End
-      buffer_eval "end"
+      buffer_eval 'end'
     end
 
     # Generate the code for a while control structure
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def while_node(node, indent, context)
+    def while_node(node, indent)
       # While we have a branch that meets the condition, generate code for the
       # children related to that specific branch
       buffer_eval "while #{node[@value]}"
 
       # Evaluate child nodes
       node[@children].each do |child|
-        root child, indent, context
+        root child, indent
       end
 
       #End
-      buffer_eval "end"
+      buffer_eval 'end'
     end
 
     # Generate the code for a while control structure
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def until_node(node, indent, context)
+    def until_node(node, indent)
       # Until we have a branch that doesn't meet the condition, generate code for the
       # children related to that specific branch
       buffer_eval "until #{node[@value]}"
 
       # Evaluate child nodes
       node[@children].each do |child|
-        root child, indent, context
+        root child, indent
       end
 
       # End
-      buffer_eval "end"
+      buffer_eval 'end'
     end
 
     # Generate the code for a while control structure
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def each_node(node, indent, context)
+    def each_node(node, indent)
       # Process named variables for each structure
       variables = node[@value][1].clone
 
@@ -143,12 +137,12 @@ module Opulent
 
       # Value argument name provided only
       if variables.length == 1
-        variables.unshift Settings::DefaultEachKey
+        variables.unshift Settings::DEFAULT_EACH_KEY
 
       # Missing key and value arguments
       elsif variables.empty?
-        variables[0] = Settings::DefaultEachKey
-        variables[1] = Settings::DefaultEachValue
+        variables[0] = Settings::DEFAULT_EACH_KEY
+        variables[1] = Settings::DEFAULT_EACH_VALUE
       end
 
       # Choose whether to apply each with index (Arrays) or each (Hashes) methods
@@ -162,11 +156,11 @@ module Opulent
 
       # Evaluate child nodes
       node[@children].each do |child|
-        root child, indent, context
+        root child, indent
       end
 
       # End
-      buffer_eval "end"
+      buffer_eval 'end'
     end
   end
 end

data/lib/opulent/compiler/define.rb

@@ -2,71 +2,123 @@
 module Opulent
   # @Compiler
   class Compiler
+    # Write out definition node using ruby def
+    #
+    # @param node [Node] Current node data with options
+    #
+    def define(node)
+      # Write out def method_name
+      definition = "def _opulent_definition_#{node[@value].to_s.tr '-', '_'}"
+
+      # Node attributes
+      parameters = []
+      node[@options][:parameters].each do |key, value|
+        parameters << "#{key} = #{value[@value]}"
+      end
+      parameters << 'attributes = {}'
+      parameters << '&block'
+      definition += '(' + parameters.join(', ') + ')'
+
+      buffer_eval 'instance_eval do'
+      buffer_eval definition
+
+      node[@children].each do |child|
+        root child, 0
+      end
+
+      buffer_eval 'end'
+      buffer_eval 'end'
+    end
+
     # Generate code for all nodes by calling the method with their type name
     #
     # @param current [Array] Current node data with options
     # @param indent [Fixnum] Indentation size for current node
-    # @param context [Context] Context holding environment variables
     #
-    def def_node(node, indent, context)
+    def def_node(node, indent)
       # Set a namespace for the current node definition and make it a valid ruby
       # method name
-      key = "_opulent_definition_#{node[@value]}_#{@current_definition += 1}".gsub '-', '_'
+      key = "_opulent_definition_#{node[@value].to_s.tr '-', '_'}"
 
       # Set call variable
       call_node = node[@options][:call]
 
-      # Create the definition
-      buffer_eval "instance_eval do"
-      buffer_eval "def #{key}(attributes = {}, &block)"
-
-      # Set each parameter as a local variable
-      node[@options][:parameters].each do |parameter, value|
-        set_argument_code = "#{parameter} = attributes.delete(:#{parameter})"
-        set_argument_code += " || #{value[@value]}" if value[@value]
-        buffer_eval set_argument_code
-      end
-
-      # Evaluate definition child elements
-      node[@children].each do |child|
-        root child, indent + Settings[:indent], context
-      end
-
-      # End
-      buffer_eval "end"
-      buffer_eval "end"
-
       # 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?
         # Call method without any extension
-        buffer_eval "#{key}() do"
+        method_call = "#{key}"
+
+        # Call arguments set to true, in correct order
+        arguments = []
+        @definitions[call_node[@value]][@options][:parameters].keys.each do
+          arguments << 'true'
+        end
+        arguments << '{}'
+
+        method_call += '(' + arguments.join(', ') + ')'
+        method_call += ' do' unless call_node[@children].empty?
+
+        buffer_eval method_call
       else
-        call_attributes_code = buffer_attributes_to_hash call_node[@options][:attributes]
+        arguments = []
 
-        # Set call node parameters
-        call_attributes = buffer_set_variable :call_attributes, call_attributes_code
+        # 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]
+        ][@options][:parameters].keys.each do |k|
+          if call_node[@options][:attributes].keys.include? k
+            arguments << call_node[@options][:attributes].delete(k)[@value]
+          else
+            arguments << @definitions[
+              call_node[@value]
+            ][@options][:parameters][k][@value]
+          end
+        end
+
+        call_attributes = buffer_attributes_to_hash(
+          call_node[@options][:attributes]
+        )
 
-        # If the call node is extended as well, merge the call attributes hash with
-        # the extension hash
+        # If the call node is extended as well, merge the call attributes hash
+        # with the extension hash
         if call_node[@options][:extension]
-          extension_attributes = buffer_set_variable :extension, call_node[@options][:extension][@value]
-          buffer_eval "#{call_attributes}.merge!(#{extension_attributes}) do |#{OPULENT_KEY}, #{OPULENT_VALUE}1, #{OPULENT_VALUE}2|"
-          buffer_eval "#{OPULENT_KEY} == :class ? (#{OPULENT_VALUE}1 += #{OPULENT_VALUE}2) : (#{OPULENT_VALUE}2)"
-          buffer_eval "end"
+          # .merge!(var_name)
+          call_attributes += '.merge!(' \
+                             "#{call_node[@options][:extension][@value]}" \
+                             ')'
+
+          # { |key, value1, value2|
+          call_attributes += " { |#{OPULENT_KEY}, " \
+                             "#{OPULENT_VALUE}1, #{OPULENT_VALUE}2|"
+
+          # class ? value1 + value2 : value2
+          call_attributes += "#{OPULENT_KEY} == :class ? (" \
+                             "#{OPULENT_VALUE}1 += " \
+                             "#{OPULENT_VALUE}2) : (#{OPULENT_VALUE}2" \
+                             ')'
+
+          # }
+          call_attributes += '}'
         end
 
-        buffer_eval "#{key}(#{call_attributes}) do"
+        arguments << call_attributes
+
+        call = "#{key}(#{arguments.join ', '})"
+        call += ' do' unless call_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|
-        root child, indent + Settings[:indent], context
+        root child, indent + @settings[:indent]
       end
 
       # End block
-      buffer_eval "end"
+      buffer_eval 'end' unless call_node[@children].empty?
     end
   end
 end

data/lib/opulent/compiler/doctype.rb

@@ -1,4 +1,3 @@
-
 # @Opulent
 module Opulent
   # @Compiler
@@ -7,29 +6,28 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def doctype_node(node, indent, context)
+    def doctype_node(node, indent)
       value = case node[@value]
-      when :"", :"html", :"5"
-        "!DOCTYPE html"
-      when :"1.1"
-        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"'
-      when :strict
-        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"'
-      when :frameset
-        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"'
-      when :mobile
-        '!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd"'
-      when :basic
-        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"'
-      when :transitional
-        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
-      when :xml
-        '?xml version="1.0" encoding="utf-8" ?'
-      when :'xml ISO-8859-1'
-        '?xml version="1.0" encoding="iso-8859-1" ?'
-      end
+              when :"", :html, :"5"
+                '!DOCTYPE html'
+              when :"1.1"
+                '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"'
+              when :strict
+                '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"'
+              when :frameset
+                '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"'
+              when :mobile
+                '!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd"'
+              when :basic
+                '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"'
+              when :transitional
+                '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
+              when :xml
+                '?xml version="1.0" encoding="utf-8" ?'
+              when :'xml ISO-8859-1'
+                '?xml version="1.0" encoding="iso-8859-1" ?'
+              end
 
       @node_stack << :doctype
       buffer_freeze "<#{value}>"

data/lib/opulent/compiler/eval.rb

@@ -6,10 +6,31 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def evaluate(node, indent, context)
+    def evaluate(node, indent)
+      # Check if this is a substructure of a control block and remove the last
+      # end evaluation if it is
+      if node[@value] =~ Settings::END_REMOVAL
+        @template.pop if @template[-1] == [:eval, 'end']
+      end
+
+      # Check for explicit end node
+      if node[@value] =~ Settings::END_EXPLICIT
+        Logger.error :compile, @template, :explicit_end, node
+      end
+
+      # Evaluate the current expression
       buffer_eval node[@value]
+
+      # If the node has children, evaluate each one of them
+      if node[@children]
+        node[@children].each do |child|
+          root child, indent + @settings[:indent]
+        end
+      end
+
+      # Check if the node is actually a block expression
+      buffer_eval 'end' if node[@value] =~ Settings::END_INSERTION
     end
   end
 end

data/lib/opulent/compiler/filter.rb

@@ -6,14 +6,13 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def filter(node, indent, context)
+    def filter(node, indent)
       # Evaluate and generate node attributes, then process each one to
       # by generating the required attribute code
       attributes = {}
       node[@options].each do |key, attribute|
-        attributes[key] = map_attribute key, attribute, context
+        attributes[key] = map_attribute key, attribute
       end
 
       # Get registered filter name
@@ -44,10 +43,10 @@ module Opulent
         wrapper_node = [:node, wrapper_tag, {attributes: atts}, [text_node], indent]
 
         # Begin code generation from the wrapper node
-        root wrapper_node, indent, context
+        root wrapper_node, indent
       else
         # Generate code for output text node
-        root text_node, indent, context
+        root text_node, indent
       end
     end
   end

data/lib/opulent/compiler/node.rb

@@ -7,43 +7,49 @@ module Opulent
     #
     # @param node [Array] Node code generation data
     # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
     #
-    def node(node, indent, context)
-      indentation = " " * indent
+    def node(node, indent)
+      indentation = ' ' * indent
 
       # Add the tag opening, with leading whitespace to the code buffer
-      buffer_freeze " " if node[@options][:leading_whitespace]
+      buffer_freeze ' ' if node[@options][:leading_whitespace]
       buffer_freeze "<#{node[@value]}"
 
       # Evaluate node extension in the current context
-      extension = if node[@options][:extension]
-        buffer_set_variable :extension, node[@options][:extension][@value]
+      if node[@options][:extension]
+        extension_name = buffer_set_variable :extension,
+                                             node[@options][:extension][@value]
+
+        extension = {
+          name: extension_name,
+          escaped: node[@options][:extension][@options][:escaped]
+        }
       end
 
       # Evaluate and generate node attributes, then process each one to
       # by generating the required attribute code
-      attributes = {}
-      buffer_attributes node[@options][:attributes], extension
+      # attributes = {}
+      buffer_attributes node[@options][:attributes],
+                        extension
 
 
       # Check if the current node is self enclosing. Self enclosing nodes
       # do not have any child elements
       if node[@options][:self_enclosing]
         # If the tag is self enclosing, it cannot have any child elements.
-        buffer_freeze ">"
+        buffer_freeze '>'
       else
         # Set tag ending code
-        buffer_freeze ">"
+        buffer_freeze '>'
 
         # Process each child element recursively, increasing indentation
         node[@children].each do |child|
-          root child, indent + Settings[:indent], context
+          root child, indent + @settings[:indent]
         end
 
         # Set tag closing code
         buffer_freeze "</#{node[@value]}>"
-        buffer_freeze " " if node[@options][:trailing_whitespace]
+        buffer_freeze ' ' if node[@options][:trailing_whitespace]
       end
     end
   end