opulent 1.1.7 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e6711a377fd5f4bdb35c0d1acb44a542e2ad86
-  data.tar.gz: 2df71d3a64fb210a6b0853285fff5d82e4a7363c
+  metadata.gz: ddc258c62764fc5d4682a818b54020aa9b0cedb3
+  data.tar.gz: a6b329acbba5dff20e8d5a66ec7894077bd2d8ff
 SHA512:
-  metadata.gz: 20aa32c2d2edf206eef8eafaff65255fe0039ad10cfdaa92af9be2fdd890d1d91c99dd38b46780c28e8ba86cb76bd0c0207b6a06388fb1ee925dc5149eedd2d7
-  data.tar.gz: a4a00b6cb4be54cb77a56aba84978e8a3e196b299c8bab178c721770ec508297476f97d98742942aa4a1965c870826ab7db44dc5add25549f4e031d7ef7d5890
+  metadata.gz: 9ad7aa47c0dc555fb42de99c7da3a361464c99ac4bbc2b2582a6b4396cf67852c6bb974e922f1b3a63dea6460028445f554b043634ad6de4e9c3f6a27c94ced9
+  data.tar.gz: f0cf7b68a4d0846aa75447e5d50d6da271152dcf65e3bfc956b307658cc177461a592cebdd2d0c142cecb12de2fef1a59b98bd2726010be3b3b80ac2f36195cf

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/opulent/parser.rb

@@ -30,9 +30,10 @@ module Opulent
       @children = 3
       @indent = 4
 
-      # Set current compiled file
-      @file = file
-      @dir = File.dirname @file
+      # Set current compiled file as the first in the file stack together with
+      # its base indentation. The stack is used to allow require directives to
+      # be used with the last parent path found 
+      @file = [[file, -1]]
 
       # Initialize definitions for the parser
       @definitions = definitions

data/lib/opulent/parser/node.rb

@@ -48,7 +48,7 @@ module Opulent
         current_node = [:node, node_name, options, [], indent]
 
         # Check if the node is explicitly self enclosing
-        if(close = accept_stripped :self_enclosing) || Settings::SelfEnclosing.include?(node_name)
+        if(close = accept_stripped :self_enclosing) || (!@definitions.keys.include?(node_name) && Settings::SelfEnclosing.include?(node_name))
           current_node[@options][:self_enclosing] = true
 
           unless close.nil? || close.strip.empty?

data/lib/opulent/parser/require.rb

@@ -25,7 +25,7 @@ module Opulent
         end
 
         # Get the complete file path based on the current file being compiled
-        require_path = File.expand_path name[1..-2], @dir
+        require_path = File.expand_path name[1..-2], File.dirname(@file[-1][0])
 
         # Try to see if it has any existing extension, otherwise add .op
         require_path += '.op' unless Settings::Extensions.include? File.extname require_path
@@ -36,7 +36,9 @@ module Opulent
         # Require entire directory tree
         Dir[require_path].each do |file|
           # Skip current file when including from same directory
-          next if file == @file
+          next if file == @file[-1][0]
+
+          @file << [require_path, indent]
 
           # Throw an error if the file doesn't exist
           error :require_dir, file if File.directory? file

data/lib/opulent/parser/root.rb

@@ -26,6 +26,9 @@ module Opulent
           @i -= 1; break
         end
 
+        # If last require path had a greater indentation, pop the last file path
+        @file.pop if @file[-1][1] > indent
+
         # Try the main Opulent node types and process each one of them using
         # their matching evaluation procedure
         current_node =  node(parent, indent)        ||

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.1.7"
+  VERSION = "1.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.9
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - benchmark/benchmark.rb
 - benchmark/cases/node/node.haml
 - benchmark/cases/node/node.op