Change stylesheet_link_tag and javascript_include_tag to extract options from sources

Author: rafaelfranca

lib/propshaft/helper.rb

@@ -70,7 +70,9 @@ def compute_asset_path(path, options = {})
     #
     #   stylesheet_link_tag :all    # All stylesheets in load path
     #   stylesheet_link_tag :app    # Only app/assets stylesheets
-    def stylesheet_link_tag(*sources, **options)
+    def stylesheet_link_tag(*sources)
+      options = sources.extract_options!
+
       case sources.first
       when :all
         sources = all_stylesheets_paths
@@ -95,7 +97,9 @@ def stylesheet_link_tag(*sources, **options)
     #   javascript_include_tag "application", integrity: true
     #   # => <script src="/assets/application-abc123.js"
     #   #           integrity="sha256-xyz789..."></script>
-    def javascript_include_tag(*sources, **options)
+    def javascript_include_tag(*sources)
+      options = sources.extract_options!
+
       _build_asset_tags(sources, options, :javascript) { |source, opts| super(source, opts) }
     end
 

test/propshaft/helper_test.rb

@@ -131,6 +131,25 @@ class Propshaft::HelperTest < ActionView::TestCase
     HTML
   end
 
+  test "stylesheet_link_tag should extract options from the sources" do
+    result = stylesheet_link_tag(
+      "hello_world",
+      {
+        media: "print",
+        data: { turbo_track: "reload" }
+      }
+    )
+
+    assert_dom_equal(<<~HTML, result)
+      <link
+        rel="stylesheet"
+        href="/assets/hello_world-4137140a.css"
+        media="print"
+        data-turbo-track="reload"
+      />
+    HTML
+  end
+
   test "javascript_include_tag with integrity in secure context" do
     request.headers["HTTPS"] = "on"
 
@@ -200,6 +219,24 @@ class Propshaft::HelperTest < ActionView::TestCase
     HTML
   end
 
+  test "javascript_include_tag should extract options from the sources" do
+    result = javascript_include_tag(
+      "hello_world",
+      {
+        defer: true,
+        data: { turbo_track: "reload" }
+      }
+    )
+
+    assert_dom_equal(<<~HTML, result)
+      <script
+        src="/assets/hello_world-888761f8.js"
+        defer="defer"
+        data-turbo-track="reload"
+      ></script>
+    HTML
+  end
+
   test "all_stylesheets_paths returns array of CSS asset paths" do
     paths = all_stylesheets_paths