Merge branch 'main' of github.com:untra/polyglot

Author: untra

lib/jekyll/polyglot/patches/jekyll/site.rb

@@ -178,22 +178,42 @@ def coordinate_documents(docs)
     end
 
     def assignPageRedirects(doc, docs)
+      # Preserve and normalize user-defined redirect_from
+      user_redirects = doc.data['redirect_from'] || []
+      user_redirects = [user_redirects] unless user_redirects.is_a?(Array)
+
+      # Determine document language
+      doc_lang = doc.data['lang'] || derive_lang_from_path(doc) || @default_lang
+
+      # Scope user-defined redirects to document's language if non-default
+      if doc_lang != @default_lang && !user_redirects.empty?
+        user_redirects = user_redirects.map do |redirect_path|
+          # Normalize path to start with /
+          redirect_path = "/#{redirect_path}" unless redirect_path.start_with?('/')
+          # Only prefix if not already prefixed with this language
+          if redirect_path.start_with?("/#{doc_lang}/")
+            redirect_path
+          else
+            "/#{doc_lang}#{redirect_path}"
+          end
+        end
+      end
+
+      # Compute page_id based redirects (cross-language)
+      computed_redirects = []
       pageId = doc.data['page_id']
       if !pageId.nil? && !pageId.empty?
-        redirects = []
-
         docs_with_same_id = docs.select { |dd| dd.data['page_id'] == pageId }
-
-        # For each document with the same page_id
         docs_with_same_id.each do |dd|
-          # Add redirect if it's a different permalink
           if dd.data['permalink'] != doc.data['permalink']
-            redirects << dd.data['permalink']
+            computed_redirects << dd.data['permalink']
           end
         end
-
-        doc.data['redirect_from'] = redirects
       end
+
+      # Merge user-defined and computed redirects, removing duplicates
+      all_redirects = (user_redirects + computed_redirects).uniq
+      doc.data['redirect_from'] = all_redirects unless all_redirects.empty?
     end
 
     def assignPageLanguagePermalinks(doc, docs)

spec/jekyll/polyglot/patches/jekyll/site_spec.rb

@@ -456,6 +456,92 @@
         @site.assignPageRedirects(docs[1], docs)
         expect(docs[1].data['redirect_from']).to include('/a-really-long/permalink/')
       end
+
+      # Tests for user-defined redirect_from handling
+      it 'preserves user-defined redirect_from when page_id is not set' do
+        doc = Jekyll::Document.new('test.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'en'
+          d.data['permalink'] = '/new-url/'
+          d.data['redirect_from'] = ['/old-url/']
+        end
+
+        @site.assignPageRedirects(doc, [doc])
+
+        expect(doc.data['redirect_from']).to eq(['/old-url/'])
+      end
+
+      it 'handles string redirect_from value' do
+        doc = Jekyll::Document.new('test.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'de'
+          d.data['permalink'] = '/de/new-url/'
+          d.data['redirect_from'] = '/old-url/' # String, not array
+        end
+
+        @site.assignPageRedirects(doc, [doc])
+
+        expect(doc.data['redirect_from']).to be_a(Array)
+      end
+
+      it 'should preserve user-defined redirect_from when page_id is set' do
+        doc = Jekyll::Document.new('test.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'en'
+          d.data['page_id'] = 'test-page'
+          d.data['permalink'] = '/new-url/'
+          d.data['redirect_from'] = ['/old-url/', '/legacy/']
+        end
+
+        other_doc = Jekyll::Document.new('test.de.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'de'
+          d.data['page_id'] = 'test-page'
+          d.data['permalink'] = '/de/neue-url/'
+        end
+
+        @site.assignPageRedirects(doc, [doc, other_doc])
+
+        expect(doc.data['redirect_from']).to include('/old-url/')
+        expect(doc.data['redirect_from']).to include('/legacy/')
+        expect(doc.data['redirect_from']).to include('/de/neue-url/')
+      end
+
+      it 'should scope user-defined redirect_from to document language for non-default languages' do
+        doc = Jekyll::Document.new('test.de.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'de'
+          d.data['permalink'] = '/de/neue-url/'
+          d.data['redirect_from'] = ['/alte-url/', '/legacy/']
+        end
+
+        @site.assignPageRedirects(doc, [doc])
+
+        expect(doc.data['redirect_from']).to include('/de/alte-url/')
+        expect(doc.data['redirect_from']).to include('/de/legacy/')
+        expect(doc.data['redirect_from']).not_to include('/alte-url/')
+      end
+
+      it 'should not prefix redirect_from for default language' do
+        doc = Jekyll::Document.new('test.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'en'
+          d.data['permalink'] = '/new-url/'
+          d.data['redirect_from'] = ['/old-url/']
+        end
+
+        @site.assignPageRedirects(doc, [doc])
+
+        expect(doc.data['redirect_from']).to eq(['/old-url/'])
+      end
+
+      it 'should not double-prefix redirects that already have language prefix' do
+        doc = Jekyll::Document.new('test.de.md', site: @site, collection: @collection).tap do |d|
+          d.data['lang'] = 'de'
+          d.data['permalink'] = '/de/neue-url/'
+          d.data['redirect_from'] = ['/de/alte-url/', '/legacy/']
+        end
+
+        @site.assignPageRedirects(doc, [doc])
+
+        expect(doc.data['redirect_from']).to include('/de/alte-url/')
+        expect(doc.data['redirect_from']).to include('/de/legacy/')
+        expect(doc.data['redirect_from']).not_to include('/de/de/alte-url/')
+      end
     end
 
     it 'parses static_href block and outputs correct HTML' do