hot_module 1.0.0.alpha2 → 1.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213948e4061c8dfb1da32e9621365caaa4d5594125f03c63802ff3fb53aa3b24
-  data.tar.gz: b4077c814479ea1d65d2143eaf6f6b7abba996787408846474c3933ffccf1fa9
+  metadata.gz: 8f1f98447dc175047e9ff9158705fb70736244cea4f1dcd8f014a9d7c19bd525
+  data.tar.gz: 65fa70bbba49a2e0077716315e976f5cc61db9228df638c5ef318d08e5d787b6
 SHA512:
-  metadata.gz: 76b4783da63ac259d17c0fa78c1a30b51f2919fbbbe1a5e007c315d3facb3249ffab2c0538d42322654868faf5b45f342a70b79f4b91c64ee67638644583a283
-  data.tar.gz: 00c1db27bd91bc5ea110af3bc26db58dc254b43960b182f327f938ea2f6e1eb440cde6ff4c9e40c2732d215600d671c0e73eeb005178174aa9005e6a3bdfb746
+  metadata.gz: 126deaf01781d54059a03645e1ae894b169702b37a622427010ce6e87523428ed937d18877025bbcab1900b0887b7b17bf25ece52076689db75ae6d19f60e553
+  data.tar.gz: 94ebbe7fa9f2a084e1babf420b71f96ede5e01e73190272d0168d26fde8d6dbb032cf93ed9bea3ccb9ec91843f5a27f260fb27dc1a73f912aa822f14bc8a2319

data/CHANGELOG.md

@@ -1,5 +1,5 @@
 ## [Unreleased]
 
-## [0.1.0] - 2022-09-21
+## [1.0.0.alpha4] - 2023-03-23
 
-- Initial release
+- Add Bridgetown plugin support

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    hot_module (1.0.0.alpha2)
-      nokolexbor (~> 0.3)
+    hot_module (1.0.0.alpha4)
+      nokolexbor (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.2.0)
-    concurrent-ruby (1.1.10)
+    benchmark (0.2.1)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
     hash_with_dot_access (1.2.0)
@@ -23,44 +23,44 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    json (2.6.2)
+    json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.16.3)
-    nokogiri (1.13.8-arm64-darwin)
+    minitest (5.18.0)
+    nokogiri (1.14.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
-    nokolexbor (0.3.7-arm64-darwin)
+    nokolexbor (0.4.0-arm64-darwin)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    racc (1.6.0)
+    racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rubocop (1.36.0)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-minitest (0.22.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-minitest (0.22.2)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
@@ -77,10 +77,10 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     thor (1.2.1)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
+    tilt (2.1.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)

data/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path("lib", __dir__)
 require "hot_module"
 

data/hot_module.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokolexbor", "~> 0.3"
+  spec.add_dependency "nokolexbor", "~> 0.4"
 
   spec.add_development_dependency "hash_with_dot_access", "~> 1.2"
 end

data/lib/hot_module/component_renderer.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module HoTModuLe
+  class ComponentRenderer < Bridgetown::Builder
+    def build
+      registered_tags = {}
+      Bridgetown::Component.subclasses.each do |component|
+        next unless component.respond_to?(:tag_name)
+
+        registered_tags[component.tag_name] = component
+      end
+
+      render_html_modules(registered_tags)
+    end
+
+    def render_html_modules(registered_tags) # rubocop:todo Metrics
+      inspect_html do |doc, resource| # rubocop:todo Metrics
+        view_context = Bridgetown::ERBView.new(resource)
+
+        registered_tags.each do |tag_name, component|
+          doc.xpath("//#{tag_name}").reverse.each do |node|
+            if node["hmod:ignore"]
+              node.attribute("hmod:ignore").remove
+              next
+            end
+
+            attrs = node.attributes.transform_values(&:value)
+            attrs.reject! { |k| k.start_with?("hmod:") }
+
+            new_attrs = {}
+            attrs.each do |k, v|
+              next unless k.start_with?("ruby:")
+
+              new_key = k.delete_prefix("ruby:")
+              attrs.delete(k)
+              new_attrs[new_key] = resource.instance_eval(v)
+            end
+            attrs.merge!(new_attrs)
+            attrs.transform_keys!(&:to_sym)
+
+            new_node = node.replace(
+              component.new(**attrs).render_in(view_context) { node.children.to_html }
+            )
+            new_node.first.attribute("hmod:ignore")&.remove
+          end
+        rescue StandardError => e
+          Bridgetown.logger.error "Unable to render <#{tag_name}> (#{component}) in #{resource.path}"
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/hot_module/petite.rb

@@ -23,7 +23,7 @@ module HoTModuLe
       process_list(
         attribute: attribute,
         node: node,
-        item_node: node.children[0].children.find(&:element?),
+        item_node: node.children[0].element_children.first,
         for_in: expression
       )
     end

data/lib/hot_module/query_selection.rb

@@ -12,6 +12,5 @@ module HoTModuLe
     def query_selector_all(selector) = css(selector)
   end
 
-  # TODO: do we need this, or no?
-  #  Nokogiri::XML::Node.include QuerySelection unless Nokogiri::XML::Node.instance_methods.include?(:query_selector)
+  Nokolexbor::Element.include QuerySelection unless Nokolexbor::Element.instance_methods.include?(:query_selector)
 end

data/lib/hot_module/version.rb

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

data/lib/hot_module.rb

@@ -21,7 +21,7 @@ module HoTModuLe
   AttributeBinding = Struct.new(:matcher, :method_name, :method, :only_for_tag, keyword_init: true) # rubocop:disable Lint/StructNewOverride
 
   require_relative "hot_module/fragment"
-  # require_relative "hot_module/query_selection"
+  require_relative "hot_module/query_selection"
 
   # @param klass [Class]
   # @return [void]
@@ -92,7 +92,7 @@ module HoTModuLe
     def doc
       @doc ||= Nokolexbor::DocumentFragment.parse(
         "<#{tag_name}>#{File.read(html_module).strip}</#{tag_name}>"
-      ).children.find(&:element?)
+      ).element_children.first
     end
 
     def attribute_bindings
@@ -126,18 +126,7 @@ module HoTModuLe
   def render_element(attributes: self.attributes, content: self.content, return_node: false) # rubocop:disable Metrics
     doc = self.class.doc.clone
 
-    # NOTE: have to fix cloned templates
-    doc.css("template").each do |bad_tmpl|
-      frag = bad_tmpl.children.last
-      new_tmpl = doc.document.create_element("template")
-      bad_tmpl.attributes.each do |k, v|
-        new_tmpl[k] = v
-      end
-      new_tmpl.children[0].children = frag
-      bad_tmpl.swap(new_tmpl)
-    end
-
-    tmpl_el = doc.css("> template").find { _1.attributes.length.zero? }
+    tmpl_el = doc.css("> template").find { _1.attributes.empty? }
 
     unless tmpl_el
       tmpl_el = doc.document.create_element("template")
@@ -249,18 +238,6 @@ module HoTModuLe
     _in_context_nodes do |previous_context|
       list_items.each_with_index do |list_item, index|
         new_node = item_node.clone
-
-        # NOTE: have to fix cloned templates
-        new_node.css("template").each do |bad_tmpl|
-          frag = bad_tmpl.children.last
-          new_tmpl = item_node.document.create_element("template")
-          bad_tmpl.attributes.each do |k, v|
-            new_tmpl[k] = v
-          end
-          new_tmpl.children[0].children = frag
-          bad_tmpl.swap(new_tmpl)
-        end
-
         node.parent << new_node
         new_node["hmod-added"] = ""
 
@@ -325,3 +302,26 @@ module HoTModuLe
     @_context_locals = previous_context
   end
 end
+
+if defined?(Bridgetown)
+  Bridgetown.initializer :hot_module do |config|
+    Bridgetown::Component.extend ActiveSupport::DescendantsTracker
+
+    HoTModuLe.module_eval do
+      def render_in(*)
+        @attributes&.[]=("hmod:ignore", "")
+        super
+      end
+    end
+
+    # Eager load all components
+    hook :site, :after_reset do |site|
+      unless site.config.eager_load_paths.find { _1.end_with?(site.config.components_dir) }
+        site.config.eager_load_paths << site.config.autoload_paths.find { _1.end_with?(site.config.components_dir) }
+      end
+    end
+
+    require_relative "hot_module/component_renderer"
+    config.builder HoTModuLe::ComponentRenderer
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_module
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2
+  version: 1.0.0.alpha4
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokolexbor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: hash_with_dot_access
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +56,7 @@ files:
 - benchmark.rb
 - hot_module.gemspec
 - lib/hot_module.rb
+- lib/hot_module/component_renderer.rb
 - lib/hot_module/fragment.rb
 - lib/hot_module/petite.rb
 - lib/hot_module/query_selection.rb