bridgetown-sitemap 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d18b78fd58f13369c0d31a8724d4f21c75e808633ce7d6b57e33096c01bc84
-  data.tar.gz: 4d36151297d1fcd9f6e346fba34429e980fc679bb7bf6b9f9238f23a6d361d3c
+  metadata.gz: a214c1c4828f21552166aaf52882263e89c2fc60ff77eddb0dbf68de80cc0ef2
+  data.tar.gz: fd9ec9a4678f59564a8955e0a06307b7722d744bdab00dd570094bd93cf4b82f
 SHA512:
-  metadata.gz: 2cf2fcc93b4f2ed10d6ee42d5fb2f3aa0f238116678563a0be1923ba3588d9f09502cc486684a314fb9305ef566f1b56e5c52589340b1067f877181ed28a3d33
-  data.tar.gz: 161b5344a25c2dc540652da65bae69d285cdda829570213408461926f17d876aad6e50fae9d6e9173c3222bc23a7336e3f9302f4acebd99d2b23cc6bc9aac5eb
+  metadata.gz: f90353391f700cd3568967b84939aca4ba481dd61c876247bc1f506d987f22f2213d9d6192f7bee56b43f02500218cc9783feb7ca6d9cc38b434b7e3994e99f4
+  data.tar.gz: a701b188efd9fa488c75f54218cd4d8307cfbbce3d42aebad518d2dceaea6523fd61375b9e2606ffac4062fbfdf9058b60dfe24e49e03c5694cf8de585a4eba9

data/.github/workflows/tests.yml

@@ -0,0 +1,30 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: [2.6.6, 2.7.3, 3.0.1]
+    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"
+    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,10 @@
 # main
 
+# 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/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.1.2"
 end

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,12 @@ 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
+        assert_match %r!<lastmod>2022-02-18T00:00:00(-|\+)\d+:\d+</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 +98,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ayush Newatia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -78,6 +78,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -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
@@ -146,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Bridgetown site.
@@ -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