vident-view_component 0.13.1 → 1.0.0.alpha2

data/lib/vident/view_component/base.rb

@@ -1,7 +1,126 @@
 module Vident
   module ViewComponent
-    class Base < Core
+    class Base < ::ViewComponent::Base
       include ::Vident::Component
+
+      class << self
+        def cache_component_modified_time
+          cache_sidecar_view_modified_time + cache_rb_component_modified_time
+        end
+
+        def cache_sidecar_view_modified_time
+          ::File.exist?(template_path) ? ::File.mtime(template_path).to_i.to_s : ""
+        end
+
+        def cache_rb_component_modified_time
+          ::File.exist?(component_path) ? ::File.mtime(component_path).to_i.to_s : ""
+        end
+
+        def template_path
+          # Check for common ViewComponent template extensions in order of preference
+          extensions = [".html.erb", ".erb", ".html.haml", ".haml", ".html.slim", ".slim"]
+          base_path = Rails.root.join(components_base_path, virtual_path)
+
+          extensions.each do |ext|
+            potential_path = "#{base_path}#{ext}"
+            return potential_path if File.exist?(potential_path)
+          end
+
+          # Return the default .html.erb path if no template is found
+          Rails.root.join(components_base_path, "#{virtual_path}.html.erb").to_s
+        end
+
+        def component_path
+          Rails.root.join(components_base_path, "#{virtual_path}.rb").to_s
+        end
+
+        def components_base_path
+          ::Rails.configuration.view_component.view_component_path || "app/components"
+        end
+      end
+
+      SELF_CLOSING_TAGS = Set[:area, :base, :br, :col, :embed, :hr, :img, :input, :link, :meta, :param, :source, :track, :wbr].freeze
+
+      def root_element(&block)
+        tag_type = root_element_tag_type
+        child_content = view_context.capture(self, &block) if block_given? # Evaluate before generating the outer tag options to ensure DSL methods are executed
+        options = root_element_tag_options
+        if SELF_CLOSING_TAGS.include?(tag_type)
+          view_context.tag(tag_type, options)
+        else
+          view_context.content_tag(tag_type, child_content, options)
+        end
+      end
+
+      def as_stimulus_targets(...)
+        to_data_attribute_string(**stimulus_targets(...))
+      end
+
+      def as_stimulus_target(...)
+        to_data_attribute_string(**stimulus_target(...))
+      end
+
+      def as_stimulus_actions(...)
+        to_data_attribute_string(**stimulus_actions(...))
+      end
+
+      def as_stimulus_action(...)
+        to_data_attribute_string(**stimulus_action(...))
+      end
+
+      def as_stimulus_controllers(...)
+        to_data_attribute_string(**stimulus_controllers(...))
+      end
+
+      def as_stimulus_controller(...)
+        to_data_attribute_string(**stimulus_controller(...))
+      end
+
+      def as_stimulus_outlets(...)
+        to_data_attribute_string(**stimulus_outlets(...))
+      end
+
+      def as_stimulus_outlet(...)
+        to_data_attribute_string(**stimulus_outlet(...))
+      end
+
+      def as_stimulus_values(...)
+        to_data_attribute_string(**stimulus_values(...))
+      end
+
+      def as_stimulus_value(...)
+        to_data_attribute_string(**stimulus_value(...))
+      end
+
+      def as_stimulus_classes(...)
+        to_data_attribute_string(**stimulus_classes(...))
+      end
+
+      def as_stimulus_class(...)
+        to_data_attribute_string(**stimulus_class(...))
+      end
+
+      private
+
+      def generate_tag(tag_name, stimulus_data_attributes, options, &block)
+        options[:data] ||= {}
+        options[:data].merge!(stimulus_data_attributes)
+        view_context.content_tag(tag_name, options, &block)
+      end
+
+      def escape_attribute_name_for_html(name)
+        name.to_s.gsub(/[^a-zA-Z0-9\-_]/, "").tr("_", "-")
+      end
+
+      def escape_attribute_value_for_html(value)
+        value.to_s.gsub('"', "&quot;").gsub("'", "&#39;")
+      end
+
+      def to_data_attribute_string(**attributes)
+        attributes.map { |key, value| "data-#{escape_attribute_name_for_html(key)}=\"#{escape_attribute_value_for_html(value)}\"" }
+          .join(" ")
+          .html_safe
+      end
     end
   end
 end

data/lib/vident/view_component.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: vident-view_component
 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,34 +55,28 @@ 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: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.74.1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.74.1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0.rc2
 description: Vident with ViewComponent
 email:
 - stevegeek@gmail.com
@@ -95,9 +89,7 @@ files:
 - README.md
 - lib/vident/view_component.rb
 - lib/vident/view_component/base.rb
-- lib/vident/view_component/core.rb
 - lib/vident/view_component/engine.rb
-- lib/vident/view_component/root_component.rb
 - lib/vident/view_component/version.rb
 homepage: https://github.com/stevegeek/vident
 licenses:

data/lib/vident/view_component/core.rb

@@ -1,37 +0,0 @@
-module Vident
-  module ViewComponent
-    class Core < ::ViewComponent::Base
-      class << self
-        def current_component_modified_time
-          sidecar_view_modified_time + rb_component_modified_time
-        end
-
-        def sidecar_view_modified_time
-          ::File.exist?(template_path) ? ::File.mtime(template_path).to_i.to_s : ""
-        end
-
-        def rb_component_modified_time
-          ::File.exist?(component_path) ? ::File.mtime(component_path).to_i.to_s : ""
-        end
-
-        def template_path
-          File.join components_base_path, "#{virtual_path}.html.erb"
-        end
-
-        def component_path
-          File.join components_base_path, "#{virtual_path}.rb"
-        end
-
-        def components_base_path
-          ::Rails.configuration.view_component.view_component_path || "app/components"
-        end
-      end
-
-      # Helper to create the main element
-      def parent_element
-        @parent_element ||= ::Vident::ViewComponent::RootComponent.new(**stimulus_options_for_root_component)
-      end
-      alias_method :root, :parent_element
-    end
-  end
-end

data/lib/vident/view_component/root_component.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Vident
-  module ViewComponent
-    class RootComponent < ::ViewComponent::Base
-      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
-
-      SELF_CLOSING_TAGS = Set[:area, :base, :br, :col, :embed, :hr, :img, :input, :link, :meta, :param, :source, :track, :wbr].freeze
-
-      def target_tag(tag_name, targets, **options, &block)
-        parsed = parse_targets(Array.wrap(targets))
-        options[:data] ||= {}
-        options[:data].merge!(build_target_data_attributes(parsed))
-        content = view_context.capture(&block) if block
-        view_context.content_tag(tag_name, content, options)
-      end
-
-      def call
-        # Generate outer tag options and render
-        tag_type = content_tag_type
-        child_content = content # Evaluate before generating the outer tag options to ensure DSL methods are executed
-        options = content_tag_options
-        if SELF_CLOSING_TAGS.include?(tag_type)
-          view_context.tag(tag_type, options)
-        else
-          view_context.content_tag(tag_type, child_content, options)
-        end
-      end
-
-      private
-
-      def content_tag_options
-        options = @html_options&.dup || {}
-        data_attrs = tag_data_attributes
-        options[:data] = options[:data].present? ? data_attrs.merge(options[:data]) : data_attrs
-        return options unless @id
-        options.merge(id: @id)
-      end
-
-      def content_tag_type
-        @element_tag.presence || :div
-      end
-    end
-  end
-end