vident-phlex 0.13.1 → 1.0.0.alpha2

data/lib/vident/phlex/html.rb

@@ -2,17 +2,60 @@
 
 module Vident
   module Phlex
-    class HTML < Core
+    class HTML < ::Phlex::HTML
       include ::Vident::Component
 
+      STANDARD_ELEMENTS = [:a, :abbr, :address, :article, :aside, :b, :bdi, :bdo, :blockquote, :body, :button, :caption, :cite, :code, :colgroup, :data, :datalist, :dd, :del, :details, :dfn, :dialog, :div, :dl, :dt, :em, :fieldset, :figcaption, :figure, :footer, :form, :g, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup, :html, :i, :iframe, :ins, :kbd, :label, :legend, :li, :main, :map, :mark, :menuitem, :meter, :nav, :noscript, :object, :ol, :optgroup, :option, :output, :p, :path, :picture, :pre, :progress, :q, :rp, :rt, :ruby, :s, :samp, :script, :section, :select, :slot, :small, :span, :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td, :template_tag, :textarea, :tfoot, :th, :thead, :time, :title, :tr, :u, :ul, :video, :wbr].freeze
+      VOID_ELEMENTS = [:area, :br, :embed, :hr, :img, :input, :link, :meta, :param, :source, :track, :col].freeze
+      VALID_TAGS = Set[*(STANDARD_ELEMENTS + VOID_ELEMENTS)].freeze
+
       class << self
-        # Phlex uses a DSL to define the document, and those methods could easily clash with our attribute
-        # accessors. Therefore in Phlex components we do not create attribute accessors, and instead use instance
-        # variables directly.
-        def attribute(name, **options)
-          options[:delegates] = false
+        def inherited(subclass)
+          subclass.component_source_file_path = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].path
           super
         end
+
+        attr_accessor :component_source_file_path
+
+        # Caching support
+        def cache_component_modified_time
+          path = component_source_file_path
+          raise StandardError, "No component source file exists #{path}" unless path && ::File.exist?(path)
+          ::File.mtime(path).to_i.to_s
+        end
+      end
+
+      # Helper to create the main element
+      def root_element(&block)
+        tag_type = root_element_tag_type
+        check_valid_html_tag!(tag_type)
+        # Evaluate before generating the outer tag options to ensure DSL methods are executed
+        if block_given?
+          content = capture(self, &block).html_safe
+          options = root_element_tag_options
+          if content
+            send(tag_type, **options) { content }
+          else
+            send(tag_type, **options)
+          end
+        else
+          send(tag_type, **root_element_tag_options)
+        end
+      end
+
+      private
+
+      def check_valid_html_tag!(tag_name)
+        unless VALID_TAGS.include?(tag_name)
+          raise ArgumentError, "Unsupported HTML tag name #{tag_name}. Valid tags are: #{VALID_TAGS.to_a.join(", ")}"
+        end
+      end
+
+      def generate_tag(tag_type, stimulus_data_attributes, options, &block)
+        options[:data] ||= {}
+        options[:data].merge!(stimulus_data_attributes)
+        check_valid_html_tag!(tag_type)
+        send(tag_type, **options, &block)
       end
     end
   end

data/lib/vident/phlex.rb

@@ -1,7 +1,5 @@
 require "vident/phlex/version"
-require "vident/phlex/core"
 require "vident/phlex/html"
-require "vident/phlex/root_component"
 require "vident/phlex/engine" if defined?(Rails)
 
 module Vident

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: vident-phlex
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 bindir: bin
 cert_chain: []
-date: 2025-06-26 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -55,21 +55,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 1.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 1.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: phlex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -79,7 +79,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -114,10 +114,8 @@ files:
 - LICENSE.txt
 - README.md
 - lib/vident/phlex.rb
-- lib/vident/phlex/core.rb
 - lib/vident/phlex/engine.rb
 - lib/vident/phlex/html.rb
-- lib/vident/phlex/root_component.rb
 - lib/vident/phlex/version.rb
 homepage: https://github.com/stevegeek/vident
 licenses:

data/lib/vident/phlex/core.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Vident
-  module Phlex
-    class Core < ::Phlex::HTML
-      class << self
-        def inherited(subclass)
-          subclass.component_source_file_path = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].path
-          super
-        end
-
-        attr_accessor :component_source_file_path
-
-        # Caching support
-        def current_component_modified_time
-          path = component_source_file_path
-          raise StandardError, "No component source file exists #{path}" unless path && ::File.exist?(path)
-          ::File.mtime(path).to_i.to_s
-        end
-      end
-
-      # Helper to create the main element
-      def parent_element
-        @parent_element ||= ::Vident::Phlex::RootComponent.new(**stimulus_options_for_root_component)
-      end
-      alias_method :root, :parent_element
-    end
-  end
-end

data/lib/vident/phlex/root_component.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Vident
-  module Phlex
-    class RootComponent < ::Phlex::HTML
-      include ::Vident::RootComponent
-
-      if Gem.loaded_specs.has_key? "better_html"
-        begin
-          include ::Vident::BetterHtml::RootComponent
-        rescue
-          raise "if `better_html`` is being used you must install `vident-better_html"
-        end
-      end
-
-      STANDARD_ELEMENTS = [:a, :abbr, :address, :article, :aside, :b, :bdi, :bdo, :blockquote, :body, :button, :caption, :cite, :code, :colgroup, :data, :datalist, :dd, :del, :details, :dfn, :dialog, :div, :dl, :dt, :em, :fieldset, :figcaption, :figure, :footer, :form, :g, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup, :html, :i, :iframe, :ins, :kbd, :label, :legend, :li, :main, :map, :mark, :menuitem, :meter, :nav, :noscript, :object, :ol, :optgroup, :option, :output, :p, :path, :picture, :pre, :progress, :q, :rp, :rt, :ruby, :s, :samp, :script, :section, :select, :slot, :small, :span, :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td, :template_tag, :textarea, :tfoot, :th, :thead, :time, :title, :tr, :u, :ul, :video, :wbr].freeze
-      VOID_ELEMENTS = [:area, :br, :embed, :hr, :img, :input, :link, :meta, :param, :source, :track, :col].freeze
-
-      VALID_TAGS = Set[*(STANDARD_ELEMENTS + VOID_ELEMENTS)].freeze
-
-      # Create a tag for a target with a block containing content
-      def target_tag(tag_name, targets, **options, &block)
-        parsed = parse_targets(Array.wrap(targets))
-        options[:data] ||= {}
-        options[:data].merge!(build_target_data_attributes(parsed))
-        generate_tag(tag_name, nil, **options, &block)
-      end
-
-      # Build a tag with the attributes determined by this components properties and stimulus
-      # data attributes.
-      def view_template(&block)
-        # Generate tag options and render
-        tag_type = @element_tag.presence&.to_sym || :div
-        raise ArgumentError, "Unsupported HTML tag name #{tag_type}" unless VALID_TAGS.include?(tag_type)
-        options = @html_options&.dup || {}
-        block_content = capture(&block) if block # Evaluate before generating the outer tag options to ensure DSL methods are executed
-        data_attrs = tag_data_attributes
-        data_attrs = options[:data].present? ? data_attrs.merge(options[:data]) : data_attrs
-        options = options.merge(id: @id) if @id
-        options.except!(:data)
-        options.merge!(data_attrs.transform_keys { |k| "data-#{k}" })
-        generate_tag(tag_type, block_content, **options)
-      end
-
-      private
-
-      def generate_tag(tag_type, content, **options, &block)
-        # FIXME: Content was generated by the block, we assume its safe but that might not be true!
-        method_name = (tag_type == :template) ? :template_tag : tag_type
-        block = proc { raw content.html_safe } if !block && content
-        send(method_name, **options, &block)
-      end
-    end
-  end
-end