Merge pull request rails#53907 from p8/guides/fix-canonical

Fix canonical_url in guides

Author: rafaelfranca

guides/rails_guides/generator.rb

@@ -193,8 +193,7 @@ def generate_guide(guide, output_file)
           language:      @language,
           direction:     @direction,
           uuid:          SecureRandom.uuid,
-          digest_paths:  @digest_paths,
-          canonical_url: canonical_url(output_file)
+          digest_paths:  @digest_paths
         )
         view.extend(Helpers)
 
@@ -225,12 +224,6 @@ def generate_guide(guide, output_file)
         end if !dry_run?
       end
 
-      def canonical_url(path)
-        url = "https://guides.rubyonrails.org/"
-        url += path unless path == "index.html"
-        url
-      end
-
       def warn_about_broken_links(html)
         anchors = extract_anchors(html)
         check_fragment_identifiers(html, anchors)

guides/rails_guides/helpers.rb

@@ -47,6 +47,12 @@ def docs_for_menu(position = nil)
       end
     end
 
+    def canonical_url(path)
+      url = "https://guides.rubyonrails.org/"
+      url += path unless path == "index.html"
+      url
+    end
+
     def code(&block)
       c = capture(&block)
       content_tag(:code, c)

guides/source/layout.html.erb

@@ -13,7 +13,7 @@
 
   <link rel="apple-touch-icon" href="images/icon.png">
 
-  <link rel="canonical" href="<%= @canonical %>">
+  <link rel="canonical" href="<%= canonical_url(@path) %>">
 
   <script src="<%= digest_path('javascripts/@hotwired--turbo.js') %>" data-turbo-track="reload"></script>
   <script src="<%= digest_path('javascripts/clipboard.js') %>" data-turbo-track="reload"></script>