bridgetown-sitemap 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a214c1c4828f21552166aaf52882263e89c2fc60ff77eddb0dbf68de80cc0ef2
-  data.tar.gz: fd9ec9a4678f59564a8955e0a06307b7722d744bdab00dd570094bd93cf4b82f
+  metadata.gz: b46fc691359d55c28bae04bec5dc2712f995bfeda3b7f9a59d854e9594c61b5d
+  data.tar.gz: b5479047c0ccac7ec071a9aaf3428f9d615935548c8dd9d4d9b28f79769bf33a
 SHA512:
-  metadata.gz: f90353391f700cd3568967b84939aca4ba481dd61c876247bc1f506d987f22f2213d9d6192f7bee56b43f02500218cc9783feb7ca6d9cc38b434b7e3994e99f4
-  data.tar.gz: a701b188efd9fa488c75f54218cd4d8307cfbbce3d42aebad518d2dceaea6523fd61375b9e2606ffac4062fbfdf9058b60dfe24e49e03c5694cf8de585a4eba9
+  metadata.gz: 73dd830ca3fc53df0a3850bb2a1fb6b230f2ebe62202281f019ae4d48b3bb414c5f9531a0bafda378b6cd22a94de62ae0f711be0206768ad3f8c2306c4dd2f34
+  data.tar.gz: b37f746153cf2c39ce6fe774194fc7e09ac5be31615c555c7f26e438bb32343b1783f517dfa07fdb94acebae756ea48690714411e9f44e61db6efbf117943c19

data/.github/workflows/tests.yml

@@ -13,12 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: [2.6.6, 2.7.3, 3.0.1]
+        ruby_version: [2.7.7, 3.0.5, 3.1.3, 3.2.0]
+        bridgetown_version: [1.2.0]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     # Has to be top level to cache properly
     env:
       BUNDLE_JOBS: 3
       BUNDLE_PATH: "vendor/bundle"
+      BRIDGETOWN_VERSION: ${{ matrix.bridgetown_version }}
     steps:
       - uses: actions/checkout@master
       - name: Setup Ruby

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # main
 
+# 2.0.0 / 25-01-2023
+
+* Restrict support to Bridgetown v1.2 and newer.
+* Initialize plugin using the new Ruby DSL in Bridgetown v1.2.
+
+# 1.2.0 / 23-01-2023
+
+* Require Bridgetown 1.0 or newer.
+* Require Ruby 2.7 or newer.
+
 # 1.1.2 / 18-02-2022
 
 * Handle cases where the site is not in a git repo

data/Gemfile

@@ -9,5 +9,5 @@ group :test do
   gem "minitest"
   gem "minitest-profile"
   gem "minitest-reporters"
-  gem "shoulda"
+  gem "minitest-hooks"
 end

data/README.md

@@ -10,26 +10,19 @@ Bridgetown plugin to silently generate a sitemaps.org compliant sitemap for your
 1. Install the plugin with the following command:
 
 ```shell
-bundle add bridgetown-sitemap -g bridgetown_plugins
+bundle add bridgetown-sitemap
 ```
 
-2. Add the following to your site's `bridgetown.config.yml`:
+2. Add the following to your site's `config/initializers.rb`:
 
-```yml
-url: "https://example.com" # the base hostname & protocol for your site
-```
-
-<br>
-
-**This plugin only supports Bridgetown sites that use the [resource content engine](https://www.bridgetownrb.com/docs/resources).**
-
-This can be configured by adding the following line to your site's `bridgetown.config.yml`:
+```ruby
+Bridgetown.configure do |config|
+  config.url = "https://example.com" # the base hostname & protocol for your site
 
-```yml
-content_engine: "resource"
+  init :"bridgetown-sitemap"
+end
 ```
 
-
 ## `<lastmod>` tag
 The `<lastmod>` tag in the `sitemap.xml` will reflect by priority:
 
@@ -46,15 +39,17 @@ sitemap flag to `false` in the front matter for the page.
 sitemap: false
 ```
 
-To exclude multiple files, add a glob config to your `bridgetown.config.yml` file.
+To exclude multiple files, add a glob config to your `config/initializers.rb` file.
 
-```yml
-defaults:
-  -
-    scope:
-      path: "assets/**/*.pdf"
-    values:
-      sitemap: false
+```ruby
+Bridgetown.configure do |config|
+  # ...
+
+  config.defaults << {
+    "scope" => { "path" => "assets/**/*.pdf" },
+    "values" => { "sitemap" => false }
+  }
+end
 ```
 
 ## Testing
@@ -75,4 +70,4 @@ defaults:
 
 Bridgetown Sitemap is released under the [MIT License](https://opensource.org/licenses/MIT).
 
-Copyright © 2021 [Ayush Newatia](https://twitter.com/ayushn21)
+Copyright © 2023 [Ayush Newatia](https://twitter.com/ayushn21)

data/bridgetown-sitemap.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "bridgetown", ">= 0.20", "< 2.0"
+  spec.add_dependency "bridgetown", ">= 1.2.0", "< 2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rubocop-bridgetown", "~> 0.2"
+  spec.add_development_dependency "rubocop-bridgetown"
 end

data/lib/bridgetown-sitemap/builder.rb

@@ -3,17 +3,9 @@
 require "fileutils"
 
 module BridgetownSitemap
-  class UnsupportedContentEngine < StandardError; end
-
   class Builder < Bridgetown::Builder
     def build
       hook :site, :pre_render, priority: :low do |site|
-        unless site.uses_resource?
-          Bridgetown.logger.error "\n\nbridgetown-sitemap only supports the resource content engine"
-          Bridgetown.logger.info "Add `content_engine: 'resource'` to your bridgetown.config.yml\n\n"
-          raise UnsupportedContentEngine
-        end
-
         @site = site
 
         @site.generated_pages << sitemap unless file_exists?("sitemap.xml")

data/lib/bridgetown-sitemap/version.rb

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

data/lib/bridgetown-sitemap.rb

@@ -4,4 +4,6 @@ require "bridgetown"
 require "bridgetown/resource/base"
 require "bridgetown-sitemap/builder"
 
-BridgetownSitemap::Builder.register
+Bridgetown.initializer :"bridgetown-sitemap" do |config|
+  config.builder BridgetownSitemap::Builder
+end

data/lib/sitemap.erb

@@ -18,12 +18,12 @@
   <% end %>
 
   <% site.generated_pages.each do |generated_page| %>
-      <% next if ["sitemap.erb", "robots.liquid"].include? generated_page.name %>
-      <% next if generated_page.data.sitemap == false %>
-      <url>
-        <loc><%= xml_escape absolute_url(generated_page.url) %></loc>
-        <lastmod><%= (generated_page.data.last_modified_at || site.time).localtime.xmlschema %></lastmod>
-      </url>
+    <% next if ["sitemap.erb", "robots.liquid"].include? generated_page.name %>
+    <% next if generated_page.data.sitemap == false %>
+    <url>
+      <loc><%= xml_escape absolute_url(generated_page.url) %></loc>
+      <lastmod><%= (generated_page.data.last_modified_at || site.time).localtime.xmlschema %></lastmod>
+    </url>
   <% end %>
 
   <% page.data.static_files.each do |file| %>

data/test/fixtures/config/initializers.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+Bridgetown.configure do |config|
+  timezone "UTC"
+
+  config.defaults << {
+    "scope" => { "path" => "excluded_files/**/*" },
+    "values" => { "sitemap" => false }
+  }
+
+  init :"bridgetown-sitemap"
+end

data/test/fixtures/plugins/builders/{generated_pages_builder.rb → generated_pages.rb}

@@ -1,4 +1,4 @@
-class GeneratedPagesBuilder < SiteBuilder
+class Builders::GeneratedPages < SiteBuilder
   def build
     generator do
       generated_page = Bridgetown::GeneratedPage.new(site, site.source, "/", "generated_page.erb")

data/test/helper.rb

@@ -2,9 +2,12 @@
 
 require "minitest/autorun"
 require "minitest/reporters"
-require "minitest/profile"
-require "shoulda"
-require_relative "../lib/bridgetown-sitemap"
+require 'minitest/hooks/default'
+require "bridgetown"
+
+Bridgetown.begin!
+
+require File.expand_path("../lib/bridgetown-sitemap", __dir__)
 
 # Report with color.
 Minitest::Reporters.use! [
@@ -14,15 +17,13 @@ Minitest::Reporters.use! [
 ]
 
 class BridgetownSitemap::Test < Minitest::Test
+  extend Minitest::Spec::DSL
+  include Minitest::Hooks
+
   ROOT_DIR = File.expand_path("fixtures", __dir__)
   SOURCE_DIR = File.join(ROOT_DIR, "src")
   DEST_DIR   = File.expand_path("dest", __dir__)
 
-  def build_site
-    @site = Bridgetown::Site.new(config)
-    process_site
-  end
-
   def root_dir(*files)
     File.join(ROOT_DIR, *files)
   end
@@ -38,42 +39,4 @@ class BridgetownSitemap::Test < Minitest::Test
   def make_context(registers = {})
     Liquid::Context.new({}, {}, { :site => site }.merge(registers))
   end
-
-  def config_overrides
-    {}
-  end
-
-  def metadata_overrides
-    {}
-  end
-
-  private
-
-  def process_site
-    @metadata = {
-      "name" => "My Awesome Site",
-      "author" => {
-        "name" => "Ada Lovejoy",
-      }
-    }
-
-    metadata = @metadata.merge(metadata_overrides).to_yaml.sub("---\n", "")
-    File.write(source_dir("_data/site_metadata.yml"), metadata)
-    @site.process
-    FileUtils.rm(source_dir("_data/site_metadata.yml"))
-  end
-
-  def config
-    @config ||= Bridgetown.configuration(Bridgetown::Utils.deep_merge_hashes({
-      "full_rebuild"    => true,
-      "root_dir"        => root_dir,
-      "source"          => source_dir,
-      "destination"     => dest_dir,
-      "content_engine"  => "resource",
-      "url"             => "https://example.com",
-      "quiet"           => true
-      },
-      config_overrides
-    ))
-  end
 end

data/test/test_sitemap.rb

@@ -3,217 +3,216 @@
 require "helper"
 
 class TestSitemap < BridgetownSitemap::Test
+  def prepare_site
+    Bridgetown.reset_configuration!
+    @config = Bridgetown.configuration(
+      "full_rebuild"    => true,
+      "root_dir"        => root_dir,
+      "source"          => source_dir,
+      "destination"     => dest_dir,
+      "url"             => "https://example.com",
+      "quiet"           => true
+    )
+
+    @config.run_initializers! context: :static
+    @site = Bridgetown::Site.new(@config)
+  end
+
+  def process_site
+    @site.process
+  end
 
-  context "rendering the site with defaults" do
-    setup { build_site }
+  describe "rendering the site with defaults" do
+    before(:all) do
+      prepare_site
+      process_site
 
-    should "create the sitemap" do
+      @sitemap = File.read(dest_dir("sitemap.xml"))
+      @robots = File.read(dest_dir("robots.txt"))
+    end
+
+    it "creates the sitemap without a layout" do
       assert File.exist?(dest_dir("sitemap.xml"))
+      refute_match %r!THIS IS MY LAYOUT!, @sitemap
     end
 
-    should "create robots.txt" do
+    it "creates robots.txt without a layout" do
       assert File.exist?(dest_dir("robots.txt"))
+      refute_match %r!\ATHIS IS MY LAYOUT!, @robots
     end
 
-    context "the sitemap" do
-      setup { @sitemap = File.read(dest_dir("sitemap.xml")) }
-
-      should "have no layout" do
-        refute_match %r!THIS IS MY LAYOUT!, @sitemap
-      end
-
-      should "put all the pages in the sitemap" do
-        assert_match %r!<loc>https://example\.com/</loc>!, @sitemap
-        assert_match %r!<loc>https://example\.com/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
-      end
-
-      should "not put files with output: false into the sitemap" do
-        refute_match %r!/other_things/test2\.html</loc>!, @sitemap
-      end
-
-      should "performs URI encoding of site paths" do
-        assert_match %r!<loc>https://example\.com/this%20url%20has%20an%20%C3%BCmlaut</loc>!, @sitemap
-      end
-
-      should "put all the posts in the sitemap" do
-        assert_match %r!<loc>https://example.com/2021/05/06/may-the-sixth/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/2021/03/04/march-the-fourth/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/2021/03/02/march-the-second/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/2019/07/14/last-modified-at/</loc>!, @sitemap
-      end
+    it "puts all the pages in the sitemap" do
+      assert_match %r!<loc>https://example\.com/</loc>!, @sitemap
+      assert_match %r!<loc>https://example\.com/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
+    end
 
-      should "generate the correct date for each of the posts" do
-        assert_match %r!<lastmod>2021-05-06T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
-        assert_match %r!<lastmod>2021-03-04T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
-        assert_match %r!<lastmod>2021-03-02T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
-        assert_match %r!<lastmod>2022-02-18T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
+    it "does not put files with output: false into the sitemap" do
+      refute_match %r!/other_things/test2\.html</loc>!, @sitemap
+    end
 
-        # This doesn't work on CI because it runs a git command which isn't allowed I guess
-        unless ENV["GITHUB_ACTIONS"]
-          assert_match %r!<lastmod>2019-07-14T18:22:00\+00:00</lastmod>!, @sitemap
-        end
-      end
+    it "performs URI encoding of site paths" do
+      assert_match %r!<loc>https://example\.com/this%20url%20has%20an%20%C3%BCmlaut</loc>!, @sitemap
+    end
 
-      should "puts all the static HTML files in the sitemap.xml file" do
-        assert_match %r!<loc>https://example\.com/some-subfolder/this-is-a-subfile\.html</loc>!, @sitemap
-      end
+    it "puts all the posts in the sitemap" do
+      assert_match %r!<loc>https://example.com/2021/05/06/may-the-sixth/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/2021/03/04/march-the-fourth/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/2021/03/02/march-the-second/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/2019/07/14/last-modified-at/</loc>!, @sitemap
+    end
 
-      should "does not include assets or any static files that aren't .html" do
-        refute_match %r!/assets/sample_image\.jpg</loc>!, @sitemap
-        refute_match %r!/feeds/atom\.xml</loc>!, @sitemap
-      end
+    it "generates the correct date for each of the posts" do
+      assert_match %r!<lastmod>2021-05-06T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
+      assert_match %r!<lastmod>2021-03-04T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
+      assert_match %r!<lastmod>2021-03-02T00:00:00(-|\+)\d+:\d+</lastmod>!, @sitemap
 
-      should "include assets or any static files with .xhtml and .htm extensions" do
-        assert_match %r!<loc>https://example\.com/some-subfolder/xhtml\.xhtml</loc>!, @sitemap
-        assert_match %r!<loc>https://example\.com/some-subfolder/htm\.htm</loc>!, @sitemap
+      # This doesn't work on CI because it runs a git command which isn't allowed I guess
+      unless ENV["GITHUB_ACTIONS"]
+        assert_match %r!<lastmod>2019-07-14T18:22:00\+00:00</lastmod>!, @sitemap
       end
+    end
 
-      should "include assets or any static files with .pdf extension" do
-        assert_match %r!<loc>https://example\.com/assets/sample_pdf\.pdf</loc>!, @sitemap
-      end
+    it "puts all the static HTML files in the sitemap.xml file" do
+      assert_match %r!<loc>https://example\.com/some-subfolder/this-is-a-subfile\.html</loc>!, @sitemap
+    end
 
-      should "not include any files named 404.html" do
-        refute_match %r!404.html!, @sitemap
-      end
+    it "does not include assets or any static files that aren't .html" do
+      refute_match %r!/assets/sample_image\.jpg</loc>!, @sitemap
+      refute_match %r!/feeds/atom\.xml</loc>!, @sitemap
+    end
 
-      should "not include any static files that have set 'sitemap: false'" do
-        refute_match %r!/excluded_files/excluded\.pdf!, @sitemap
-      end
+    it "includes assets or any static files with .xhtml and .htm extensions" do
+      assert_match %r!<loc>https://example\.com/some-subfolder/xhtml\.xhtml</loc>!, @sitemap
+      assert_match %r!<loc>https://example\.com/some-subfolder/htm\.htm</loc>!, @sitemap
+    end
 
-      should "not include any static html files that have set 'sitemap: false'" do
-        refute_match %r!/excluded_files/html_file\.html!, @sitemap
-      end
+    it "includes assets or any static files with .pdf extension" do
+      assert_match %r!<loc>https://example\.com/assets/sample_pdf\.pdf</loc>!, @sitemap
+    end
 
-      should "not include posts that have set 'sitemap: false'" do
-        refute_match %r!exclude-this-post!, @sitemap
-      end
+    it "does not include any files named 404.html" do
+      refute_match %r!404.html!, @sitemap
+    end
 
-      should "not include pages that have set 'sitemap: false'" do
-        refute_match %r!exclude-this-page!, @sitemap
-        refute_match %r!about!, @sitemap
-      end
+    it "does not include any static files that have set 'sitemap: false'" do
+      refute_match %r!/excluded_files/excluded\.pdf!, @sitemap
+    end
 
-      should "correctly format timestamps of static files" do
-        assert_match %r!/this-is-a-subfile\.html</loc>\s+<lastmod>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(-|\+)\d{2}:\d{2}</lastmod>!, @sitemap
-      end
+    it "does not include any static html files that have set 'sitemap: false'" do
+      refute_match %r!/excluded_files/html_file\.html!, @sitemap
+    end
 
-      should "include the correct number of items" do
-        assert_equal 18, @sitemap.scan(%r!(?=<url>)!).count
-      end
+    it "does not include posts that have set 'sitemap: false'" do
+      refute_match %r!exclude-this-post!, @sitemap
+    end
 
-      should "include generated pages" do
-        assert_match %r!<loc>https://example.com/generated_page/</loc>!, @sitemap
-      end
+    it "does not include pages that have set 'sitemap: false'" do
+      refute_match %r!exclude-this-page!, @sitemap
+      refute_match %r!about!, @sitemap
     end
 
-    context "the robots.txt" do
-      setup { @robots = File.read(dest_dir("robots.txt")) }
+    it "correctly formats timestamps of static files" do
+      assert_match %r!/this-is-a-subfile\.html</loc>\s+<lastmod>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(-|\+)\d{2}:\d{2}</lastmod>!, @sitemap
+    end
 
-      should "have no layout" do
-        refute_match %r!\ATHIS IS MY LAYOUT!, @robots
-      end
+    it "includes the correct number of items for the sitemap" do
+      assert_equal 18, @sitemap.scan(%r!(?=<url>)!).count
+    end
 
-      should "renders liquid" do
-        assert_match "Sitemap: https://example.com/sitemap.xml", @robots
-      end
+    it "includes generated pages in the sitemap" do
+      assert_match %r!<loc>https://example.com/generated_page/</loc>!, @sitemap
     end
-  end
 
-  context "rendering the site with a baseurl" do
-    setup do
-      config.baseurl = "/baseurl"
-      build_site
+    it "renders liquid in the robots.txt" do
+      assert_match "Sitemap: https://example.com/sitemap.xml", @robots
     end
+  end
 
-    context "the sitemap" do
-      setup { @sitemap = File.read(dest_dir("sitemap.xml")) }
+  describe "rendering the site with a base URL" do
+    before(:all) do
+      prepare_site
+      @config.base_path = "/baseurl"
+      process_site
 
-      should "add the baseurl to the static files" do
-        assert_match %r!<loc>https://example\.com/baseurl/some-subfolder/this-is-a-subfile\.html</loc>!, @sitemap
-      end
+      @sitemap = File.read(dest_dir("sitemap.xml"))
+      @robots = File.read(dest_dir("robots.txt"))
+    end
 
-      should "add the baseurl to the pages" do
-        assert_match %r!<loc>https://example\.com/baseurl/</loc>!, @sitemap
-        assert_match %r!<loc>https://example\.com/baseurl/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
-      end
+    it "adds the baseurl to the static files in the sitemap" do
+      assert_match %r!<loc>https://example\.com/baseurl/some-subfolder/this-is-a-subfile\.html</loc>!, @sitemap
+    end
 
-      should "add the baseurl to the posts" do
-        assert_match %r!<loc>https://example.com/baseurl/2021/05/06/may-the-sixth/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/baseurl/2021/03/04/march-the-fourth/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/baseurl/2021/03/02/march-the-second/</loc>!, @sitemap
-        assert_match %r!<loc>https://example.com/baseurl/2019/07/14/last-modified-at/</loc>!, @sitemap
-      end
+    it "adds the baseurl to the pages in the sitemap" do
+      assert_match %r!<loc>https://example\.com/baseurl/</loc>!, @sitemap
+      assert_match %r!<loc>https://example\.com/baseurl/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
     end
 
-    context "the robots.txt" do
-      setup { @robots = File.read(dest_dir("robots.txt")) }
+    it "adds the baseurl to the posts in the sitemap" do
+      assert_match %r!<loc>https://example.com/baseurl/2021/05/06/may-the-sixth/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/baseurl/2021/03/04/march-the-fourth/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/baseurl/2021/03/02/march-the-second/</loc>!, @sitemap
+      assert_match %r!<loc>https://example.com/baseurl/2019/07/14/last-modified-at/</loc>!, @sitemap
+    end
 
-      should "add contain the baseurl" do
-        assert_match "Sitemap: https://example.com/baseurl/sitemap.xml", @robots
-      end
+    it "adds the baseurl in the robots.txt" do
+      assert_match "Sitemap: https://example.com/baseurl/sitemap.xml", @robots
     end
   end
 
-  context "rendering the site with a url that needs URI encoding" do
-    setup do
-      config.url = "http://ümlaut.example.org"
-      build_site
-    end
+  describe "rendering the site with a url that needs URI encoding" do
+    before(:all) do
+      prepare_site
+      @config.url = "http://ümlaut.example.org"
+      process_site
 
-    context "the sitemap" do
-      setup { @sitemap = File.read(dest_dir("sitemap.xml")) }
+      @sitemap = File.read(dest_dir("sitemap.xml"))
+    end
 
-      should "performs URI encoding of site url" do
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/</loc>!, @sitemap
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/2021/03/04/march-the-fourth/</loc>!, @sitemap
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/2020/04/03/%E9%94%99%E8%AF%AF</loc>!, @sitemap
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/2020/04/02/%E9%94%99%E8%AF%AF</loc>!, @sitemap
-        assert_match %r!<loc>http://xn--mlaut-jva.example.org/2019/04/01/%E9%94%99%E8%AF%AF/</loc>!, @sitemap
-      end
+    it "performs URI encoding of site url" do
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/</loc>!, @sitemap
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/some-subfolder/this-is-a-subpage/</loc>!, @sitemap
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/2021/03/04/march-the-fourth/</loc>!, @sitemap
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/2020/04/03/%E9%94%99%E8%AF%AF</loc>!, @sitemap
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/2020/04/02/%E9%94%99%E8%AF%AF</loc>!, @sitemap
+      assert_match %r!<loc>http://xn--mlaut-jva.example.org/2019/04/01/%E9%94%99%E8%AF%AF/</loc>!, @sitemap
     end
   end
 
-  context "rendering the site with a user defined robots.txt" do
-    setup do
+  describe "rendering the site with a user defined robots.txt" do
+    before(:all) do
+      prepare_site
       File.write(source_dir("robots.txt"), "ROBOT")
-      build_site
+      process_site
+
       @robots = File.read(dest_dir("robots.txt"))
     end
 
-    teardown do
+    after(:all) do
       File.delete(source_dir("robots.txt"))
     end
 
-    should "not overwrite the robots.txt" do
+    it "does not overwrite the robots.txt" do
       assert_match %r!ROBOT!, @robots
       refute_match %r!Sitemap!, @robots
     end
   end
 
-  context "rendering the site with an uncommitted file" do
-    setup do
+  describe "rendering the site with an uncommitted file" do
+    before(:all) do
+      prepare_site
       File.write(source_dir("new.html"), "---\n---")
-      build_site
+      process_site
+
       @sitemap = File.read(dest_dir("sitemap.xml"))
     end
 
-    teardown do
+    after(:all) do
       File.delete(source_dir("new.html"))
     end
 
-    should "include the uncommitted file in the sitemap" do
+    it "includes the uncommitted file in the sitemap" do
       assert_match %r!<loc>https://example.com/new/</loc>!, @sitemap
     end
   end
-
-  context "rendering the site without the resource content engine" do
-    setup { config.delete "content_engine" }
-
-    should "throw an error" do
-      capture_io do
-        assert_raises(BridgetownSitemap::UnsupportedContentEngine) { build_site }
-      end
-    end
-  end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ayush Newatia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -62,17 +62,17 @@ dependencies:
   name: rubocop-bridgetown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
-description: 
+        version: '0'
+description:
 email: ayush@hey.com
 executables: []
 extensions: []
@@ -97,8 +97,8 @@ files:
 - script/fmt
 - script/release
 - script/test
-- test/fixtures/bridgetown.config.yml
-- test/fixtures/plugins/builders/generated_pages_builder.rb
+- test/fixtures/config/initializers.rb
+- test/fixtures/plugins/builders/generated_pages.rb
 - test/fixtures/plugins/site_builder.rb
 - test/fixtures/src/_data/.keep
 - test/fixtures/src/_layouts/default.html
@@ -133,7 +133,7 @@ homepage: https://github.com/ayushn21/bridgetown-sitemap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,20 +141,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Bridgetown site.
 test_files:
-- test/fixtures/bridgetown.config.yml
-- test/fixtures/plugins/builders/generated_pages_builder.rb
+- test/fixtures/config/initializers.rb
+- test/fixtures/plugins/builders/generated_pages.rb
 - test/fixtures/plugins/site_builder.rb
 - test/fixtures/src/_data/.keep
 - test/fixtures/src/_layouts/default.html

data/test/fixtures/bridgetown.config.yml

@@ -1,8 +0,0 @@
-timezone: UTC
-
-defaults:
-  -
-    scope:
-      path: "excluded_files/**/*"
-    values:
-      sitemap: false