opulent 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a157e5d1656574b3e10e7be95442def3d8492944
-  data.tar.gz: c82f2a8c9cf6bb67776f8f424ceb56346334553c
+  metadata.gz: 6e616139da8f4b17f4fc7f52bb66b3e18d4d42be
+  data.tar.gz: eb8dfdcaae0b2fb04c83430a742c7ae31ad34364
 SHA512:
-  metadata.gz: 805f557356a0d1a07496247844a45eb6aa1df4429d763e83b545b5f79c8ff1a9c838fbe9ce64e4ed1c10ae84a95cd8675b8b4d047bb3db88e684c39c89a8cb39
-  data.tar.gz: 2fd74584d3f2d8839d5b07e18f0c239ac7fcbddfe9df59e01acd7952fc3f94ec30813a2c9cdeee6d73c66d18c76d1427d94e146546d1ec680bdc80c3f4a1e00d
+  metadata.gz: aca80c297f91ccc02b465534f6da7c755749092a10c14ca9b733e64df2f1aa90c551aeaa0383fa49ffd15ea3ecf81e6035df4b48e4bc6163e80aa41a4e0af048
+  data.tar.gz: 7363ff73b1572727aa7aecaa42b86b04c6e101b82e399b763d25a3538a9c2aee1e1974254b34be5073cc08d1aa8e0dc0269746de8215af2d5a41670fb20751ea

data/lib/opulent.rb

@@ -6,15 +6,26 @@ require_relative 'opulent/preprocessor'
 require_relative 'opulent/tokens'
 require_relative 'opulent/nodes'
 require_relative 'opulent/parser'
+require_relative 'opulent/runtime'
 
 module Opulent
   class << self
-    def compile(code = "")
+    # Analyze the input code and check for matching tokens. In case no match was
+    # found, throw an exception. In special cases, modify the token hash.
+    #
+    # @param file [String] The file that needs to be analyzed
+    # @param context [Hash | String] Processing environment data
+    #
+    def render(file, context = nil)
+      # Get the code from the input file
+      @code = PreProcessor.process(file)
+
+      # Accept both ruby hashes and JSON files as database environments
+      @context = Runtime.apply context
+
       # Instantiate required language components
       @syntax = Parser.parse code
 
-      pp @syntax
-
       pretty = Proc.new do |elements, indent|
         if elements.is_a? Nodes::Text
           puts " " * indent + "text: " + elements.value
@@ -28,7 +39,7 @@ module Opulent
             end
             puts text
 
-            if element.is_a?(Nodes::Text) || element.children.empty?
+            if element.is_a?(Nodes::Text) || element.is_a?(Nodes::Print) || element.is_a?(Nodes::Comment) || element.children.empty?
             elsif [Nodes::CnditionalControl, Nodes::CaseControl].any? do |node| element.is_a? node end
               element.children.each do |c| pretty[c, indent+2] end
             else
@@ -48,30 +59,6 @@ module Opulent
       end
       puts "\n\nNodes\n---"
       pretty[@syntax.children, 0]
-
-
-      #pp @syntax
-    end
-
-    # Analyze the input code and check for matching tokens. In case no match was
-    # found, throw an exception. In special cases, modify the token hash.
-    #
-    # @param file [String] The file that needs to be analyzed
-    # @param context [Hash | String] Processing environment data
-    #
-    def render(file, context = {})
-      @file = file
-
-      # Accept both ruby hashes and JSON files as database environments
-      case context
-      when Hash
-        @context = context
-      when String
-        @context = JSON.parse(File.read context)
-      end
-
-      # Run all the processors
-      compile PreProcessor.process @file
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alex Grozav