opulent 1.5.5 → 1.6.0

data/lib/opulent/parser/text.rb

@@ -1,123 +1,150 @@
-# @Opulent
-module Opulent
-  # @Parser
-  class Parser
-    # Match one line or multiline, escaped or unescaped text
-    #
-    # @param parent [Array] Parent node element
-    # @param indent [Fixnum] Size of the current indentation
-    # @param multiline_or_print [Boolean] Allow only multiline text or print
-    #
-    def text(parent, indent = nil, multiline_or_print = true)
-      # Try to see if we can match a multiline operator. If we can accept_stripped only
-      # multiline, which is the case for filters, undo the operation.
-      if accept :multiline
-        multiline = true
-      elsif multiline_or_print
-        return nil unless lookahead :print_lookahead
-      end
-
-      # Get text node type
-      type = if accept(:print) then :print else :text end
-
-      # Check if the text or print node is escaped or unescaped
-      escaped = accept(:unescaped_value) ? false : true
-
-      # Get text value
-      value = accept :line_feed
-      value = value[1..-1] if value[0] == '\\'
-
-      # Create the text node using input data
-      text_node = [:plain, type, {value: value.strip, escaped: escaped}, nil, indent]
-
-      # If we have a multiline node, get all the text which has higher
-      # indentation than our indentation node.
-      if multiline
-        text_node[@options][:value] += accept(:newline) || ""
-        text_node[@options][:value] += get_indented_lines(indent)
-        text_node[@options][:value].strip!
-      elsif value.empty?
-        # If our value is empty and we're not going to add any more lines to
-        # our buffer, skip the node
-        return nil
-      end
-
-      # Increase indentation if this is an inline text node
-      text_node[@indent] += Settings[:indent] unless multiline_or_print
-
-      # Add text node to the parent element
-      parent[@children] << text_node
-    end
-
-    # Match one line or multiline, escaped or unescaped text
-    #
-    def html_text(parent, indent)
-      if (text_feed = accept :html_text)
-        text_node = [:plain, :text, {value: text_feed.strip, escaped: false}, nil, indent]
-
-        parent[@children] << text_node
-      end
-    end
-
-    # Match a whitespace by preventing code trimming
-    #
-    def whitespace(required = false)
-      accept :whitespace, required
-    end
-
-    # Gather all the lines which have higher indentation than the one given as
-    # parameter and put them into the buffer
-    #
-    # @param indentation [Fixnum] parent node strating indentation
-    #
-    def get_indented_lines(indent)
-      buffer = ''
-
-      # Gather multiple blank lines between lines of text
-      blank_lines = Proc.new do
-        while lookahead_next_line :line_whitespace
-          @line = @code[(@i += 1)]
-          @offset = 0
-
-          buffer += accept :line_whitespace
-        end
-      end
-
-      # Get blank lines until we match something
-      blank_lines[]
-
-      # Get the next indentation after the parent line
-      # and set it as primary indent
-      next_indent = first_indent = (lookahead_next_line(:indent).to_s || "").size
-
-      # While the indentation is smaller, add the line feed  to our buffer
-      while next_indent > indent
-        # Advance current line and reset offset
-        @line = @code[(@i += 1)]
-        @offset = 0
-
-        # Get leading whitespace trimmed with first_indent's size
-        next_line_indent = accept(:indent)[first_indent..-1] || ""
-        next_line_indent = next_line_indent.size
-
-        # Add next line feed, prepend the indent and append the newline
-        buffer += " " * next_line_indent if next_line_indent > 0
-        buffer += accept_stripped(:line_feed) || ""
-        buffer += accept(:newline) || ""
-
-        # Get blank lines until we match something
-        blank_lines[]
-
-        # Check the indentation on the following line. When we reach EOF,
-        # set the indentation to 0 and cause the loop to stop
-        if (next_indent = lookahead_next_line :indent)
-          next_indent = next_indent[0].size
-        else
-          next_indent = 0
-        end
-      end
-
-      return buffer
-    end
-  end
-end
+# @Opulent
+module Opulent
+  # @Parser
+  class Parser
+    # Match one line or multiline, escaped or unescaped text
+    #
+    # @param parent [Array] Parent node element
+    # @param indent [Fixnum] Size of the current indentation
+    # @param multiline_or_print [Boolean] Allow only multiline text or print
+    #
+    def text(parent, indent = nil, multiline_or_print = true)
+      # Try to see if we can match a multiline operator. If we can accept_stripped only
+      # multiline, which is the case for filters, undo the operation.
+      if accept :multiline
+        multiline = true
+      elsif multiline_or_print
+        return nil unless lookahead :print_lookahead
+      end
+
+      # Get text node type
+      type = accept(:print) ? :print : :text
+
+      # Check if the text or print node is escaped or unescaped
+      escaped = accept(:unescaped_value) ? false : true
+
+      # Get leading whitespace
+      leading_whitespace = accept(:leading_whitespace)
+
+      # Get trailing whitespace
+      trailing_whitespace = accept(:trailing_whitespace)
+
+      # Get text value
+      value = accept :line_feed
+      value = value[1..-1] if value[0] == '\\'
+
+      # Create the text node using input data
+      text_node = [
+        :plain,
+        type,
+        {
+          value: value.strip,
+          escaped: escaped,
+          leading_whitespace: leading_whitespace,
+          trailing_whitespace: trailing_whitespace
+        },
+        nil,
+        indent
+      ]
+
+      # If we have a multiline node, get all the text which has higher
+      # indentation than our indentation node.
+      if multiline
+        text_node[@options][:value] += accept(:newline) || ''
+        text_node[@options][:value] += get_indented_lines(indent)
+        text_node[@options][:value].strip!
+      elsif value.empty?
+        # If our value is empty and we're not going to add any more lines to
+        # our buffer, skip the node
+        return nil
+      end
+
+      # Increase indentation if this is an inline text node
+      text_node[@indent] += @settings[:indent] unless multiline_or_print
+
+      # Add text node to the parent element
+      parent[@children] << text_node
+    end
+
+    # Match one line or multiline, escaped or unescaped text
+    #
+    def html_text(parent, indent)
+      return unless (text_feed = accept :html_text)
+
+      text_node = [
+        :plain,
+        :text,
+        {
+          value: text_feed.strip,
+          escaped: false
+        },
+        nil,
+        indent
+      ]
+
+      parent[@children] << text_node
+    end
+
+    # Match a whitespace by preventing code trimming
+    #
+    def whitespace(required = false)
+      accept :whitespace, required
+    end
+
+    # Gather all the lines which have higher indentation than the one given as
+    # parameter and put them into the buffer
+    #
+    # @param indentation [Fixnum] parent node strating indentation
+    #
+    def get_indented_lines(indent)
+      buffer = ''
+
+      # Gather multiple blank lines between lines of text
+      blank_lines = proc do
+        while lookahead_next_line :line_whitespace
+          @line = @code[(@i += 1)]
+          @offset = 0
+
+          buffer += accept :line_whitespace
+        end
+      end
+
+      # Get blank lines until we match something
+      blank_lines[]
+
+      # Get the next indentation after the parent line
+      # and set it as primary indent
+      first_indent = (lookahead_next_line(:indent).to_s || '').size
+      next_indent = first_indent
+
+      # While the indentation is smaller, add the line feed  to our buffer
+      while next_indent > indent
+        # Advance current line and reset offset
+        @line = @code[(@i += 1)]
+        @offset = 0
+
+        # Get leading whitespace trimmed with first_indent's size
+        next_line_indent = accept(:indent)[first_indent..-1] || ''
+        next_line_indent = next_line_indent.size
+
+        # Add next line feed, prepend the indent and append the newline
+        buffer += ' ' * next_line_indent if next_line_indent > 0
+        buffer += accept_stripped(:line_feed) || ''
+        buffer += accept(:newline) || ''
+
+        # Get blank lines until we match something
+        blank_lines[]
+
+        # Check the indentation on the following line. When we reach EOF,
+        # set the indentation to 0 and cause the loop to stop
+        if (next_indent = lookahead_next_line :indent)
+          next_indent = next_indent[0].size
+        else
+          next_indent = 0
+        end
+      end
+
+      buffer
+    end
+  end
+end

data/lib/opulent/parser/yield.rb

@@ -1,23 +1,23 @@
-# @Opulent
-module Opulent
-  # @Parser
-  class Parser
-    # Match a yield with a explicit or implicit target
-    #
-    # yield target
-    #
-    # @param parent [Node] Parent node to which we append the definition
-    #
-    def block_yield(parent, indent)
-      if accept :yield
-        # Consume the newline from the end of the element
-        error :yield unless accept(:line_feed).strip.empty?
-
-        # Create a new node
-        yield_node = [:yield, nil, {}, [], indent]
-
-        parent[@children] << yield_node
-      end
-    end
-  end
-end
+# @Opulent
+module Opulent
+  # @Parser
+  class Parser
+    # Match a yield with a explicit or implicit target
+    #
+    # yield target
+    #
+    # @param parent [Node] Parent node to which we append the definition
+    #
+    def block_yield(parent, indent)
+      return unless accept :yield
+
+      # Consume the newline from the end of the element
+      error :yield unless accept(:line_feed).strip.empty?
+
+      # Create a new node
+      yield_node = [:yield, nil, {}, [], indent]
+
+      parent[@children] << yield_node
+    end
+  end
+end

data/lib/opulent/settings.rb

@@ -1,7 +1,7 @@
 # @Opulent
 module Opulent
   # @Settings
-  module Settings
+  class Settings
     # Set buffer variable name
     BUFFER = :@_opulent_buffer
 
@@ -9,76 +9,95 @@ module Opulent
     FILE_EXTENSION = '.op'
 
     # Default yield target which is used for child block replacements
-    DefaultEachKey = :key
+    DEFAULT_EACH_KEY = :key
 
     # Default yield target which is used for child block replacements
-    DefaultEachValue = :value
+    DEFAULT_EACH_VALUE = :value
 
     # List of self enclosing node elements
-    SelfEnclosing = %i(img link input meta br hr area base col command embed keygen param source track wbr)
+    SELF_ENCLOSING = %i(
+      img link input meta br hr area base col command embed keygen param source
+      track wbr
+    )
 
     # List of inline node parents which can be either inline or have complex
     # structures inside of them, such as anchor tags
-    MultiNode = %i(a)
+    MULTI_NODE = %i(a)
 
     # List of inline node names
-    InlineNode = %i(text a span strong em br i b small label sub sup abbr var code kbd)
+    INLINE_NODE = %i(
+      text a span strong em br i b small label sub sup abbr var code kbd
+    )
 
     # Check whether text should or shouldn't be evaluated
-    InterpolationCheck = /(?<!\\)\#\{.*\}/
+    INTERPOLATION_CHECK = /(?<!\\)\#\{.*\}/
 
     # Check if the attribute value is a bare string
-    EvaluationCheck = /\A(("((?:[^"\\]|\\.)*?)")|('(?:[^'\\]|\\.)*?')|true|false|nil)\Z/
+    EVALUATION_CHECK = /\A(("((?:[^"\\]|\\.)*?)")|('(?:[^'\\]|\\.)*?')|true|false|nil)\Z/
+
+    # Check to see if we need to insert an end block for the current evaluation
+    # control do || .* end
+    END_INSERTION = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+    END_REMOVAL = /\A(else|elsif|when|rescue|ensure)/
+    END_EXPLICIT = /\A(end)/
 
     # Shorthand attribute associations
-    Shorthand = {
-      :'.' => :class,
-      :'#' => :id,
-      :'&' => :name
+    SHORTHAND = {
+      '.': :class,
+      '#': :id,
+      '&': :name
     }
 
-    # @Singleton
-    class << self
-      # Opulent runtime options
-      Defaults = {
-        #pretty: true, # At the moment, code cannot be uglified
-        #dependency_manager: true, # Soon to be implemented
-        indent: 2,
-        layouts: false,
-        pretty: false, # Under work
-        default_layout: :'views/layouts/application'
-      }
-
-      # Set defaults as initial options
-      @@options = Defaults
-
-      # Get an option at runtime
-      #
-      # @param name [Symbol] Identifier for the option
-      #
-      def [](name)
-        @@options[name]
-      end
+    # Opulent runtime settings
+    DEFAULTS = {
+      # dependency_manager: true, # Soon to be implemented
+      indent: 2,
+      layouts: false,
+      pretty: false,
+      default_layout: :'views/layouts/application'
+    }
 
-      # Set a new option at runtime
-      #
-      # @param name [Symbol] Identifier for the option
-      # @param value Option value to be set
-      #
-      def []=(name, value)
-        @@options[name] = value
-      end
+    # Set defaults as initial settings
+    #
+    def initialize
+      @settings = DEFAULTS
+    end
+
+    # Get an option at runtime
+    #
+    # @param name [Symbol] Identifier for the option
+    #
+    def [](name)
+      @settings[name]
+    end
+
+    # Set a new option at runtime
+    #
+    # @param name [Symbol] Identifier for the option
+    # @param value Option value to be set
+    #
+    def []=(name, value)
+      @settings[name] = value
+    end
+
+    # Remove an option at runtime
+    #
+    # @param name [Symbol] Identifier for the option
+    # @param value Option value to be set
+    #
+    def delete(name)
+      @settings.delete name
+    end
 
-      # Update the engine options with the required option changes
-      #
-      # @param opts [Hash] Option extension hash
-      #
-      def update_settings(opts)
-        @@options = Defaults
+    # Update the engine settings with the required option changes
+    #
+    # @param opts [Hash] Option extension hash
+    #
+    def update_settings(opts)
+      @settings = DEFAULTS
 
-        opts.each do |key, value|
-          @@options[key] = value
-        end
+      opts.each do |key, value|
+        @settings[key] = value
       end
     end
   end