rhales 0.3.0 → 0.5.3

data/lib/rhales/{template_engine.rb → core/template_engine.rb}

@@ -1,9 +1,12 @@
 # lib/rhales/template_engine.rb
+#
+# frozen_string_literal: true
 
 require 'erb'
-require_relative 'parsers/rue_format_parser'
-require_relative 'parsers/handlebars_parser'
+require_relative '../parsers/rue_format_parser'
+require_relative '../parsers/handlebars_parser'
 require_relative 'rue_document'
+require_relative '../hydration/hydrator'
 
 module Rhales
   # Rhales - Ruby Handlebars-style template engine
@@ -27,6 +30,8 @@ module Rhales
   # - {{#each items}} ... {{/each}} - Iteration with context
   # - {{> partial_name}} - Partial inclusion
   class TemplateEngine
+    include Rhales::Utils::LoggingHelpers
+
     class RenderError < ::Rhales::RenderError; end
     class PartialNotFoundError < RenderError; end
     class UndefinedVariableError < RenderError; end
@@ -42,31 +47,46 @@ module Rhales
     end
 
     def render
-      # Check if this is a simple template or a full .rue file
-      if simple_template?
-        # Use HandlebarsParser for simple templates
-        parser = HandlebarsParser.new(@template_content)
-        parser.parse!
-        render_content_nodes(parser.ast.children)
-      else
-        # Use RueDocument for .rue files
-        @parser = RueDocument.new(@template_content)
-        @parser.parse!
+      template_type = simple_template? ? :handlebars : :rue
+
+      log_timed_operation(Rhales.logger, :debug, 'Template compiled',
+        template_type: template_type, cached: false
+      ) do
+        # Check if this is a simple template or a full .rue file
+        if simple_template?
+          # Use HandlebarsParser for simple templates
+          parser = HandlebarsParser.new(@template_content)
+          parser.parse!
+          render_content_nodes(parser.ast.children)
+        else
+          # Use RueDocument for .rue files
+          @parser = RueDocument.new(@template_content)
+          @parser.parse!
 
-        # Get template section via RueDocument
-        template_content = @parser.section('template')
-        raise RenderError, 'Missing template section' unless template_content
+          # Get template section via RueDocument
+          template_content = @parser.section('template')
+          raise RenderError, 'Missing template section' unless template_content
 
-        # Render the template section as a simple template
-        render_template_string(template_content)
+          # Render the template section as a simple template
+          render_template_string(template_content)
+        end
       end
     rescue ::Rhales::ParseError => ex
       # Parse errors already have good error messages with location
+      log_with_metadata(Rhales.logger, :error, 'Template parse error',
+        error: ex.message, line: ex.line, column: ex.column, section: ex.source_type
+      )
       raise RenderError, "Template parsing failed: #{ex.message}"
     rescue ::Rhales::ValidationError => ex
       # Validation errors from RueDocument
+      log_with_metadata(Rhales.logger, :error, 'Template validation error',
+        error: ex.message, template_type: :rue
+      )
       raise RenderError, "Template validation failed: #{ex.message}"
     rescue StandardError => ex
+      log_with_metadata(Rhales.logger, :error, 'Template render error',
+        error: ex.message, error_class: ex.class.name
+      )
       raise RenderError, "Template rendering failed: #{ex.message}"
     end
 
@@ -80,11 +100,6 @@ module Rhales
       @parser&.schema_path
     end
 
-    # Access all data attributes from parsed .rue file
-    def data_attributes
-      @parser&.data_attributes || {}
-    end
-
     # Get template variables used in the template
     def template_variables
       @parser&.template_variables || []
@@ -98,7 +113,7 @@ module Rhales
     private
 
     def simple_template?
-      !@template_content.match?(/^<(data|template|logic)\b/)
+      !@template_content.match?(/^<(schema|template|logic)\b/)
     end
 
     def render_template_string(template_string)
@@ -130,7 +145,7 @@ module Rhales
         when :each_block
           result += render_each_block(node)
         when :handlebars_expression
-          # Handle old format for data sections
+          # Handle handlebars expressions
           result += render_handlebars_expression(node)
         end
       end
@@ -143,7 +158,13 @@ module Rhales
       raw  = node.value[:raw]
 
       value = get_variable_value(name)
-      raw ? value.to_s : escape_html(value.to_s)
+
+      if raw
+        warn_if_unescaped(name, value, 'variable_expression')
+        value.to_s
+      else
+        escape_html(value.to_s)
+      end
     end
 
     def render_partial_expression(node)
@@ -204,7 +225,12 @@ module Rhales
         ''
       else # Variables
         value = get_variable_value(content)
-        raw ? value.to_s : escape_html(value.to_s)
+        if raw
+          warn_if_unescaped(content, value, 'handlebars_expression')
+          value.to_s
+        else
+          escape_html(value.to_s)
+        end
       end
     end
 
@@ -214,9 +240,24 @@ module Rhales
       partial_content = @partial_resolver.call(partial_name)
       raise PartialNotFoundError, "Partial '#{partial_name}' not found" unless partial_content
 
-      # Recursively render the partial content
-      engine = self.class.new(partial_content, @context, partial_resolver: @partial_resolver)
-      engine.render
+      # Check if this is a .rue document with sections
+      if partial_content.match?(/^<(schema|template|logic)\b/)
+        # Parse as RueDocument to handle schema sections properly
+        partial_doc = RueDocument.new(partial_content)
+        partial_doc.parse!
+
+        # Extract template section
+        template_content = partial_doc.section('template')
+        raise PartialNotFoundError, "Partial '#{partial_name}' missing template section" unless template_content
+
+        # Render template with current context
+        engine = self.class.new(template_content, @context, partial_resolver: @partial_resolver)
+        engine.render
+      else
+        # Simple template without sections - render as before
+        engine = self.class.new(partial_content, @context, partial_resolver: @partial_resolver)
+        engine.render
+      end
     end
 
     # Get variable value from context
@@ -234,11 +275,19 @@ module Rhales
         @context.get(variable_name)
       elsif @context.respond_to?(:[])
         @context[variable_name] || @context[variable_name.to_sym]
-      else
-        nil
       end
     end
 
+    # Log warning for unescaped variable usage unless whitelisted
+    def warn_if_unescaped(variable_name, value, template_context)
+      return if Rhales.config.allowed_unescaped_variables.include?(variable_name.to_s)
+
+      log_with_metadata(
+        Rhales.logger, :warn, 'Unescaped variable usage',
+        variable: variable_name, value_type: value.class.name, template_context: template_context
+      )
+    end
+
     # Evaluate condition for if/unless blocks
     def evaluate_condition(condition)
       value = get_variable_value(condition)
@@ -343,8 +392,6 @@ module Rhales
             # Load and parse the partial .rue file
             document = RueDocument.parse_file(partial_path)
             document.section('template')
-          else
-            nil
           end
         end
       end