opulent 1.4.0 → 1.4.1

data/lib/opulent/parser/text.rb

@@ -28,7 +28,7 @@ module Opulent
       value = value[1..-1] if value[0] == '\\'
 
       # Create the text node using input data
-      text_node = [:plain, type, {value: value.strip, escaped: escaped, evaluate: false}, nil, indent]
+      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.
@@ -42,10 +42,6 @@ module Opulent
         return nil
       end
 
-      if text_node[@options][:value] =~ Settings::InterpolationCheck
-        text_node[@options][:evaluate] = true
-      end
-
       # Increase indentation if this is an inline text node
       text_node[@indent] += Settings[:indent] unless multiline_or_print
 
@@ -58,7 +54,7 @@ module Opulent
     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
@@ -107,7 +103,7 @@ module Opulent
         # 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_stripped(:newline) || ""
+        buffer += accept(:newline) || ""
 
         # Get blank lines until we match something
         blank_lines[]

data/lib/opulent/parser/yield.rb

@@ -0,0 +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

data/lib/opulent/settings.rb

@@ -2,11 +2,11 @@
 module Opulent
   # @Settings
   module Settings
-    # Default Opulent allowed file extensions
-    Extensions = %w(.op .opl .opulent)
+    # Set buffer variable name
+    Buffer = :@_opulent_buffer
 
-    # Default yield target which is used for child block replacements
-    DefaultYield = :children
+    # Default Opulent file extension
+    FileExtension = '.op'
 
     # Default yield target which is used for child block replacements
     DefaultEachKey = :key
@@ -45,6 +45,7 @@ module Opulent
         #dependency_manager: true, # Soon to be implemented
         indent: 2,
         layouts: false,
+        pretty: false, # Under work
         default_layout: :'views/layouts/application'
       }
 

data/lib/opulent/template.rb

@@ -2,6 +2,10 @@
 module Opulent
   # @OpulentTemplate
   class OpulentTemplate < ::Tilt::Template
+    # Allow accessing engine definitions
+    attr_reader :def
+
+    # Set default mime type
     self.default_mime_type = 'text/html'
 
     # Do whatever preparation is necessary to setup the underlying template
@@ -11,17 +15,11 @@ module Opulent
     # Subclasses must provide an implementation of this method.
     #
     def prepare
-      # Set the file which is being evaluated
-      @options[:file] = eval_file
-
-      # Enable caching for the current rendered file
-      @options[:cache] = true
-
-      # Enable layouts so that we can render with symbols
-      #@options[:layouts] = true
-
       # Set up the rendering engine
-      @engine = ::Opulent.new @options
+      @engine = ::Opulent.new eval_file.to_sym, @options
+
+      # Set reusable template definitions
+      @def = @engine.def
     end
 
     # Execute the compiled template and return the result string. Template
@@ -32,17 +30,8 @@ module Opulent
     # override render() may not support all features.
     #
     def evaluate(scope, locals, &block)
-      # if @engine.respond_to?(:precompiled_method_return_value, true)
-      #   super
-      # else
-      #   @engine.render(data, locals, &block)
-      # end
-      if @engine.preamble
-        super
-      else
-        locals[:scope] = scope
-        @engine.render(data, locals, &block)
-      end
+      raise ArgumentError, 'Invalid scope: must not be frozen.' if scope.frozen?
+      super
     end
 
     # A string containing the (Ruby) source code for the template. The
@@ -52,15 +41,8 @@ module Opulent
     # support, custom scopes, proper encoding, and support for template
     # compilation.
     #
-    def precompiled_template(locals)
-      # This here should be evaluated in order to return the precompiled code
-      # as text to the user.
-      # For example:
-      # _buff = [] # This should be in preamble
-      # _buff << "<html>",
-      # _buff << compile('a * b')
-      # _buff << "</html>"
-      @engine.preamble
+    def precompiled_template(locals = {})
+      @engine.template
     end
   end
 

data/lib/opulent/tokens.rb

@@ -1,6 +1,6 @@
 module Opulent
   # Opulent Keywords
-  Keywords = %i(def block yield require 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
@@ -30,10 +30,10 @@ module Opulent
       def: /\Adef +/,
 
       # Definition
-      doctype: /\Adoctype +/,
+      doctype: /\Adoctype */,
 
-      # Require file
-      require: /\Arequire +/,
+      # Include file
+      include: /\Ainclude +/,
 
       # Node Attributes
       attributes_bracket: /\A\(\[\{/,
@@ -69,14 +69,10 @@ module Opulent
 
       # Yield
       yield: /\A(yield)/,
-      yield_identifier: /\A[a-zA-Z]([\_]?[a-zA-Z0-9]+)*/,
-
-      # Yield
-      block: /\A(block)/,
 
       # Conditional Structures
       control: /\A(if|elsif|else|unless|case|when|each|while|until)/,
-      each_pattern: /\A(\w+( *, *\w+)?)? +in +.+/,
+      each_pattern: /\A(.+) +do *\|(.+)\|/,
 
       # Text
       text: /\A\|/,

data/lib/opulent/utils.rb

@@ -0,0 +1,41 @@
+# @Opulent
+module Opulent
+  module Utils
+    # Used by escape_html
+    #
+    EscapeHTML = {
+      '&'  => '&',
+      '"'  => '"',
+      '\'' => ''',
+      '<'  => '&lt;',
+      '>'  => '&gt;'
+    }.freeze
+
+    # Pattern matching for html escape characters
+    EscapeHTMLPattern = Regexp.union(*EscapeHTML.keys)
+
+    # Ruby interpolation pattern
+    InterpolationPattern = /\#\{([^}]+)\}/
+
+    # @Utils
+    class << self
+      if defined?(EscapeUtils)
+        # Returns an escaped copy of `html`.
+        #
+        # @param html [String] The string to escape
+        # @return [String] The escaped string
+        def escape(html)
+          EscapeUtils.escape_html html.to_s, false
+        end
+      else
+        # Returns an escaped copy of `html`.
+        #
+        # @param html [String] The string to escape
+        # @return [String] The escaped string
+        def escape(html)
+          html.to_s.gsub EscapeHTMLPattern, EscapeHTML
+        end
+      end
+    end
+  end
+end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,12 +140,14 @@ files:
 - docs/control-structures.md
 - docs/doctype.md
 - docs/expressions.md
+- docs/filters.md
+- docs/includes.md
 - docs/nodes.md
 - docs/reference.md
 - docs/usage.md
 - lib/opulent.rb
 - lib/opulent/compiler.rb
-- lib/opulent/compiler/block.rb
+- lib/opulent/compiler/buffer.rb
 - lib/opulent/compiler/comment.rb
 - lib/opulent/compiler/control.rb
 - lib/opulent/compiler/define.rb
@@ -155,13 +157,13 @@ files:
 - lib/opulent/compiler/node.rb
 - lib/opulent/compiler/root.rb
 - lib/opulent/compiler/text.rb
+- lib/opulent/compiler/yield.rb
 - lib/opulent/context.rb
 - lib/opulent/engine.rb
 - lib/opulent/exec.rb
 - lib/opulent/filters.rb
 - lib/opulent/logger.rb
 - lib/opulent/parser.rb
-- lib/opulent/parser/block.rb
 - lib/opulent/parser/comment.rb
 - lib/opulent/parser/control.rb
 - lib/opulent/parser/define.rb
@@ -169,13 +171,15 @@ files:
 - lib/opulent/parser/eval.rb
 - lib/opulent/parser/expression.rb
 - lib/opulent/parser/filter.rb
+- lib/opulent/parser/include.rb
 - lib/opulent/parser/node.rb
-- lib/opulent/parser/require.rb
 - lib/opulent/parser/root.rb
 - lib/opulent/parser/text.rb
+- lib/opulent/parser/yield.rb
 - lib/opulent/settings.rb
 - lib/opulent/template.rb
 - lib/opulent/tokens.rb
+- lib/opulent/utils.rb
 - lib/opulent/version.rb
 - opulent.gemspec
 homepage: http://opulent.io

data/lib/opulent/compiler/block.rb

@@ -1,31 +0,0 @@
-# @Opulent
-module Opulent
-  # @Compiler
-  class Compiler
-    # 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 yield_node(node, indent, context)
-      if @block_stack[-1].has_key? node[@value]
-        @block_stack[-1][node[@value]].each do |child|
-          root child, indent, context.parent
-        end
-      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 block_node(node, indent, context)
-      node[@children].each do |child|
-        root child, indent, context
-      end
-    end
-  end
-end

data/lib/opulent/parser/block.rb

@@ -1,56 +0,0 @@
-# @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
-        # Get definition name
-        if(yield_name = accept_stripped(:yield_identifier))
-          yield_name = yield_name.strip.to_sym
-        else
-          yield_name = Settings::DefaultYield
-        end
-
-        # Consume the newline from the end of the element
-        error :yield unless accept(:line_feed).strip.empty?
-
-        # Create a new node
-        yield_node = [:yield, yield_name, {}, [], indent]
-
-        parent[@children] << yield_node
-      end
-    end
-
-    # Match a block with a explicit target
-    #
-    # block target
-    #
-    # @param parent [Node] Parent node to which we append the definition
-    #
-    def block(parent, indent)
-      if accept :block
-        # Get definition name
-        if(block_name = accept_stripped(:yield_identifier))
-          block_name = block_name.strip.to_sym
-        else
-          block_name = Settings::DefaultYield
-        end
-
-        # Consume the newline from the end of the element
-        error :block unless accept(:line_feed).strip.empty?
-
-        # Create a new node
-        block_node = [:block, block_name, {}, [], indent]
-        root block_node, indent
-
-        parent[@children] << block_node
-      end
-    end
-  end
-end