riven 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1fec2b7cfe9006f62d2698662b853c3316b0dad
-  data.tar.gz: de862e64da2cd58c5b3c5d6e6c84bff7a633cf06
+  metadata.gz: 041073e77332410b3beec7c6f5e2510020034e95
+  data.tar.gz: 6e39be4418714492d5ca7f2c99c0dd0bd3f11b72
 SHA512:
-  metadata.gz: ac12bff4693139e89663306b4fce14eb6c3446c560abe2c7bd8503faed9bb5a9e3126729155ad7cc99334b0d744365126bf9f4a53ed963ca2c7ee74ebcdec2da
-  data.tar.gz: 7bae00360b4eb869b090e495b9583917ae74ea06c72c771aaa030cbe1f66a37f9b16c46850f5946dc3cf873a0a02c594b8815c68c18465a88e3b56d3e8c2b682
+  metadata.gz: 9d112db24fac421b1d166f181c7660368931eacfe7e5158c2c61997585c26eff6764626af9e0080ffc6c178e39634e18671b19abd14cf017d26677a3cb6a207a
+  data.tar.gz: 594129231909ba0208df4cf014534660faf61dff2751d5b6eb6b4a480f87f2eb662b56226e3659e7eb741901c9cb1688055062251aee9ebd9aa66afa0a3ee257

data/lib/riven/html_generator.rb

@@ -34,6 +34,7 @@ module Riven
     public def markup_to_html(markup)
       code = Riven::Markup::Code.new
 
+      markup = MarkupFile.remove_escape_sequences(markup)
       markup = code.extract(markup)
 
       opts = {
@@ -62,4 +63,4 @@ module Riven
       @html_file.delete!
     end
   end
-end
+end

data/lib/riven/markup_file.rb

@@ -41,9 +41,18 @@ module Riven
       loop do
         non_found = true
 
-        @markup.gsub!(/<<\[\s*([^\]\s]+)\s*\]/) do |inc|
-          non_found = false
-          MarkupFile.new(@dirname.to_s + '/' + $1).markup
+        @markup.gsub!(/(.)?<<\[\s*([^\]\s]+)\s*\]/) do |inc|
+          if $1 == '_'
+            # special secret escape sign, will be removed afterwards.
+            # Required to avoid recursive substitution
+            inc.gsub!('_', '¦')
+            inc
+          elsif $1 == '¦'
+            inc
+          else
+            non_found = false
+            ($1 ? $1 : '') + MarkupFile.new(@dirname.to_s + '/' + $2).markup
+          end
         end
 
         break if non_found
@@ -96,6 +105,15 @@ module Riven
       private def exclude?(except, file)
         except.select { |f| f != '' && f.path === file.path }.any?
       end
+
+
+      #
+      # Removes the internal escape sequence
+      #
+
+      public def remove_escape_sequences(markup)
+        markup.gsub('¦', '')
+      end
     end
   end
 end

data/lib/riven/version.rb

@@ -1,3 +1,3 @@
 module Riven
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riven
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Benjamin Kammerl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler