rhales 0.3.0 → 0.4.0

data/lib/rhales/template_engine.rb

@@ -4,6 +4,7 @@ require 'erb'
 require_relative 'parsers/rue_format_parser'
 require_relative 'parsers/handlebars_parser'
 require_relative 'rue_document'
+require_relative 'hydrator'
 
 module Rhales
   # Rhales - Ruby Handlebars-style template engine
@@ -214,9 +215,35 @@ 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?(/^<(data|template|logic)\b/)
+        # Parse as RueDocument to handle data 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
+
+        # Process data section if present and merge with parent context
+        merged_context = @context
+        if partial_doc.section('data')
+          # Create hydrator with parent context to process interpolations
+          hydrator = Hydrator.new(partial_doc, @context)
+          local_data = hydrator.processed_data_hash
+
+          # Create merged context (local data takes precedence)
+          merged_context = create_merged_context(@context, local_data)
+        end
+
+        # Render template with merged context
+        engine = self.class.new(template_content, merged_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,8 +261,6 @@ module Rhales
         @context.get(variable_name)
       elsif @context.respond_to?(:[])
         @context[variable_name] || @context[variable_name.to_sym]
-      else
-        nil
       end
     end
 
@@ -272,6 +297,23 @@ module Rhales
       ERB::Util.html_escape(string)
     end
 
+    # Create a new context with merged data
+    def create_merged_context(parent_context, local_data)
+      # Extract all props from parent context and merge with local data
+      # Local data takes precedence over parent props
+      merged_props = parent_context.props.merge(local_data)
+
+      # Create new context with merged props, preserving other context attributes
+      Context.for_view(
+        parent_context.req,
+        parent_context.sess,
+        parent_context.cust,
+        parent_context.locale,
+        config: parent_context.config,
+        **merged_props,
+      )
+    end
+
     # Context wrapper for {{#each}} iterations
     class EachContext
       attr_reader :parent_context, :current_item, :current_index, :items_var
@@ -343,8 +385,6 @@ module Rhales
             # Load and parse the partial .rue file
             document = RueDocument.parse_file(partial_path)
             document.section('template')
-          else
-            nil
           end
         end
       end

data/lib/rhales/tilt.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# lib/rhales/tilt.rb
 
 require 'tilt'
 require 'rhales'
@@ -109,7 +109,8 @@ module Rhales
         framework_env = scope.request.env.merge({
           'nonce' => shared_nonce,
           'request_id' => SecureRandom.hex(8),
-        })
+        },
+                                               )
 
         # Create wrapper that preserves original but adds our env
         wrapped_request = Class.new do
@@ -118,8 +119,8 @@ module Rhales
             @custom_env = custom_env
           end
 
-          def method_missing(method, *args, &block)
-            @original.send(method, *args, &block)
+          def method_missing(method, *, &)
+            @original.send(method, *, &)
           end
 
           def respond_to_missing?(method, include_private = false)
@@ -141,7 +142,7 @@ module Rhales
           env: {
             'nonce' => shared_nonce,
             'request_id' => SecureRandom.hex(8),
-          }
+          },
         )
       end
 

data/lib/rhales/version.rb

@@ -2,5 +2,7 @@
 
 module Rhales
   # Version information for the RSFC gem
-  VERSION = '0.3.0'
+  unless defined?(Rhales::VERSION)
+    VERSION = '0.4.0'
+  end
 end

data/lib/rhales/view.rb

@@ -87,8 +87,8 @@ module Rhales
       # Set CSP header if enabled
       set_csp_header_if_enabled
 
-      # Combine template and hydration
-      inject_hydration_into_template(template_html, hydration_html)
+      # Smart hydration injection with mount point detection
+      inject_hydration_with_mount_points(composition, template_name, template_html, hydration_html)
     rescue StandardError => ex
       raise RenderError, "Failed to render template '#{template_name}': #{ex.message}"
     end
@@ -102,6 +102,51 @@ module Rhales
       render_template_with_composition(composition, template_name)
     end
 
+    # Render JSON response for API endpoints (link-based strategies)
+    def render_json_only(template_name = nil, additional_context = {})
+      require_relative 'hydration_endpoint'
+
+      template_name ||= self.class.default_template_name
+      endpoint = HydrationEndpoint.new(@config, @rsfc_context)
+      endpoint.render_json(template_name, additional_context)
+    end
+
+    # Render ES module response for modulepreload strategy
+    def render_module_only(template_name = nil, additional_context = {})
+      require_relative 'hydration_endpoint'
+
+      template_name ||= self.class.default_template_name
+      endpoint = HydrationEndpoint.new(@config, @rsfc_context)
+      endpoint.render_module(template_name, additional_context)
+    end
+
+    # Render JSONP response with callback
+    def render_jsonp_only(template_name = nil, callback_name = 'callback', additional_context = {})
+      require_relative 'hydration_endpoint'
+
+      template_name ||= self.class.default_template_name
+      endpoint = HydrationEndpoint.new(@config, @rsfc_context)
+      endpoint.render_jsonp(template_name, callback_name, additional_context)
+    end
+
+    # Check if template data has changed for caching
+    def data_changed?(template_name = nil, etag = nil, additional_context = {})
+      require_relative 'hydration_endpoint'
+
+      template_name ||= self.class.default_template_name
+      endpoint = HydrationEndpoint.new(@config, @rsfc_context)
+      endpoint.data_changed?(template_name, etag, additional_context)
+    end
+
+    # Calculate ETag for current template data
+    def calculate_etag(template_name = nil, additional_context = {})
+      require_relative 'hydration_endpoint'
+
+      template_name ||= self.class.default_template_name
+      endpoint = HydrationEndpoint.new(@config, @rsfc_context)
+      endpoint.calculate_etag(template_name, additional_context)
+    end
+
     # Generate only the data hydration HTML
     def render_hydration_only(template_name = nil)
       template_name ||= self.class.default_template_name
@@ -182,11 +227,7 @@ module Rhales
 
     # Get templates root directory
     def templates_root
-      boot_root = if defined?(OT) && OT.respond_to?(:boot_root)
-                    OT.boot_root
-                  else
-                    File.expand_path('../../..', __dir__)
-                  end
+      boot_root = File.expand_path('../../..', __dir__)
       File.join(boot_root, 'templates')
     end
 
@@ -220,11 +261,9 @@ module Rhales
         partial_path = File.join(templates_dir, "#{partial_name}.rue")
 
         if File.exist?(partial_path)
-          # Parse partial and return template section
-          partial_parser = require(partial_path)
-          partial_parser.section('template')
-        else
-          nil
+          # Return full partial content so TemplateEngine can process
+          # data sections, otherwise nil.
+          File.read(partial_path)
         end
       end
     end
@@ -255,12 +294,32 @@ module Rhales
       hydrator = Hydrator.new(parser, @rsfc_context)
       hydrator.processed_data_hash
     rescue JSON::ParserError, Hydrator::JSONSerializationError => ex
+      puts "Error processing data section: #{ex.message}"
       # If data section isn't valid JSON, return empty hash
       # This allows templates to work even with malformed data sections
       {}
     end
 
-    # Inject hydration HTML into template
+    # Smart hydration injection with mount point detection on rendered HTML
+    def inject_hydration_with_mount_points(composition, template_name, template_html, hydration_html)
+      injector = HydrationInjector.new(@config.hydration, template_name)
+
+      # Check if using link-based strategy
+      if @config.hydration.link_based_strategy?
+        # For link-based strategies, we need the merged data context
+        aggregator = HydrationDataAggregator.new(@rsfc_context)
+        merged_data = aggregator.aggregate(composition)
+        nonce = @rsfc_context.get('nonce')
+
+        injector.inject_link_based_strategy(template_html, merged_data, nonce)
+      else
+        # Traditional strategies (early, earliest, late)
+        mount_point = detect_mount_point_in_rendered_html(template_html)
+        injector.inject(template_html, hydration_html, mount_point)
+      end
+    end
+
+    # Legacy injection method (kept for backwards compatibility)
     def inject_hydration_into_template(template_html, hydration_html)
       # Try to inject before closing </body> tag
       if template_html.include?('</body>')
@@ -271,10 +330,19 @@ module Rhales
       end
     end
 
+    # Detect mount points in fully rendered HTML
+    def detect_mount_point_in_rendered_html(template_html)
+      return nil unless @config&.hydration
+
+      custom_selectors = @config.hydration.mount_point_selectors || []
+      detector = MountPointDetector.new
+      detector.detect(template_html, custom_selectors)
+    end
+
     # Build view composition for the given template
     def build_view_composition(template_name)
       loader      = method(:load_template_for_composition)
-      composition = ViewComposition.new(template_name, loader: loader)
+      composition = ViewComposition.new(template_name, loader: loader, config: @config)
       composition.resolve!
     end
 
@@ -332,7 +400,7 @@ module Rhales
     def create_partial_resolver_from_composition(composition)
       proc do |partial_name|
         parser = composition.template(partial_name)
-        parser ? parser.section('template') : nil
+        parser ? parser.content : nil
       end
     end
 
@@ -344,30 +412,102 @@ module Rhales
         # Generate unique ID for this data block
         unique_id = "rsfc-data-#{SecureRandom.hex(8)}"
 
-        # Create JSON script tag
+        # Create JSON script tag with optional reflection attributes
+        json_attrs = reflection_enabled? ? " data-window=\"#{window_attr}\"" : ""
         json_script = <<~HTML.strip
-          <script id="#{unique_id}" type="application/json">#{JSON.generate(data)}</script>
+          <script id="#{unique_id}" type="application/json"#{json_attrs}>#{JSON.generate(data)}</script>
         HTML
 
-        # Create hydration script
-        nonce_attr       = nonce_attribute
-        hydration_script = <<~HTML.strip
-          <script#{nonce_attr}>
-          window.#{window_attr} = JSON.parse(document.getElementById('#{unique_id}').textContent);
-          </script>
-        HTML
+        # Create hydration script with optional reflection attributes
+        nonce_attr = nonce_attribute
+        hydration_attrs = reflection_enabled? ? " data-hydration-target=\"#{window_attr}\"" : ""
+        hydration_script = if reflection_enabled?
+          <<~HTML.strip
+            <script#{nonce_attr}#{hydration_attrs}>
+            var dataScript = document.getElementById('#{unique_id}');
+            var targetName = dataScript.getAttribute('data-window') || '#{window_attr}';
+            window[targetName] = JSON.parse(dataScript.textContent);
+            </script>
+          HTML
+        else
+          <<~HTML.strip
+            <script#{nonce_attr}#{hydration_attrs}>
+            window['#{window_attr}'] = JSON.parse(document.getElementById('#{unique_id}').textContent);
+            </script>
+          HTML
+        end
 
         hydration_parts << json_script
         hydration_parts << hydration_script
       end
 
+      # Add reflection utilities if enabled
+      if reflection_enabled? && !merged_data.empty?
+        hydration_parts << generate_reflection_utilities
+      end
+
       hydration_parts.join("\n")
     end
 
+    # Check if reflection system is enabled
+    def reflection_enabled?
+      @config.hydration.reflection_enabled
+    end
+
+    # Generate JavaScript utilities for hydration reflection
+    def generate_reflection_utilities
+      nonce_attr = nonce_attribute
+
+      <<~HTML.strip
+        <script#{nonce_attr}>
+        // Rhales hydration reflection utilities
+        window.__rhales__ = window.__rhales__ || {
+          getHydrationTargets: function() {
+            return Array.from(document.querySelectorAll('[data-hydration-target]'));
+          },
+          getDataForTarget: function(target) {
+            var targetName = target.dataset.hydrationTarget;
+            return targetName ? window[targetName] : undefined;
+          },
+          getWindowAttribute: function(scriptEl) {
+            return scriptEl.dataset.window;
+          },
+          getDataScripts: function() {
+            return Array.from(document.querySelectorAll('script[data-window]'));
+          },
+          refreshData: function(target) {
+            var targetName = target.dataset.hydrationTarget;
+            var dataScript = document.querySelector('script[data-window="' + targetName + '"]');
+            if (dataScript && targetName) {
+              try {
+                window[targetName] = JSON.parse(dataScript.textContent);
+                return true;
+              } catch (e) {
+                console.error('Rhales: Failed to refresh data for ' + targetName, e);
+                return false;
+              }
+            }
+            return false;
+          },
+          getAllHydrationData: function() {
+            var data = {};
+            this.getHydrationTargets().forEach(function(target) {
+              var targetName = target.dataset.hydrationTarget;
+              if (targetName) {
+                data[targetName] = window[targetName];
+              }
+            });
+            return data;
+          }
+        };
+        </script>
+      HTML
+    end
+
     # Get nonce attribute if available
     def nonce_attribute
       nonce = @rsfc_context.get('nonce')
-      nonce ? " nonce=\"#{nonce}\"" : ''
+      nonce ? " nonce=\"#{ERB::Util.html_escape(nonce)}\"" : ''
     end
 
     # Set CSP header if enabled

data/lib/rhales/view_composition.rb

@@ -28,9 +28,10 @@ module Rhales
 
     attr_reader :root_template_name, :templates, :dependencies
 
-    def initialize(root_template_name, loader:)
+    def initialize(root_template_name, loader:, config: nil)
       @root_template_name = root_template_name
       @loader             = loader
+      @config             = config
       @templates          = {}
       @dependencies       = {}
       @loading            = Set.new
@@ -69,7 +70,7 @@ module Rhales
     end
 
     # Check if a template exists in the composition
-    def has_template?(name)
+    def template?(name)
       @templates.key?(name)
     end
 
@@ -83,9 +84,10 @@ module Rhales
       @dependencies[template_name] || []
     end
 
+
     private
 
-    def load_template_recursive(template_name, parent_path = nil)
+    def load_template_recursive(template_name, _parent_path = nil)
       # Check for circular dependencies
       if @loading.include?(template_name)
         raise CircularDependencyError, "Circular dependency detected: #{template_name} -> #{@loading.to_a.join(' -> ')}"

data/lib/rhales.rb

@@ -13,6 +13,12 @@ require_relative 'rhales/template_engine'
 require_relative 'rhales/hydrator'
 require_relative 'rhales/view_composition'
 require_relative 'rhales/hydration_data_aggregator'
+require_relative 'rhales/mount_point_detector'
+require_relative 'rhales/safe_injection_validator'
+require_relative 'rhales/earliest_injection_detector'
+require_relative 'rhales/link_based_injection_detector'
+require_relative 'rhales/hydration_injector'
+require_relative 'rhales/hydration_endpoint'
 require_relative 'rhales/refinements/require_refinements'
 require_relative 'rhales/view'
 
@@ -30,9 +36,14 @@ require_relative 'rhales/view'
 #
 # Usage:
 #   Rhales.configure do |config|
-#     config.default_localhas_role?e = 'en'
+#     config.default_locale = 'en'
 #     config.template_paths = ['app/templates']
 #     config.features = { dark_mode: true }
+#
+#     # Hydration configuration
+#     config.hydration.injection_strategy = :early  # :early or :late (default)
+#     config.hydration.mount_point_selectors = ['#app', '#root', '[data-mount]']
+#     config.hydration.fallback_to_late = true
 #   end
 #
 #   view = Rhales::View.new(request, session, user)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rhales
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - delano
 bindir: exe
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   Rhales is a framework for building server-rendered components with
@@ -34,16 +34,22 @@ files:
 - lib/rhales/configuration.rb
 - lib/rhales/context.rb
 - lib/rhales/csp.rb
+- lib/rhales/earliest_injection_detector.rb
 - lib/rhales/errors.rb
 - lib/rhales/errors/hydration_collision_error.rb
 - lib/rhales/hydration_data_aggregator.rb
+- lib/rhales/hydration_endpoint.rb
+- lib/rhales/hydration_injector.rb
 - lib/rhales/hydration_registry.rb
 - lib/rhales/hydrator.rb
+- lib/rhales/link_based_injection_detector.rb
+- lib/rhales/mount_point_detector.rb
 - lib/rhales/parsers/handlebars-grammar-review.txt
 - lib/rhales/parsers/handlebars_parser.rb
 - lib/rhales/parsers/rue_format_parser.rb
 - lib/rhales/refinements/require_refinements.rb
 - lib/rhales/rue_document.rb
+- lib/rhales/safe_injection_validator.rb
 - lib/rhales/template_engine.rb
 - lib/rhales/tilt.rb
 - lib/rhales/version.rb
@@ -72,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rhales - Server-rendered components with client-side hydration (RSFCs)
 test_files: []