bridgetown-sitemap 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d18b78fd58f13369c0d31a8724d4f21c75e808633ce7d6b57e33096c01bc84
-  data.tar.gz: 4d36151297d1fcd9f6e346fba34429e980fc679bb7bf6b9f9238f23a6d361d3c
+  metadata.gz: f7fdbaa3c96e9fc71d97de9a13f7828a2d3aa6cc45c1a396b8157cc3281b3231
+  data.tar.gz: ee8c8d4adc46245e9ed35ab05b4450c319c0fc0c0a9d475a0114c5ef02557296
 SHA512:
-  metadata.gz: 2cf2fcc93b4f2ed10d6ee42d5fb2f3aa0f238116678563a0be1923ba3588d9f09502cc486684a314fb9305ef566f1b56e5c52589340b1067f877181ed28a3d33
-  data.tar.gz: 161b5344a25c2dc540652da65bae69d285cdda829570213408461926f17d876aad6e50fae9d6e9173c3222bc23a7336e3f9302f4acebd99d2b23cc6bc9aac5eb
+  metadata.gz: f3667fc1df4b0e1d8f6e7ddfd404272c56ae996cc7d638a5d2390e9a233849e2a342aae11f7724691b81f3843e9afda18c32c04e5d9ee80c276b1d2529fe2e79
+  data.tar.gz: f4bf13d4337464aa9455b645971e277d4952c5c4554b8dbf7b9aced457b504842299c79af5ec70d063205192d378ce5f16f3e0ba9f804953f657b1b95eb9c59a

data/.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: [2.7.7, 3.0.5, 3.1.3, 3.2.0]
+        bridgetown_version: [1.0.0, 1.1.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
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - name: Test with Rake
+        run: script/cibuild

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # main
 
+# 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
+* Fix an error when the resource has a modified date but not a time
+
 # 1.1.1 / 11-06-2021
 
 * Fix an error when building a site with uncommitted files.

data/README.md

@@ -1,6 +1,9 @@
 # Bridgetown Sitemap Generator Plugin
 
-**_Bridgetown plugin to silently generate a sitemaps.org compliant sitemap for your Bridgetown site_**
+[![Tests](https://github.com/ayushn21/bridgetown-sitemap/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/ayushn21/bridgetown-sitemap/actions/workflows/tests.yml)
+[![Gem Version](https://badge.fury.io/rb/bridgetown-sitemap.svg)](https://badge.fury.io/rb/bridgetown-sitemap)
+
+Bridgetown plugin to silently generate a sitemaps.org compliant sitemap for your Bridgetown site
 
 ## Usage
 
@@ -66,4 +69,10 @@ defaults:
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request
+6. Create a new Pull Request
+
+## License
+
+Bridgetown Sitemap is released under the [MIT License](https://opensource.org/licenses/MIT).
+
+Copyright © 2021 [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.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/resource/base.rb

@@ -4,15 +4,21 @@ module Bridgetown
   module Resource
     class Base
       def sitemap_last_modified_at
-        data.last_modified_at || latest_git_commit_date || date
+        (data.last_modified_at || latest_git_commit_date || date)&.to_time
       end
 
       private
 
       def latest_git_commit_date
+        return nil unless git_repo?
+
         date = `git log -1 --pretty="format:%cI" "#{path}"`
         Time.parse(date) if date.present?
       end
+
+      def git_repo?
+        system "git status", out: File::NULL, err: File::NULL
+      end
     end
   end
 end

data/lib/bridgetown-sitemap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BridgetownSitemap
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 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/fixtures/src/_posts/2022-02-18-feb-the-eighteenth.md

@@ -0,0 +1,5 @@
+---
+date: 2022-02-18
+---
+
+The 18th of February!

data/test/helper.rb

@@ -14,7 +14,7 @@ Minitest::Reporters.use! [
 ]
 
 class BridgetownSitemap::Test < Minitest::Test
-ROOT_DIR = File.expand_path("fixtures", __dir__)
+  ROOT_DIR = File.expand_path("fixtures", __dir__)
   SOURCE_DIR = File.join(ROOT_DIR, "src")
   DEST_DIR   = File.expand_path("dest", __dir__)
 

data/test/test_sitemap.rb

@@ -46,7 +46,11 @@ class TestSitemap < BridgetownSitemap::Test
         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>2019-07-14T18:22:00\+00:00</lastmod>!, @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 "puts all the static HTML files in the sitemap.xml file" do
@@ -93,7 +97,7 @@ class TestSitemap < BridgetownSitemap::Test
       end
 
       should "include the correct number of items" do
-        assert_equal 17, @sitemap.scan(%r!(?=<url>)!).count
+        assert_equal 18, @sitemap.scan(%r!(?=<url>)!).count
       end
 
       should "include generated pages" do
@@ -116,7 +120,7 @@ class TestSitemap < BridgetownSitemap::Test
 
   context "rendering the site with a baseurl" do
     setup do
-      config.baseurl = "/baseurl"
+      config.base_path = "/baseurl"
       build_site
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ayush Newatia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2023-01-23 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.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -62,22 +62,23 @@ 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: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -97,7 +98,7 @@ files:
 - script/release
 - script/test
 - test/fixtures/bridgetown.config.yml
-- test/fixtures/plugins/builders/generated_pages_builder.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
@@ -110,6 +111,7 @@ files:
 - test/fixtures/src/_posts/2021-03-02-march-the-second.md
 - test/fixtures/src/_posts/2021-03-04-march-the-fourth.md
 - test/fixtures/src/_posts/2021-05-06-may-the-sixth.md
+- test/fixtures/src/_posts/2022-02-18-feb-the-eighteenth.md
 - test/fixtures/src/about.html
 - test/fixtures/src/assets/sample_image.jpg
 - test/fixtures/src/assets/sample_pdf.pdf
@@ -131,7 +133,7 @@ homepage: https://github.com/ayushn21/bridgetown-sitemap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,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.4
-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/plugins/builders/generated_pages.rb
 - test/fixtures/plugins/site_builder.rb
 - test/fixtures/src/_data/.keep
 - test/fixtures/src/_layouts/default.html
@@ -165,6 +167,7 @@ test_files:
 - test/fixtures/src/_posts/2021-03-02-march-the-second.md
 - test/fixtures/src/_posts/2021-03-04-march-the-fourth.md
 - test/fixtures/src/_posts/2021-05-06-may-the-sixth.md
+- test/fixtures/src/_posts/2022-02-18-feb-the-eighteenth.md
 - test/fixtures/src/about.html
 - test/fixtures/src/assets/sample_image.jpg
 - test/fixtures/src/assets/sample_pdf.pdf