evc_rails 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0083734e9b8f16100d769aa08c7393c7e60105a5c9bcbc3774c5955cc3c71def'
-  data.tar.gz: 9099d7be89c3b5c6805fbd0b7b9316409c53a89ff62b1460391265c4a18fa97b
+  metadata.gz: cbedccd24baa2e896e5f5dc2f232b1a481ac3e5c9e82653f18d6d40d3b888f8d
+  data.tar.gz: 022e8e06c631aa3d6d52363377600a9b38870ffaa0506e1d5e732c0bf6859b73
 SHA512:
-  metadata.gz: 742227dddbef882cf3a085bfd2c8642e4decc61a76bb83f858b55bb900d1064d09b9507beb3cbfbb62d5472a644793f4457057d23962cce134a6d75aa018bfca
-  data.tar.gz: 13948d925ffc1419337d7d6a104be86bdae102577a133393978cb8c00eab2f7ee63bc627c6e15667c34671534f020588cf5e97297cbc82f6e0d79e800c9b416e
+  metadata.gz: b0eca6627b253da66c7cc9d44730f0c7dff6306ae6040bae1ac08b294d59723f72d0a3ec2ffc67736de566b7e6567803e2f17c14590c17e0ec1952d96005309a
+  data.tar.gz: 0a1268f2b06d7027134d9277b2a48b1372e6483e6c8c08fdd0e2aed1b36f4bf81286edbce9b760a18435ff64f11f2e6fa06a5ba9008af22efe9f24e950daa104

data/CHANGELOG.md

@@ -5,7 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.3.0] - 2024-12-19
+
+### Added
+
+- **Enhanced slot nesting support**: Improved handling of deeply nested slots within components
+- **Self-closing slot optimization**: Self-closing slots now render as method calls without blocks for better performance
+- **Stack-based nesting logic**: More robust handling of complex nested component and slot structures
+
+### Changed
+
+- **Slot variable naming**: Improved slot variable naming by stripping `with_` prefix for cleaner block variables
+- **Nested slot context**: Enhanced logic to ensure slots use the nearest component variable unless directly nested inside another slot
+
+### Fixed
+
+- **Block variable syntax**: Fixed Ruby block variable syntax to use `do |var|` instead of `|var| do`
+- **Block variable yielding**: Corrected block variable yielding for complex nested structures
+- **Slot method compatibility**: Ensured proper compatibility with ViewComponent's generated slot methods
+- **Test suite improvements**: Updated all tests to reflect the new behavior and added comprehensive test coverage
+
+## [0.2.3] - 2024-12-19
+
+### Changed
+
+- **Block variable yielding with `as`**: The block variable is now always yielded if the `as` attribute is present on a component tag, even if no `<With...>` slot tags are used inside the block. This makes advanced usage (such as calling plural slot methods directly) more ergonomic and predictable.
+- **Documentation improvements**: Clarified the need for the `as` attribute when using plural slot methods with block variables, and improved wording for advanced usage in the README.
+- **Test suite**: Added and updated tests to verify block variable yielding with `as` and to match the new behavior.
 
 ## [0.2.2] - 2024-12-19
 
@@ -77,11 +103,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Drop-in replacement**: Works as a replacement for `.erb` files
 - **Basic caching**: Template compilation caching for performance
 
----
-
 ## Version History Notes
 
 - **0.1.0**: Initial release with core functionality
 - **0.2.0**: Major feature addition with slots and namespaced components
 - **0.2.1**: Improved variable naming and slot method compatibility
 - **0.2.2**: Added boolean attribute shorthand for cleaner templates
+- **0.2.3**: Added block variable yielding with `as` attribute for more ergonomic advanced usage
+- **0.3.0**: Enhanced slot nesting support and improved block variable handling for complex component structures

data/README.md

@@ -42,10 +42,11 @@ No component modifications required - just install and enjoy easier syntax!
 - **Block components**: `<Container>content</Container>`
 - **Attributes**: String, Ruby expressions, and multiple attributes
 - **Namespaced components**: `<UI::Button />`, `<Forms::Fields::TextField />`
-- **Slot support**: `<Card::Header>...</Card::Header>` with `renders_one` and `renders_many`
-- **Deep nesting**: Complex component hierarchies
+- **Advanced slot support**: `<WithHeader>...</WithHeader>` with `renders_one` and `renders_many`, including complex nesting
+- **Deep nesting**: Complex component hierarchies with proper block variable handling
 - **Production-ready caching** with Rails.cache integration
 - **Better error messages** with line numbers and column positions
+- **Boolean attribute shorthand** for cleaner templates
 
 ## Installation
 
@@ -230,6 +231,52 @@ Becomes:
 <% end %>
 ```
 
+#### Self-Closing Slots
+
+You can also use self-closing slot tags when you don't need to pass content:
+
+```erb
+<Card>
+  <WithHeader />
+  <WithBody>
+    <p>This is the body content.</p>
+  </WithBody>
+</Card>
+```
+
+Becomes:
+
+```erb
+<%= render CardComponent.new do |card| %>
+  <% card.with_header %>
+  <% card.with_body do %>
+    <p>This is the body content.</p>
+  <% end %>
+<% end %>
+```
+
+#### Slot Attributes with Ruby Expressions
+
+Slots can accept attributes and Ruby expressions:
+
+```erb
+<Card>
+  <WithHeader user={@current_user} class="welcome-header">
+    Welcome, <%= @current_user.name %>
+  </WithHeader>
+</Card>
+```
+
+Becomes:
+
+```erb
+<%= render CardComponent.new do |card| %>
+  <% card.with_header(user: @current_user, class: "welcome-header") do %>
+    Welcome, <%= @current_user.name %>
+  <% end %>
+<% end %>
+```
+
 #### Multiple Slots (`renders_many`)
 
 ```ruby
@@ -326,6 +373,42 @@ This is equivalent to the ERB version:
 
 You can use this approach for any plural slot method generated by `renders_many`. The block variable (e.g., `navigation`) is always available inside the component block when you use the `as` attribute, even if there are no `<With...>` slot tags present.
 
+#### Complex Nested Slot Structures
+
+EVC handles complex nested slot structures with proper block variable scoping:
+
+```erb
+<Navigation>
+  <WithLink href={learning_path} text="Learning Path" />
+  <WithLink href={courses_path} text="All Courses" />
+  <WithLink text="Reports">
+    <WithSublink href={reports_users_path} text="Users" />
+    <WithSublink href={reports_activity_path} text="Activity" />
+  </WithLink>
+  <WithFooter>
+    <div>Footer content</div>
+  </WithFooter>
+</Navigation>
+```
+
+Becomes:
+
+```erb
+<%= render NavigationComponent.new do |navigation| %>
+  <% navigation.with_link(href: learning_path, text: "Learning Path") %>
+  <% navigation.with_link(href: courses_path, text: "All Courses") %>
+  <% navigation.with_link(text: "Reports") do |link| %>
+    <% link.with_sublink(href: reports_users_path, text: "Users") %>
+    <% link.with_sublink(href: reports_activity_path, text: "Activity") %>
+  <% end %>
+  <% navigation.with_footer do %>
+    <div>Footer content</div>
+  <% end %>
+<% end %>
+```
+
+This demonstrates how EVC properly handles nested slots with correct block variable scoping - the inner `WithSublink` slots use the `link` variable from their parent `WithLink` slot.
+
 ### Mixed Content
 
 You can mix regular HTML, ERB, and component tags:

data/lib/evc_rails/template_handler.rb

@@ -113,6 +113,7 @@ module EvcRails
 
             # Determine if this is a slot (e.g., WithHeader, WithPost)
             parent_component = stack.reverse.find { |item| item[4] == :component }
+            parent_slot_index = stack.rindex { |item| item[4] == :slot }
             is_slot = false
             slot_name = nil
 
@@ -121,15 +122,22 @@ module EvcRails
               # Convert CamelCase slot name to snake_case
               slot_name = tag_name[4..].gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
               parent_component[6] = true # Mark parent as having a slot
+              # If this slot is nested inside another slot, mark the parent slot as having nested slots
+              stack[parent_slot_index][6] = true if parent_slot_index
             end
 
             if is_self_closing
               if is_slot
-                parent_variable = parent_component[8]
+                # For self-closing slots, use the most recent slot variable if present, otherwise the component variable
+                parent_variable = if stack.last && stack.last[4] == :slot
+                                    stack.last[8]
+                                  else
+                                    parent_component[8]
+                                  end
                 result << if param_str.empty?
-                            "<% #{parent_variable}.with_#{slot_name} do %><% end %>"
+                            "<% #{parent_variable}.with_#{slot_name} %>"
                           else
-                            "<% #{parent_variable}.with_#{slot_name}(#{param_str}) do %><% end %>"
+                            "<% #{parent_variable}.with_#{slot_name}(#{param_str}) %>"
                           end
               else
                 component_class = "#{tag_name}Component"
@@ -140,8 +148,20 @@ module EvcRails
                           end
               end
             elsif is_slot
-              parent_variable = parent_component[8]
-              stack << [tag_name, nil, param_str, result.length, :slot, slot_name, false, match.begin(0), nil]
+              # For block slots, determine the parent variable
+              if stack.last && stack.last[4] == :slot
+                # The most recent stack entry is a slot; use its variable
+                parent_variable = stack.last[8]
+                # Mark the parent slot as having nested slots
+                stack.last[6] = true
+              else
+                # Otherwise, use the nearest component variable
+                parent_variable = parent_component[8]
+              end
+              # Generate a variable name for this slot (strip 'with_' prefix)
+              slot_variable_name = component_variable_name(tag_name.sub(/^With/, ""))
+              stack << [tag_name, nil, param_str, result.length, :slot, slot_name, false, match.begin(0),
+                        slot_variable_name]
               result << if param_str.empty?
                           "<% #{parent_variable}.with_#{slot_name} do %>"
                         else
@@ -150,7 +170,6 @@ module EvcRails
             else
               component_class = "#{tag_name}Component"
               variable_name = as_variable || component_variable_name(tag_name)
-              # If as_variable is present, force block variable to be yielded
               force_block_variable = !as_variable.nil?
               stack << [tag_name, component_class, param_str, result.length, :component, nil, false, match.begin(0),
                         variable_name, force_block_variable]
@@ -199,14 +218,23 @@ module EvcRails
                 relevant_part = result[start_pos..-1]
                 match_for_insertion = /( do)( %>)/.match(relevant_part)
                 if match_for_insertion
-                  # Insert the variable name just before the ` do`
-                  insertion_point = start_pos + match_for_insertion.begin(1)
+                  # Insert the variable name just after the ` do`
+                  insertion_point = start_pos + match_for_insertion.begin(1) + match_for_insertion[1].length
                   result.insert(insertion_point, " |#{variable_name}|")
                 end
               end
 
               result << "<% end %>"
             else # It's a slot
+              _tag_name, _component_class, param_str, start_pos, _type, _slot_name, has_nested_slots, _open_pos, slot_variable_name = open_tag_data
+              if has_nested_slots
+                relevant_part = result[start_pos..-1]
+                match_for_insertion = /( do)( %>)/.match(relevant_part)
+                if match_for_insertion
+                  insertion_point = start_pos + match_for_insertion.begin(1) + match_for_insertion[1].length
+                  result.insert(insertion_point, " |#{slot_variable_name}|")
+                end
+              end
               result << "<% end %>"
             end
 
@@ -255,17 +283,85 @@ module EvcRails
         end.strip
 
         params = []
-        attributes_str.scan(attribute_regex) do |key, quoted_value, single_quoted_value, ruby_expression|
-          params << if ruby_expression
-                      "#{key}: #{ruby_expression}"
-                    elsif quoted_value
-                      "#{key}: \"#{quoted_value.gsub('"', '\\"')}\""
-                    elsif single_quoted_value
-                      "#{key}: \"#{single_quoted_value.gsub("'", "\\'")}\""
-                    else
-                      # Standalone attribute (no value) - treat as boolean true
-                      "#{key}: true"
-                    end
+        str = attributes_str.dup
+        until str.nil? || str.empty?
+          str = "" if str.nil?
+          str.lstrip!
+          str = "" if str.nil?
+          break if str.empty?
+          # Match key
+          break unless str =~ /\A(\w+)/
+
+          key = ::Regexp.last_match(1)
+          str = str[::Regexp.last_match(0).length..-1]
+          str = "" if str.nil?
+          str.lstrip!
+          str = "" if str.nil?
+          if str.start_with?("=")
+            str = str[1..-1]
+            str = "" if str.nil?
+            str.lstrip!
+            str = "" if str.nil?
+            if str.start_with?("{")
+              # Parse balanced curly braces
+              depth = 0
+              i = 0
+              found = false
+              while true
+                str = "" if str.nil?
+                break if str.empty? || i >= str.length
+
+                c = str[i]
+                if c == "{"
+                  depth += 1
+                elsif c == "}"
+                  depth -= 1
+                  if depth == 0
+                    found = true
+                    break
+                  end
+                end
+                i += 1
+              end
+              if found
+                ruby_expr = str[1...i] # skip opening '{', up to before closing '}'
+                str = str[(i + 1)..-1]
+                str = "" if str.nil?
+                params << "#{key}: #{ruby_expr}"
+              else
+                # Unbalanced braces, treat as error or fallback
+                params << "#{key}: true"
+                str = ""
+              end
+            elsif str.start_with?("\"")
+              # Double-quoted string
+              if str =~ /\A"([^"]*)"/
+                str = str[::Regexp.last_match(0).length..-1]
+                str = "" if str.nil?
+                params << "#{key}: \"#{::Regexp.last_match(1).gsub('"', '\\"')}\""
+              else
+                params << "#{key}: true"
+                str = ""
+              end
+            elsif str.start_with?("'")
+              # Single-quoted string
+              if str =~ /\A'([^']*)'/
+                str = str[::Regexp.last_match(0).length..-1]
+                str = "" if str.nil?
+                params << "#{key}: \"#{::Regexp.last_match(1).gsub("'", "\\'")}\""
+              else
+                params << "#{key}: true"
+                str = ""
+              end
+            else
+              # Unquoted value or malformed, treat as boolean true
+              params << "#{key}: true"
+              str = ""
+            end
+          else
+            # Standalone attribute (no value) - treat as boolean true
+            params << "#{key}: true"
+          end
         end
         [params, as_variable]
       end

data/lib/evc_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EvcRails
-  VERSION = "0.2.3"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evc_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - scttymn