Extend url path class to also handle wildcard params

Allow the setting of wildcard parameter in url_path class. It is using the already given optional_params attribute and the previous addition to the urlname method to add parameter to the wildcard url.

Author: kulturbande

app/models/alchemy/page/url_path.rb

@@ -24,7 +24,7 @@ def initialize(page, optional_params = {})
         @page = page
         @language = @page.language
         @site = @language.site
-        @optional_params = optional_params
+        @wildcard_params, @query_params = split_params(optional_params)
       end
 
       def call
@@ -36,9 +36,9 @@ def call
           page_path_with_leading_slash
         end
 
-        if @optional_params.present?
+        if @query_params.present?
           uri = URI(path)
-          uri.query = @optional_params.to_query
+          uri.query = @query_params.to_query
           uri.to_s
         else
           path
@@ -64,7 +64,13 @@ def language_path
       end
 
       def page_path
-        "#{root_path}#{@page.urlname}"
+        "#{root_path}#{@page.urlname(**@wildcard_params)}"
+      end
+
+      def split_params(params)
+        return [{}, params] unless @page.has_wildcard_url? && params.present?
+
+        params.partition { |key, _| @page.wildcard_url.param_keys.include?(key) }.map(&:to_h)
       end
 
       def root_path

spec/models/alchemy/page/url_path_spec.rb

@@ -76,6 +76,28 @@
     end
   end
 
+  context "with wildcard params" do
+    let(:parent) { create(:alchemy_page, name: "Products") }
+    let(:page) { create(:alchemy_page, parent: parent, name: "Product Detail", page_layout: "product_detail") }
+
+    subject(:url) { described_class.new(page, {id: 42}).call }
+
+    it "substitutes wildcards in the urlname" do
+      is_expected.to eq("/products/42")
+    end
+  end
+
+  context "with wildcard and query params mixed" do
+    let(:parent) { create(:alchemy_page, name: "Products") }
+    let(:page) { create(:alchemy_page, parent: parent, name: "Product Detail", page_layout: "product_detail") }
+
+    subject(:url) { described_class.new(page, {id: 42, page: 2}).call }
+
+    it "substitutes wildcards and appends remaining params as query string" do
+      is_expected.to eq("/products/42?page=2")
+    end
+  end
+
   context "mounted on a non-root path" do
     let(:page) do
       create(:alchemy_page)