use Rack::Util for parsing and building URLs

josefarias · Jan 1, 2025 · 40b8f47 · 40b8f47
1 parent a2d55df
commit 40b8f47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/hotwire_combobox/helper.rb b/lib/hotwire_combobox/helper.rb
@@ -115,8 +115,8 @@ def hw_first_page?
 
       def hw_uri_with_params(url_or_path, **params)
         URI.parse(url_or_path).tap do |url_or_path|
-          query = Rack::Utils.parse_query(url_or_path.query || "").merge(params.compact_blank.stringify_keys)
-          url_or_path.query = URI.encode_www_form query
+          query = Rack::Utils.parse_nested_query(url_or_path.query || "").merge(params.compact_blank.stringify_keys)
+          url_or_path.query = Rack::Utils.build_nested_query query
         end.to_s
       rescue URI::InvalidURIError
         url_or_path

diff --git a/test/helpers/hotwire_combobox/helper_test.rb b/test/helpers/hotwire_combobox/helper_test.rb
@@ -144,7 +144,7 @@ class HotwireCombobox::HelperTest < ApplicationViewTestCase
 
     html = hw_paginated_combobox_options [], next_page: 2
 
-    assert_attrs html, tag_name: "turbo-frame", src: "/foo?ary=1&ary=2&page=2&format=turbo_stream"
+    assert_attrs CGI.unescape(html), tag_name: "turbo-frame", src: "/foo?ary[]=1&ary[]=2&page=2&format=turbo_stream"
   end
 
   test "single repeating character values" do