hot_module 1.0.0.alpha11 → 1.0.0.alpha13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90f5f3aee3f096c2b0dc962592cef3ff02563a5a8b5bef47cab9adc9eabf309
-  data.tar.gz: cdda20661fa3aab05d14f793a4b6ef3cf6d9c0bfc116a28a49a1118ab1286d2c
+  metadata.gz: 90f40d53a3d644454adb306af193e5258970067eaa31075263c13ce31ce23b3f
+  data.tar.gz: f3308d84a9605fce9edeff88e00e29ce88ebee8d5dcde9f96439b46f6a512567
 SHA512:
-  metadata.gz: ff109253d98e063cfcf6a79481a3cde7934afca492dcca0edd865266cc1401918ba858f04f1cd7ae125d424332f9cdbfd1e562fe4e9914c55313a08070aa61cc
-  data.tar.gz: bb1864cc03b42c1612bd53aa29ef7278d38ad46b8d3362ab31b6093aa8abe907a7a2d1587b04338b2e2b74b868136235181a6871ef27eecb2690e59765d9e3c7
+  metadata.gz: aa8b2ce963950a27f69a65c23db73f544fd52e84ab5b0d200667fc2e2a976dc2a8121c6fa7de0b4e4a50f8abb49d7243b484aea7210fc14cb3e8708414050248
+  data.tar.gz: 8a4a0de3a7dbd16b019327282ec3f1e604a622baf4f47dc21fffe6cd2ed9c25170de5d453ea43185deffe344fcd5324cd8696aff2046821b7988179ec4edc677

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot_module (1.0.0.alpha11)
+    hot_module (1.0.0.alpha13)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 

data/lib/hot_module/component_renderer.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module HoTModuLe
-  class View < Bridgetown::ERBView
-    attr_accessor :child_nodes
-  end
-
   class ComponentRenderer < Bridgetown::Builder
     def build
       render_html_modules
@@ -13,13 +9,13 @@ module HoTModuLe
     # rubocop:todo Metrics
     def render_html_modules
       inspect_html do |doc, resource|
-        view_context = HoTModuLe::View.new(resource)
+        view_context = Bridgetown::ERBView.new(resource)
 
         HoTModuLe.registered_elements.each do |component|
           tag_name = component.tag_name
           doc.xpath("//#{tag_name}").reverse.each do |node|
             if node["hmod:ignore"]
-              node.attribute("hmod:ignore").remove
+              node.remove_attribute("hmod:ignore")
               next
             end
 
@@ -37,11 +33,10 @@ module HoTModuLe
             attrs.merge!(new_attrs)
             attrs.transform_keys!(&:to_sym)
 
-            view_context.child_nodes = node.children
             new_node = node.replace(
-              component.new(**attrs).render_in(view_context) { node.children.to_html.html_safe }
+              component.new(**attrs).render_in(view_context, rendering_mode: :node) { node.children }
             )
-            new_node.first.attribute("hmod:ignore")&.remove
+            new_node.remove_attribute("hmod:ignore")
           end
         rescue StandardError => e
           Bridgetown.logger.error "Unable to render <#{tag_name}> (#{component}) in #{resource.path}"

data/lib/hot_module/version.rb

@@ -2,5 +2,5 @@
 
 module HoTModuLe
   # @return [String]
-  VERSION = "1.0.0.alpha11"
+  VERSION = "1.0.0.alpha13"
 end

data/lib/hot_module.rb

@@ -38,6 +38,11 @@ module HoTModuLe
     @registered_elements
   end
 
+  def self.register_element(component)
+    @registered_elements ||= Concurrent::Set.new
+    @registered_elements << component
+  end
+
   # @param klass [Class]
   # @return [void]
   def self.included(klass)
@@ -98,7 +103,7 @@ module HoTModuLe
     # @return [String]
     def tag_name(value = nil)
       @tag_name ||= begin
-        HoTModuLe.registered_elements << self
+        HoTModuLe.register_element self
         value
       end
     end
@@ -145,14 +150,25 @@ module HoTModuLe
   # @return [Hash]
   def attributes = {}
 
+  def rendering_mode = @_rendering_mode || :node
+
+  def rendering_mode=(mode)
+    @_rendering_mode = case mode
+                       when :node, :string
+                         mode
+                       end
+  end
+
   # @param attributes [Hash]
   # @param content [String, Nokolexbor::Element]
-  # @param return_node [Boolean]
-  def render_element(attributes: self.attributes, content: self.content, return_node: false) # rubocop:disable Metrics
+  def render_element(attributes: self.attributes, content: self.content) # rubocop:disable Metrics
     doc = self.class.doc.clone
     @_content = content
 
-    tmpl_el = doc.css("> template").find { _1.attributes.empty? }
+    tmpl_el = doc.css("> template").find do |node|
+      node.attributes.empty? ||
+        (node.attributes.count == 1 && node.attributes.any? { |k| k[0].start_with?("data-") })
+    end
 
     unless tmpl_el
       tmpl_el = doc.document.create_element("template")
@@ -167,7 +183,7 @@ module HoTModuLe
     HoTModuLe.registered_elements.each do |component|
       tmpl_el.children[0].css(component.tag_name).reverse.each do |node|
         if node["hmod:ignore"]
-          node.attribute("hmod:ignore").remove
+          node.remove_attribute("hmod:ignore")
           next
         end
 
@@ -187,7 +203,7 @@ module HoTModuLe
         new_node = node.replace(
           component.new(**attrs).render_element(content: node.children)
         )
-        new_node.first.attribute("hmod:ignore")&.remove
+        new_node.remove_attribute("hmod:ignore")
       end
     end
 
@@ -242,8 +258,7 @@ module HoTModuLe
       tmpl_el.remove
     end
 
-    # And that is that.
-    return_node ? doc : doc.to_html
+    rendering_mode == :node ? doc : doc.to_html
   end
 
   def call(...) = render_element(...)
@@ -375,9 +390,10 @@ if defined?(Bridgetown)
     Bridgetown::Component.extend ActiveSupport::DescendantsTracker
 
     HoTModuLe.module_eval do
-      def render_in(*)
+      def render_in(view_context, rendering_mode = :string, &block)
         @attributes&.[]=("hmod:ignore", "")
-        super
+        self.rendering_mode = rendering_mode
+        super(view_context, &block)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_module
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha11
+  version: 1.0.0.alpha13
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby