vident-phlex 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731f9c7918cc00ef43f05fc30ad246d168c2a5484d1ed2e56be7133b38ef5898
-  data.tar.gz: fe49bbf87d991a04eca3f7796d8a8fdb1fc1b6ed04ba69e03d7ae2f8fe8274b0
+  metadata.gz: 491b0cefd3a8305411d28a0f622b26d23353110e3c6b14a1f2dcbee1e66778d3
+  data.tar.gz: 679f4b3f77509ea345f0c656cd47d401407e38289e786cb799cd415bd1a9d73f
 SHA512:
-  metadata.gz: d439e0ba255d7fd23f06669906ca1abdc482dfbc1e097178709760575c129e9ba37e6cafaf1140f4977e19484b9e59a2ca07441555f7467e420a2007378d1f08
-  data.tar.gz: 6ed48a31f50e9ccb3f19df915c4720cbfc0eb37d47ba3f5c503c41604e64c9038d024e2268cc76a3015e79198668723d9bdc47e74fb864c7ede101cc97f246a8
+  metadata.gz: bbb631b7ff3bc67bcdfda2452defaaedaea85ba97ba286ddf71c17a462c0973ef57e21426f5e46b4e22be11d9df359b87678b18a499dbac64cee8f4bc6deda9d
+  data.tar.gz: 2014550736235ba4d7f9375af0d8ee463943b7481e13855d63d12b47116c2a79e21073c03fdf0b1b4f8de7565d5a73208016292276ab25a2d522070a20c78224

data/README.md

@@ -1,5 +1,13 @@
 # Vident::Phlex
-Short description and motivation.
+
+[Phlex](https://phlex.fun/) powered [Vident](https://github.com/stevegeek/vident) components.
+
+```ruby
+class ApplicationComponent < ::Vident::Phlex::HTML
+end
+```
+
+For more details see [vident](https://github.com/stevegeek/vident).
 
 ## Usage
 How to use my plugin.

data/lib/vident/phlex/core.rb

@@ -0,0 +1,29 @@
+# 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(**options)
+        @parent_element ||= ::Vident::Phlex::RootComponent.new(**parent_element_attributes(options))
+      end
+      alias_method :root, :parent_element
+    end
+  end
+end

data/lib/vident/phlex/html.rb

@@ -2,15 +2,10 @@
 
 module Vident
   module Phlex
-    class HTML < ::Phlex::HTML
+    class HTML < Core
       include ::Vident::Component
 
       class << self
-        def inherited(subclass)
-          subclass.component_source_file_path = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].path
-          super
-        end
-
         # 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.
@@ -18,22 +13,7 @@ module Vident
           options[:delegates] = false
           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(**options)
-        @parent_element ||= RootComponent.new(**parent_element_attributes(options))
       end
-      alias_method :root, :parent_element
     end
   end
 end

data/lib/vident/phlex/root_component.rb

@@ -23,7 +23,7 @@ module Vident
         parsed = parse_targets(Array.wrap(targets))
         options[:data] ||= {}
         options[:data].merge!(build_target_data_attributes(parsed))
-        generate_tag(tag_name, **options, &block)
+        generate_tag(tag_name, nil, **options, &block)
       end
 
       # Build a tag with the attributes determined by this components properties and stimulus
@@ -33,18 +33,22 @@ module Vident
         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, **options, &block)
+        generate_tag(tag_type, block_content, **options)
       end
 
       private
 
-      def generate_tag(tag_type, **options, &block)
-        send((tag_type == :template) ? :template_tag : tag_type, **options, &block)
+      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 { unsafe_raw content } if !block && content
+        send(method_name, **options, &block)
       end
     end
   end

data/lib/vident/phlex/version.rb

@@ -1,5 +1,5 @@
 module Vident
   module Phlex
-    VERSION = "0.2.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vident-phlex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +19,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,27 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: vident
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +121,7 @@ files:
 - Rakefile
 - lib/tasks/vident/phlex_tasks.rake
 - 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
@@ -127,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Vident with Phlex