Change snippet interpolation in ingredients logic

Author: trinitytakei

app/models/ingredient.rb

@@ -63,6 +63,11 @@ def dependencies_satisfied?(recipe)
     requires.all? { |dep| recipe.ingredients.any? { |i| i.name == dep } }
   end
 
+  def template_with_interpolated_snippets
+    interpolate_snippets
+    template_content
+  end
+
   def configuration_for(configuration)
     # Validate configuration against configures_with schema
     configures_with.each do |key, validator|
@@ -106,6 +111,18 @@ def to_commit_message
     COMMIT_MESSAGE
   end
 
+  def template_with_interpolated_snippets
+    return template_content if snippets.blank? || template_content.blank?
+
+    template_content.tap do |content|
+      snippets.each_with_index do |snippet, index|
+        placeholder = "{{#{index + 1}}}"
+        content.gsub!(placeholder, to_literal(snippet, index))
+      end
+    end
+  end
+
+
   private
 
   def cleanup_ui_elements
@@ -125,7 +142,27 @@ def process_snippets
 
     self.snippets ||= []
     filtered_snippets = new_snippets.reject(&:blank?)
-    # Only add snippets that aren't already in the list
+
     self.snippets += filtered_snippets.reject { |s| snippets.include?(s) }
   end
+
+  def to_literal(snippet, index)
+    if snippet.include?("\n")
+      if snippet.start_with?("<<")
+        snippet
+      else
+        <<~SNIPPET
+        <<~SNIPPET_#{index+1}
+        #{snippet}
+        SNIPPET_#{index+1}
+        SNIPPET
+      end
+    else
+      if snippet.start_with?("'") || snippet.start_with?('"')
+        snippet
+      else
+        "\"#{snippet}\""
+      end
+    end
+  end
 end

app/services/data_repository_service.rb

@@ -44,7 +44,7 @@ def initialize_repository
   def write_ingredient(ingredient, repo_name:)
     tree_items = []
 
-    template_content = ingredient.template_content
+    template_content = ingredient.template_with_interpolated_snippets
 
     tree_items << {
       path: github_template_path(ingredient),

test/models/ingredient_test.rb

@@ -266,4 +266,46 @@ class IngredientTest < ActiveSupport::TestCase
     # Snippets should remain unchanged
     assert_equal [ "existing snippet" ], ingredient.snippets
   end
+
+  test "interpolates snippets into template content" do
+    ingredient = Ingredient.new(
+      name: "Test Ingredient",
+      category: "Testing",
+      template_content: 'say "This is my template"\ncreate_file "myfile.rb", {{1}}\ncreate_file "my_other_file.rb", {{2}}',
+      created_by: users(:john)
+    )
+    ingredient.new_snippets = [ '"foo"', '"bar"' ]
+    ingredient.save!
+
+    expected_content = 'say "This is my template"\ncreate_file "myfile.rb", "foo"\ncreate_file "my_other_file.rb", "bar"'
+    assert_equal expected_content, ingredient.template_content
+  end
+
+  test "handles missing snippets gracefully" do
+    ingredient = Ingredient.new(
+      name: "Test Ingredient",
+      category: "Testing",
+      template_content: 'say "This is my template"\ncreate_file "myfile.rb", {{1}}\ncreate_file "my_other_file.rb", {{2}}',
+      created_by: users(:john)
+    )
+    ingredient.new_snippets = [ '"foo"' ]  # Only one snippet provided
+    ingredient.save!
+
+    # The second placeholder should remain unchanged
+    expected_content = 'say "This is my template"\ncreate_file "myfile.rb", "foo"\ncreate_file "my_other_file.rb", {{2}}'
+    assert_equal expected_content, ingredient.template_content
+  end
+
+  test "handles template without placeholders" do
+    ingredient = Ingredient.new(
+      name: "Test Ingredient",
+      category: "Testing",
+      template_content: 'say "This is my template"',
+      created_by: users(:john)
+    )
+    ingredient.new_snippets = [ '"foo"', '"bar"' ]
+    ingredient.save!
+
+    assert_equal 'say "This is my template"', ingredient.template_content
+  end
 end

test/system/ingredients_test.rb

@@ -97,18 +97,4 @@ class IngredientsTest < ApplicationSystemTestCase
 
     assert_text "Ingredient was successfully deleted"
   end
-
-  test "autosaving ingredient changes" do
-    visit edit_ingredient_path(@ingredient)
-
-    fill_in "Name", with: "Autosaved Ingredient"
-
-    # Wait for autosave
-    sleep 2
-
-    # Reload the page
-    visit edit_ingredient_path(@ingredient)
-
-    assert_field "Name", with: "Autosaved Ingredient"
-  end
 end