opulent 1.5.5 → 1.6.0

data/lib/opulent/tokens.rb

@@ -1,13 +1,15 @@
 # @Opulent
 module Opulent
   # Opulent KEYWORDS
-  KEYWORDS = %i(def yield include if else elsif unless case when each while until doctype)
+  KEYWORDS = %i(
+    def yield include if else elsif unless case when each while until doctype
+  )
 
   # @Tokens
   class Tokens
     # All tokens available within Opulent
     #
-    @@tokens = {
+    @tokens = {
       # Indentation
       indent: /\A\s*/,
 
@@ -20,12 +22,11 @@ module Opulent
       shorthand_lookahead: /\A[\.\#\&][a-zA-Z\_\(\"]/,
 
       # Leading and trailing whitespace
-      leading_whitespace: /\A(\<\-)/,
-      leading_trailing_whitespace: /\A(\>)/,
-      trailing_whitespace: /\A(\-\>)/,
+      leading_whitespace: /\A(\')/,
+      trailing_whitespace: /\A(\")/,
 
       # Self enclosing node
-      self_enclosing: /\A\/(.*)/,
+      self_enclosing: %r{\A\/(.*)},
 
       # Definition
       def: /\Adef +/,
@@ -86,11 +87,11 @@ module Opulent
 
       # Receive matching brackets for allowing multiple bracket types for
       # element attributes
-      :brackets => /\A([\(\[\{])/,
-      :'(' => /\A(\))/,
-      :'[' => /\A(\])/,
-      :'{' => /\A(\})/,
-      :'<' => /\A(\>)/,
+      brackets: /\A([\(\[\{])/,
+      '(': /\A(\))/,
+      '[': /\A(\])/,
+      '{': /\A(\})/,
+      '<': /\A(\>)/,
 
       # Terminators
       comma: /\A(\s*\,\s*)/,
@@ -106,6 +107,7 @@ module Opulent
       exp_operation: /\A( *(\+|\-|\*\*|\*|\/|\<\<|\>\>|\.\.|\%|\<\=\>|\<\=|\^|\<|\>\=|\>|\=\~|\!\~|\=\=\=|\=\=|\!|not|\&\&|\&|and|\|\||\||or) *)/,
       exp_regex: /\A(\/((?:[^\/\\]|\\.)*?)\/)/,
       exp_string: /\A(("((?:[^"\\]|\\.)*?)")|('(?:[^'\\]|\\.)*?'))/,
+      exp_string_match: /\A(("((?:[^"\\]|\\.)*?)")|('(?:[^'\\]|\\.)*?'))\Z/,
       exp_percent: /\A(\%[wWqQrxsiI]?.)/,
       exp_double: /\A([0-9]+\.[0-9]+([eE][-+]?[0-9]+)?)/,
       exp_fixnum: /\A([0-9]+)/,
@@ -115,6 +117,7 @@ module Opulent
       exp_ternary_else: /\A( *\: *)/,
 
       exp_identifier_lookahead: /\A[a-zA-Z\_][a-zA-Z0-9\_]*[\!\?]?/,
+      exp_identifier_stripped_lookahead: /\A *[a-zA-Z\_][a-zA-Z0-9\_]*[\!\?]?/,
 
       # Hash
       hash_terminator: /\A(\s*(\,)\s*)/,
@@ -125,8 +128,7 @@ module Opulent
       whitespace: /\A\s+/,
 
       # Evaluation
-      eval: /\A\-(.*)/,
-      eval_multiline: /\A\+(.*)/,
+      eval: /\A\-/,
 
       # Whitespace
       newline: /\A(\n+)/,
@@ -154,7 +156,7 @@ module Opulent
     # @param name [Symbol] Token requested by the parser accept method
     #
     def self.[](name)
-      @@tokens[name]
+      @tokens[name]
     end
 
     # Set a new token at runtime
@@ -163,7 +165,7 @@ module Opulent
     # @param token [Token] Token data to be set
     #
     def self.[]=(name, token)
-      @@tokens[name] = token
+      @tokens[name] = token
     end
   end
 end

data/lib/opulent/utils.rb

@@ -1,9 +1,10 @@
 # @Opulent
 module Opulent
+  # @Utils
   module Utils
     # Used by escape_html
     #
-    EscapeHTML = {
+    ESCAPE_HTML = {
       '&'  => '&',
       '"'  => '"',
       '\'' => ''',
@@ -12,10 +13,10 @@ module Opulent
     }.freeze
 
     # Pattern matching for html escape characters
-    EscapeHTMLPattern = Regexp.union(*EscapeHTML.keys)
+    ESCAPE_HTML_PATTERN = Regexp.union(*ESCAPE_HTML.keys)
 
     # Ruby interpolation pattern
-    InterpolationPattern = /\#\{([^}]+)\}/
+    INTERPOLATION_PATTERN = /(\#\{[^}]+\})/
 
     # @Utils
     class << self
@@ -33,7 +34,7 @@ module Opulent
         # @param html [String] The string to escape
         # @return [String] The escaped string
         def escape(html)
-          html.to_s.chomp.gsub EscapeHTMLPattern, EscapeHTML
+          html.to_s.chomp.gsub ESCAPE_HTML_PATTERN, ESCAPE_HTML
         end
       end
     end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.5.5'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,50 +90,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".libold/opulent.rb"
-- ".libold/opulent/context.rb"
-- ".libold/opulent/engine.rb"
-- ".libold/opulent/filter.rb"
-- ".libold/opulent/logger.rb"
-- ".libold/opulent/nodes.rb"
-- ".libold/opulent/nodes/block.rb"
-- ".libold/opulent/nodes/comment.rb"
-- ".libold/opulent/nodes/control.rb"
-- ".libold/opulent/nodes/define.rb"
-- ".libold/opulent/nodes/eval.rb"
-- ".libold/opulent/nodes/expression.rb"
-- ".libold/opulent/nodes/filter.rb"
-- ".libold/opulent/nodes/helper.rb"
-- ".libold/opulent/nodes/node.rb"
-- ".libold/opulent/nodes/root.rb"
-- ".libold/opulent/nodes/text.rb"
-- ".libold/opulent/nodes/theme.rb"
-- ".libold/opulent/parser.rb"
-- ".libold/opulent/parser/block.rb"
-- ".libold/opulent/parser/comment.rb"
-- ".libold/opulent/parser/control.rb"
-- ".libold/opulent/parser/define.rb"
-- ".libold/opulent/parser/eval.rb"
-- ".libold/opulent/parser/expression.rb"
-- ".libold/opulent/parser/filter.rb"
-- ".libold/opulent/parser/node.rb"
-- ".libold/opulent/parser/root.rb"
-- ".libold/opulent/parser/text.rb"
-- ".libold/opulent/parser/theme.rb"
-- ".libold/opulent/preprocessor.rb"
-- ".libold/opulent/runtime.rb"
-- ".libold/opulent/template.rb"
-- ".libold/opulent/tokens.rb"
-- ".libold/opulent/version.rb"
-- ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
-- benchmark/benchmark.rb
-- benchmark/cases/node/node.haml
-- benchmark/cases/node/node.op
-- benchmark/cases/node/node.slim
 - bin/opulent
 - docs/attributes.md
 - docs/comments.md

data/.libold/opulent.rb

@@ -1,96 +0,0 @@
-require 'htmlentities'
-require 'tilt'
-require_relative 'opulent/engine'
-require_relative 'opulent/logger'
-require_relative 'opulent/preprocessor'
-require_relative 'opulent/tokens'
-require_relative 'opulent/nodes'
-require_relative 'opulent/parser'
-require_relative 'opulent/context'
-require_relative 'opulent/runtime'
-require_relative 'opulent/template'
-require_relative 'opulent/filter'
-require 'pp'
-
-# @Opulent
-module Opulent
-  # Wrapper method for creating a new Opulent instance
-  #
-  def Opulent.new
-    return Opulent.new
-  end
-
-  # @Opulent
-  class Opulent
-    # Analyze the input code and check for matching tokens. In case no match was
-    # found, throw an exception. In special cases, modify the token hash.
-    #
-    # @param file [String] The file that needs to be analyzed
-    # @param locals [Hash] Render call local variables
-    # @param block [Proc] Processing environment data
-    #
-    def render_file(file, locals = {}, &block)
-      # Temporarily set file render mode for using it in the Preprocessor
-      @mode = :file
-
-      # Render the file
-      render file, locals, &block
-    end
-
-    # Analyze the input code and check for matching tokens. In case no match was
-    # found, throw an exception. In special cases, modify the token hash.
-    #
-    # @param file [String] The file that needs to be analyzed
-    # @param locals [Hash] Render call local variables
-    # @param block [Proc] Processing environment data
-    #
-    def render(code, locals = {}, &block)
-      # Get the code from the input file
-      @code = PreProcessor.process code, @mode, &block
-
-      # Reset rendering mode to code. The mode variable is used to specify
-      # whether we're using render file or render code. When using render code,
-      # the preprocessor can be used only when a block is also passed
-      @mode = :code
-
-      # Instantiate required language components
-      @syntax = Parser.parse @code
-
-      # Create a new context based on our rendering environment
-      #bind = block.binding if block
-      #@context = Context.new locals, bind
-
-      # Instantiate required language components
-      #@model = Runtime.remodel @syntax, @context
-
-      #puts "\n\nModel\n---"
-      #Logger.pretty_print @model
-    end
-
-    # Update the engine options with the required option changes
-    #
-    def update_options(opts)
-      Engine.update_options(opts)
-    end
-
-    private
-
-    # Give an explicit error report where an unexpected sequence of tokens
-    # appears and give indications on how to solve it
-    #
-    # @param context [Symbol] Context name in which the error happens
-    # @param data [Array] Additional error information
-    #
-    def error(context, *data)
-      message = case context
-      when :options_key
-        "The input \"#{data[0]}\" is not a valid option name."
-      end
-
-      # Reconstruct lines to display where errors occur
-      fail "\n\nOpulent " + Logger.red("[Engine Error]") + "\n---\n" +
-      "An error has been encountered when updating the engine options.\n" +
-      "#{message}"
-    end
-  end
-end

data/.libold/opulent/context.rb

@@ -1,80 +0,0 @@
-# @Opulent
-module Opulent
-  # @Context
-  #
-  # The context class is used to differentiate local, instance and class variables
-  # and to define the current working environment. Each class, method and instance
-  # has its own context
-  #
-  class Context
-    attr_accessor :locals, :binding, :parent, :name
-
-    # Create a context from the environment binding, extended with the locals
-    # given as arguments
-    #
-    # @param locals [Hash] Binding extension
-    # @param bind [Binding] Call environment binding
-    #
-    def initialize(locals = {}, bind = nil)
-      @binding = if bind
-        bind.clone
-      else
-        Binding.new
-      end
-
-      extend_locals locals
-    end
-
-    # Evaluate ruby code in current context
-    #
-    # @param code [String] Code to be evaluated
-    #
-    def evaluate(code)
-      begin
-        eval code, @binding
-      rescue NameError => variable
-        Runtime.error :binding, variable, code
-      end
-    end
-
-    # Extend the call context with a Hash, String or other Object
-    #
-    # @param context [Object] Extension object
-    #
-    def extend_locals(locals)
-      # Create new local variables from the input hash
-      locals.each do |key, value|
-        begin
-          @binding.local_variable_set(key.to_sym, value)
-        rescue NameError => variable
-          Runtime.error :variable_name, variable, key
-        end
-      end
-    end
-
-    # Extend instance, class and global variables for use in definitions
-    #
-    # @param bind [Binding] Binding to extend current context binding
-    #
-    def extend_nonlocals(bind)
-      bind.eval('instance_variables').each do |var|
-        @binding.eval('self').instance_variable_set var, bind.eval(var.to_s)
-      end
-
-      bind.eval('self.class.class_variables').each do |var|
-        @binding.eval('self').class_variable_set var, bind.eval(var.to_s)
-      end
-
-      bind.eval('self.class.constants').each do |var|
-        @binding.eval('self').const_set var, bind.eval(var.to_s)
-      end
-    end
-  end
-
-  # @Binding
-  class Binding
-    def self.new
-      binding
-    end
-  end
-end

data/.libold/opulent/engine.rb

@@ -1,88 +0,0 @@
-# @SugarCube
-module Opulent
-  # @Engine
-  module Engine
-    # Default (root) theme name which can be accesed using the root definitions
-    DEFAULT_THEME = :default
-
-    # Default yield target which is used for child block replacements
-    DEFAULT_YIELD = :children
-
-    # List of self enclosing node elements
-    SELF_ENCLOSING = %w(img link input meta br hr area base col command embed keygen param source track wbr)
-
-    # @Singleton
-    class << self
-      attr_accessor :filters, :options
-
-      # Opulent runtime options
-      @@defaults = {
-        pretty: true,
-        indent: 2,
-        dependency_manager: true,
-        shorthand: {
-          class: /\./,
-          id: /\#/,
-          name: /\&/
-        },
-        each: {
-          :default_key => :key,
-          :default_value => :value
-        }
-      }
-
-      # Set defaults as initial options
-      @@options = @@defaults.clone
-
-      # Get an option at runtime
-      #
-      # @param name [Symbol] Identifier for the option
-      #
-      def [](name)
-        @@options[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)
-        @@options[name] = value
-      end
-
-      # Add a new Opulent filter to the filters knowledgebase
-      #
-      # @param class [Class] Class to be used for filter instance
-      # @param name [Symbol] Identifier in the filters hash
-      # @param options [Hash] Filter engine instance options
-      #
-      def register(klass, name, options)
-        @filters ||= {}
-        @filters[name] = klass.new name, options
-      end
-
-      # Check if the chosen filter name is registed within our knowledgebase
-      #
-      def filter?(name)
-        @filters.has_key? name
-      end
-
-      # Update the engine options with the required option changes
-      #
-      # @param opts [Hash] Option extension
-      #
-      def update_options(opts)
-        @@options = @@defaults.clone
-
-        opts.each do |key, value|
-          if @@options[key]
-            @@options[key] = value
-          else
-            error :options_key, key
-          end
-        end
-      end
-    end
-  end
-end