bridgetown-sitemap 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 549a10754e46862c85bcf21f63d605644f861939245598093152af4862009c92
-  data.tar.gz: 70e6268b85f3448c415a1b6acb7c4aa27bf9f3ab5b83b7cc3a778b8b18d4c7b6
+  metadata.gz: 8f00894900e60c0fffd2a423628cb6fc74b4c14c34e9d4af61b720768bd5975e
+  data.tar.gz: 362241749b5e761fe4d053033d7e55f8836ddb9abf44f6fc0ba24cb7968ae41a
 SHA512:
-  metadata.gz: 025d45947ead07e7a9c9f6a6cad5b67748d5442b69fb4c42f16fcbf87bd1bd47a79ef2a27dda6536bb052aa207f1daff66e52036be22b0652c57dc4729db1637
-  data.tar.gz: '07790cc195ceeebcd204456cf21df88e22b8724256a247c4fd89f9eef1937b9d3a1a7f9c8e44ade8539a676e1ffe76aa45d26a202d59d8a383269f93b1da26be'
+  metadata.gz: 4e94ff81de31e076f67ceee0027c3ddb087e64d2bac1c5bf6beba746d89fa3a7f7e2947168a8de0957d6f61fe63b5a00109f023ad94fd38585e3ef19b6147d72
+  data.tar.gz: 01e2c19296e749abe40df77f5e51bb5ca0a6592a3d0e36b29a288652368619c406fdde24efbd6c495cb84bd13430230933b756283ad119e4880c29aab99636ab

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # main
 
+# 3.0.3 / 15-04-2026
+
+* Fix resource and generated page grouping for same-name pages in different paths
+* Cache git_repo? check at the class level
+
 # 3.0.2 / 25-03-2026
 
 * Fix the accidental inclusion of a sitemap XSL stylesheet within the sitemap itself

data/lib/bridgetown-sitemap/git_inspector.rb

@@ -24,7 +24,13 @@ module BridgetownSitemap
       end
 
       def git_repo?
-        system "git status", out: File::NULL, err: File::NULL
+        self.class.git_repo?
+      end
+
+      def self.git_repo?
+        return @git_repo if defined?(@git_repo)
+
+        @git_repo = system("git rev-parse --is-inside-work-tree", out: File::NULL, err: File::NULL)
       end
 
       def cache

data/lib/bridgetown-sitemap/grouped_generated_pages.rb

@@ -3,8 +3,15 @@
 module BridgetownSitemap
   class GroupedGeneratedPages
     def initialize(generated_pages)
-      @grouped_generated_pages = \
-        generated_pages.group_by { |page| page.data.slug }.values
+      @grouped_generated_pages = generated_pages.group_by do |page|
+        url = if page.respond_to?(:original_resource) && page.original_resource
+          page.original_resource.relative_url.to_s
+        else
+          page.url.to_s
+        end
+        locale = page.data.locale.to_s
+        locale.empty? ? url : url.sub("/#{locale}/", "/")
+      end.values
     end
 
     def each(locale:, &block)

data/lib/bridgetown-sitemap/grouped_resources.rb

@@ -4,7 +4,10 @@ module BridgetownSitemap
   class GroupedResources
     def initialize(resources)
       @grouped_resources = resources.group_by do |resource|
-         [resource.data.slug, resource.date]
+        url = resource.relative_url.to_s
+        locale = resource.data.locale.to_s
+        base_url = locale.empty? ? url : url.sub("/#{locale}/", "/")
+        [base_url, resource.date]
       end.values
     end
 

data/lib/bridgetown-sitemap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BridgetownSitemap
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/sitemap.erb

@@ -49,7 +49,7 @@
       <url>
         <loc><%= xml_escape absolute_url(default.url) %></loc>
 
-        <% group.each do |page| %>
+        <% group.reject { |p| p.respond_to?(:original_resource) && p.original_resource && p.url != default.url }.each do |page| %>
           <% if !page.data.locale || site.locale == page.data.locale %>
             <xhtml:link rel="alternate" hreflang="x-default" href="<%= xml_escape absolute_url(page.url) %>" />
           <% end %>

data/test/fixtures/config/initializers.rb

@@ -10,6 +10,7 @@ Bridgetown.configure do |config|
 
   available_locales [ :en, :ru ]
   default_locale :en
+  pagination { enabled true }
 
   init :"bridgetown-sitemap"
 end

data/test/fixtures/plugins/builders/generated_pages.rb

@@ -10,8 +10,13 @@ class Builders::GeneratedPages < SiteBuilder
       generated_page_ru.data.layout = "default"
       generated_page_ru.data.locale = :ru
 
+      generated_page_alt = Bridgetown::GeneratedPage.new(site, site.source, "/alt", "generated_page.erb")
+      generated_page_alt.content = "<%= 'alt generated page'.capitalize %>"
+      generated_page_alt.data.layout = "default"
+
       site.generated_pages << generated_page
       site.generated_pages << generated_page_ru
+      site.generated_pages << generated_page_alt
     end
   end
 end

data/test/fixtures/src/blog/index.html

@@ -0,0 +1,8 @@
+---
+layout: default
+pagination:
+  collection: posts
+  per_page: 4
+---
+
+<h1>Blog Index</h1>

data/test/test_sitemap.rb

@@ -120,7 +120,26 @@ class TestSitemap < BridgetownSitemap::Test
     end
 
     it "includes the correct number of items for the sitemap" do
-      assert_equal 20, @sitemap.scan(%r!(?=<url>)!).count
+      assert_equal 22, @sitemap.scan(%r!(?=<url>)!).count
+    end
+
+    it "does not merge pages with the same slug but different paths" do
+      assert_match %r!<loc>https://example\.com/</loc>!, @sitemap
+      assert_match %r!<loc>https://example\.com/blog/</loc>!, @sitemap
+    end
+
+    it "does not merge generated pages with the same name but different paths" do
+      assert_match %r!<loc>https://example\.com/generated_page/</loc>!, @sitemap
+      assert_match %r!<loc>https://example\.com/alt/generated_page/</loc>!, @sitemap
+    end
+
+    it "collapses pagination pages with their original page" do
+      assert_match %r!<loc>https://example\.com/blog/</loc>!, @sitemap
+      refute_match %r!<loc>https://example\.com/blog/page/!, @sitemap
+    end
+
+    it "does not list pagination pages as hreflang alternates" do
+      refute_match %r!hreflang.*blog/page/!, @sitemap
     end
 
     it "includes generated pages in the sitemap" do
@@ -242,6 +261,20 @@ class TestSitemap < BridgetownSitemap::Test
     end
   end
 
+  describe "GitInspector" do
+    it "caches the git_repo? check at the class level" do
+      BridgetownSitemap::GitInspector.remove_instance_variable(:@git_repo) if
+        BridgetownSitemap::GitInspector.instance_variable_defined?(:@git_repo)
+
+      result = BridgetownSitemap::GitInspector.git_repo?
+
+      assert BridgetownSitemap::GitInspector.instance_variable_defined?(:@git_repo),
+        "Expected git_repo? result to be cached on the class"
+      assert_equal result, BridgetownSitemap::GitInspector.git_repo?,
+        "Expected cached result to be returned on subsequent calls"
+    end
+  end
+
   describe "rendering the site with custom URLs" do
     before(:all) do
       prepare_site
@@ -257,4 +290,5 @@ class TestSitemap < BridgetownSitemap::Test
       assert_match %r!<changefreq>weekly</changefreq>!, @sitemap
     end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-sitemap
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ayush Newatia
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -103,6 +103,7 @@ files:
 - test/fixtures/src/about.html
 - test/fixtures/src/assets/sample_image.jpg
 - test/fixtures/src/assets/sample_pdf.pdf
+- test/fixtures/src/blog/index.html
 - test/fixtures/src/excluded_files/excluded_pdf.pdf
 - test/fixtures/src/excluded_files/html_file.html
 - test/fixtures/src/feeds/atom.xml
@@ -160,6 +161,7 @@ test_files:
 - test/fixtures/src/about.html
 - test/fixtures/src/assets/sample_image.jpg
 - test/fixtures/src/assets/sample_pdf.pdf
+- test/fixtures/src/blog/index.html
 - test/fixtures/src/excluded_files/excluded_pdf.pdf
 - test/fixtures/src/excluded_files/html_file.html
 - test/fixtures/src/feeds/atom.xml