terrascript 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82a83d476331a0d279f31854598ae9ca3f18df09a610973798221564e40c08e
-  data.tar.gz: a0ca074f292a87f79c8a8fb3bea2b0631dfcc1e482934eb82402ed06c1e147d4
+  metadata.gz: 96f4fa5aed583625a0a2c81174e4d5e0c49355b7c99bed2f3c9a0f5b74f879de
+  data.tar.gz: a93586dcc687695c605ab8dfa34cad6830c30fd5a28b37a6f5995291250acfce
 SHA512:
-  metadata.gz: bfff4a2a1b061fb57fe1b33ca14c87c0eb41e148916d728fa959af2a9e51ef62eb583b942b0573c0a542bfcc9de9ebc276af8ecf4f434d541b6dedd987a2e4fa
-  data.tar.gz: 9f4a3cf889816a7ebc08ba45492ad903e4c975237eef44ac8adfedc194839487eb710b3134ddaabe44df54de5656b8e4a4a22430b0cb4629e2cfa9d25d75296f
+  metadata.gz: eac07d66a93a3cc33b14e5153a730e3df37b8f49e14799ddc749ef6cf1514c152809fb07188af6e440080d87bcd503a1edbffd49b01ff2d2d9791c084df9c184
+  data.tar.gz: e3418a950257c17ec385defdd7b985db8d868cba4faff9b0d16e30b6dafb1b809097a21741afa274fb733113e063d46de89553ade7ac099054fc1082bed4fac0

data/lib/terrascript.rb

@@ -1,12 +1,6 @@
-
+require 'stringio'
 
 class Transform
-  def transform
-    s = $stdout
-    $stdout = @out
-    eval("lambda { |#{@argName}|\n#{@body}\n}").call(@arg)
-    $stdout = s
-  end
 
   def initialize(inFd, outFd = $stdout)
     @in = inFd
@@ -15,6 +9,7 @@ class Transform
     @argName = "block"
     @arg = ""
     @body = ""
+    @depth = 0
   end
 
   def process
@@ -23,11 +18,33 @@ class Transform
     end
   end
 
-  def processLine(line)
+  protected def transform
+    s = $stdout
+    $stdout = @out
+
+    # process nested directives
+    if @arg.include? "@inline"
+      stream = StringIO.new(@arg)
+      outStream = StringIO.new
+      Transform.new(stream, outStream).process
+      @arg = outStream.string
+    end
+
+    eval("lambda { |#{@argName}|\n#{@body}\n}").call(@arg)
+
+    $stdout = s
+  end
+
+  protected def keyword?(line, s)
+    line.lstrip.start_with? ("@" << s)
+  end
+
+  protected def processLine(line)
     case @mode
 
     when :read
-      if line.lstrip.start_with?("@inline")
+      case
+      when keyword?(line, "inline")
         args = line.split(' ')
         if !args[1].nil?
           @argName = args[1]
@@ -38,11 +55,22 @@ class Transform
       end
 
     when :arg
-      if line.lstrip.start_with?("@end")
-        transform
-        @arg = ""
-        @body = ""
-        @mode = :read
+      case
+      when keyword?(line, "end")
+        if @depth == 0
+          transform
+          @arg = ""
+          @body = ""
+          @mode = :read
+        else
+          @depth = @depth - 1
+          @arg << line
+        end
+
+      when keyword?(line, "inline")
+        @depth = @depth + 1
+        @arg << line
+
       else
         @arg << line
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrascript
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marcin Chmiel