opulent 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a41bc661663219aac5c2cbdbc6def8eedbe6abeb
-  data.tar.gz: 68d65112e22329817b60acdf1aa6aad48ad68653
+  metadata.gz: e02913ca7a92447940158c0b4ff5dee49a28c32c
+  data.tar.gz: 97be181ec7177499387884db7dee3acaa644f7c4
 SHA512:
-  metadata.gz: fd1a7efd68cd841e5085ffc2b14f5158f8e8a4a4b0ca07ace88f400857797fc0cd7ba695822b33ad1638c884cf93c8816a70f2dd15021356c88e2d83db2f9446
-  data.tar.gz: 07249aab1bf67424862905d9f643b4dd1f80a95c4d59423bb61b9c09ee925d87ca91da6f5f54f80cf0edfc7c054254cbc35b1ede2fc888f2c321e003de1546d5
+  metadata.gz: c2fea0f9dc244784ccd505f290c53c6c1b22518c280f010be00d589ebcb496422f50f680e4085f708622929bbd0fd297e1612bc5ff6726cce9ba60c12d7bf071
+  data.tar.gz: 2112d92298f2752e573d15633594f1425ae9bf718658b1d66759d9602a0e05d37d18a04830c13abf6a491ca348a4d9eff56a95609cac6da474fc65978bedc6af

data/lib/opulent/compiler.rb

@@ -5,7 +5,6 @@ require_relative 'compiler/define.rb'
 require_relative 'compiler/eval.rb'
 require_relative 'compiler/filter.rb'
 require_relative 'compiler/node.rb'
-require_relative 'compiler/require.rb'
 require_relative 'compiler/root.rb'
 require_relative 'compiler/text.rb'
 
@@ -22,7 +21,7 @@ module Opulent
     #
     # @param path [String] Current file path needed for require nodes
     #
-    def initialize(settings = {})
+    def initialize
       # Setup convention accessors
       @type = 0
       @value = 1
@@ -30,12 +29,6 @@ module Opulent
       @children = 3
       @indent = 4
 
-      # Set current compiled file
-      @path = File.dirname settings.delete :path
-
-      # Extract definitions for require directives
-      @definitions = settings.delete :definitions
-
       # Create the HTML Entities encoder/decoder
       @entities = HTMLEntities.new
 
@@ -99,7 +92,7 @@ module Opulent
     # @param text [String] Input text to be indented
     # @param indent [String] Indentation string to be appended
     #
-    def indent_lines text, indent
+    def indent_lines(text, indent)
       text ||= ""
       text.lines.inject("") do |result, line|
         result += indent + line
@@ -130,8 +123,6 @@ module Opulent
         "The \"#{data[0]}\" filter could not be recognized by Opulent."
       when :filter_load
         "The gem required for the \"#{data[0]}\" filter is not installed. You can install it by running:\n\n#{data[1]}"
-      when :require
-        "The required file #{data[0]} does not exist or an incorrect path has been specified."
       end
 
       # Reconstruct lines to display where errors occur

data/lib/opulent/context.rb

@@ -15,10 +15,10 @@ module Opulent
     # @param locals [Hash] Binding extension
     # @param bind [Binding] Call environment binding
     #
-    def initialize(locals = {}, override = false, &block)
-      @block = block || Proc.new
+    def initialize(locals = {}, &block)
+      @block = block
       @binding = if @block
-        override ? @block.binding : @block.binding.clone
+        @block.binding.clone
       else
         Binding.new
       end

data/lib/opulent/engine.rb

@@ -8,7 +8,7 @@ module Opulent
 
   # @Engine
   class Engine
-    attr_reader :nodes, :preamble, :buffer
+    attr_reader :nodes, :definitions, :parser, :file, :preamble, :buffer
 
     # Update render settings
     #
@@ -17,7 +17,7 @@ module Opulent
     # @param overwrite [Boolean] Write changes directly to the parent binding
     #
     def initialize(settings = {})
-      @definitions = settings.delete(:definitions) || {}
+      @definitions = settings[:definitions] || {}
       @overwrite = settings.delete :overwrite
 
       Settings.update_settings settings unless settings.empty?
@@ -48,17 +48,17 @@ module Opulent
       @code = read input
 
       # Get the nodes tree
-      @nodes, @definitions = Parser.new(@definitions).parse @code
+      @nodes = Parser.new(@file).parse @code
 
       # @TODO
       # Implement precompiled template handling
       @preamble = @nodes.inspect.inspect
 
       # Create a new context based on our rendering environment
-      @context = Context.new locals, @overwrite, &block
+      @context = Context.new locals, &block
 
       # Compile our syntax tree using input context
-      @output = Compiler.new({path: @file, definitions: @definitions}).compile @nodes, @context
+      @output = Compiler.new.compile @nodes, @context
 
       # puts "Nodes\n---\n"
       # pp @nodes

data/lib/opulent/parser.rb

@@ -21,7 +21,7 @@ module Opulent
     #
     # [:node_type, :value, :attributes, :children, :indent]
     #
-    def initialize(definitions = {})
+    def initialize(file)
       # Convention accessors
       @type = 0
       @value = 1
@@ -29,8 +29,12 @@ module Opulent
       @children = 3
       @indent = 4
 
-      # Node definitions encountered up to the current point
-      @definitions = definitions
+      # Set current compiled file
+      @file = file
+      @dir = File.dirname @file
+
+      # Initialize definitions for the parser
+      @definitions = {}
     end
 
     # Initialize the parsing process by splitting the code into lines and
@@ -52,7 +56,7 @@ module Opulent
 
       # Get all nodes starting from the root element and return output
       # nodes and definitions
-      [root(@root), @definitions]
+      root @root
     end
 
     # Check and accept or reject a given token as long as we have tokens
@@ -137,6 +141,18 @@ module Opulent
       end
     end
 
+    # Indent all lines of the input text using give indentation
+    #
+    # @param text [String] Input text to be indented
+    # @param indent [String] Indentation string to be appended
+    #
+    def indent_lines(text, indent)
+      text ||= ""
+      text.lines.inject("") do |result, line|
+        result += indent + line
+      end
+    end
+
     # Give an explicit error report where an unexpected sequence of tokens
     # appears and give indications on how to solve it
     #
@@ -148,7 +164,7 @@ module Opulent
         "An unknown node type has been encountered at:\n\n#{Logger.red @line}"
       when :expected
         data[0] = "#{Tokens.bracket data[0]}" if [:'(', :'{', :'[', :'<'].include? data[0]
-        "Expected to find a :#{data[0]} token at: \n\n#{@line[0..@offset-1]}#{Logger.red @line[@offset..-1].rstrip}"
+        "Expected to find a :#{data[0]} token on line #{@i+1} of input at: \n\n#{@line[0..@offset-1]}#{Logger.red @line[@offset..-1].rstrip}"
       when :root
         "Unknown node type encountered on line #{@i+1} of input at:\n\n" +
         "#{@line[0..@offset-1]}#{Logger.red @line[@offset..-1].rstrip}"
@@ -186,6 +202,13 @@ module Opulent
       when :self_enclosing_children
         "Unexpected child elements found for self enclosing node on line #{data[0]+1} of input at:\n\n" +
         "#{@code[data[0]]}#{Logger.red @code[data[0] + 1]}"
+      when :require
+        "The required file #{data[0]} does not exist or an incorrect path has been specified."
+      when :require_dir
+        "The required file path #{data[0]} is a directory."
+      when :require_end
+        "Unexpected content found after require on line #{@i+1} of input at:\n\n" +
+        "#{@line[0..@offset-1]}#{Logger.red @line[@offset..-1].rstrip}"
       else
         "#{@line[0..@offset-1]}#{Logger.red @line[@offset..-1].rstrip}"
       end

data/lib/opulent/parser/require.rb

@@ -15,14 +15,40 @@ module Opulent
     #
     def require_file(parent, indent)
       if(match = accept :require)
+
         # Process data
-        name = accept(:exp_string, :*)
+        name = accept :exp_string, :*
+
+        # Check if there is any string after the require input
+        unless (feed = accept(:line_feed) || "").strip.empty?
+          undo feed; error :require_end
+        end
+
+        # Get the complete file path based on the current file being compiled
+        require_path = File.expand_path name[1..-2], @dir
+
+        # Throw an error if the file doesn't exist
+        error :require, name unless Dir[require_path].any?
+
+        # Require entire directory tree
+        Dir[require_path].each do |file|
+          # Skip current file when including from same directory
+          next if file == @file
+
+          # Throw an error if the file doesn't exist
+          error :require_dir, file if File.directory? file
+
+          # Throw an error if the file doesn't exist
+          error :require, file unless File.file? file
+
+          # Indent all lines and prepare them for the parser
+          lines = indent_lines File.read(file), " " * indent
 
-        # Create node
-        require_node = [:require, name, {}, [], indent]
+          # Indent all the output lines with the current indentation
+          @code.insert @i+1, *lines.lines
+        end
 
-        # Add to parent
-        parent[@children] << require_node
+        return true
       end
     end
   end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Alex Grozav
@@ -147,7 +147,6 @@ files:
 - lib/opulent/compiler/eval.rb
 - lib/opulent/compiler/filter.rb
 - lib/opulent/compiler/node.rb
-- lib/opulent/compiler/require.rb
 - lib/opulent/compiler/root.rb
 - lib/opulent/compiler/text.rb
 - lib/opulent/context.rb

data/lib/opulent/compiler/require.rb

@@ -1,24 +0,0 @@
-# @Opulent
-module Opulent
-  # @Compiler
-  class Compiler
-    # Compile a new Opulent file using the current page context data
-    #
-    # @param node [Array] Node code generation data
-    # @param indent [Fixnum] Size of the indentation to be added
-    # @param context [Context] Processing environment data
-    #
-    def require_node(node, indent, context)
-      require_file = File.expand_path context.evaluate(node[@value]), @path
-      error :require, node[@value] unless File.file? require_file
-
-      data = {
-        definitions: @definitions,
-        overwrite: true
-      }
-      rendered = Engine.new(data).render_file require_file, &context.block
-
-      @code += indent_lines rendered, " " * indent
-    end
-  end
-end