packwerk_slim_template 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd735a5469d37ee86529f99a8e2878ae65cc2615c7902842de944ea38bfe752
-  data.tar.gz: '049d75aa416b08b1750982f4770dd9e82757620c612788c70c9f4a66d0a8ff6d'
+  metadata.gz: 00a4fd46c3921a7e8ce8bd0cf4e786a5c8d479fd0e6e76a49aef7c227e568d17
+  data.tar.gz: 1d89273f3c8b6d9cb1046da8fc36b77150625d36c19543d40d85d4b3072d4789
 SHA512:
-  metadata.gz: 68f13e9594755d317676ecca7d96c96414d4c8d1fdf0ce089b8ec3ee5e2f6939ee9a690673b78aad709817ce54f1ede9e409e6b17ad20f95ab812007a56e8ecb
-  data.tar.gz: d12cc1b600eeb02b06c294013a9512d5af5b7518354be7c02ca1e4539f303c429a6173b6961967b50f4fe818cce8ecfdda0d189d1024a69fd03d517124423721
+  metadata.gz: 35072c9f4f9ff1f357ce7fac335f90ec538cbad39a54246cbc9b77327de95e9a87551eddbaf87c8cac98c3d59bde859f4b2bef2d195d8aa968685dffdb44c7d7
+  data.tar.gz: 2dc8c71cff07ffc49a46801e6831c38a9f3884063f28c38b756ab0bdd8c3633414f82660135a682e1bf217417efcfd1bac93b230939074b679ba6d3aba75bd86

data/lib/packwerk_slim_template/slim_converter.rb

@@ -27,6 +27,8 @@ module PackwerkSlimTemplate
   class SlimConverter
     ConversionResult = Struct.new(:ruby_code, :line_mapper, :ruby_snippets)
 
+    CONTROL_FLOW_CONTINUATIONS = %w[elsif else when rescue ensure].freeze
+
     def self.convert(slim_content, file_path:)
       new(slim_content, file_path).convert
     end
@@ -66,20 +68,20 @@ module PackwerkSlimTemplate
       Slim::Parser.new.call(content)
     end
 
-    def extract_ruby_nodes(node, slim_line = 1)
+    def extract_ruby_nodes(node, slim_line = 1, next_node: nil)
       return unless node.is_a?(Array)
 
       case node.first
       when :multi
-        node[1..].each_with_index { |child, idx| extract_ruby_nodes(child, slim_line + idx) }
+        process_sequence(node[1..], slim_line)
       when :slim
-        handle_slim_node(node, slim_line)
+        handle_slim_node(node, slim_line, next_node: next_node)
       when :html
-        node[1..].each_with_index { |child, idx| extract_ruby_nodes(child, slim_line + idx) }
+        process_sequence(node[1..], slim_line)
       end
     end
 
-    def handle_slim_node(node, slim_line)
+    def handle_slim_node(node, slim_line, next_node: nil)
       case node[1]
       when :output
         # [:slim, :output, escape, code, content]
@@ -90,11 +92,7 @@ module PackwerkSlimTemplate
         has_block_content = nested_nodes&.any? { |child| significant_child_node?(child) }
 
         # Process nested content if present
-        if nested_nodes
-          nested_nodes.each_with_index do |child, idx|
-            extract_ruby_nodes(child, slim_line + idx + 1)
-          end
-        end
+        process_sequence(nested_nodes, slim_line + 1) if nested_nodes
 
         add_ruby_snippet("end", slim_line + (nested_nodes&.length || 0)) if has_block_content
       when :control
@@ -105,11 +103,53 @@ module PackwerkSlimTemplate
         # Process nested content (at index 3)
         if node[3]
           extract_ruby_nodes(node[3], slim_line + 1)
+
+          if should_close_control_block?(code, next_node)
+            add_ruby_snippet("end", slim_line)
+          end
         end
+      end
+    end
+
+    def process_sequence(nodes, base_line)
+      return unless nodes
+
+      nodes.each_with_index do |child, idx|
+        next_node = next_significant_node(nodes, idx)
+        extract_ruby_nodes(child, base_line + idx, next_node: next_node)
+      end
+    end
+
+    def next_significant_node(nodes, current_index)
+      return nil unless nodes
 
-        # Add closing 'end' for control structures
-        add_ruby_snippet("end", slim_line)
+      (current_index + 1).upto(nodes.length - 1) do |idx|
+        node = nodes[idx]
+        return node unless newline_node?(node)
       end
+      nil
+    end
+
+    def newline_node?(node)
+      node.is_a?(Array) && node.first == :newline
+    end
+
+    def should_close_control_block?(code, next_node)
+      return false if code.nil? || code.empty?
+
+      !control_flow_continuation?(next_node)
+    end
+
+    def control_flow_continuation?(node)
+      return false unless node.is_a?(Array)
+      return false unless node.first == :slim && node[1] == :control
+
+      keyword = leading_keyword(node[2])
+      CONTROL_FLOW_CONTINUATIONS.include?(keyword)
+    end
+
+    def leading_keyword(code)
+      code.to_s.strip.split(/\s+/, 2).first
     end
 
     def add_ruby_snippet(code, slim_line)

data/lib/packwerk_slim_template/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PackwerkSlimTemplate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packwerk_slim_template
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuji Yaginuma