jekyll-sitemap 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1110ef542fab726b7032d52053b68ae90742854f
-  data.tar.gz: 4bafdb06ce3f32c9245e1d7965cdc78b5d26108d
+  metadata.gz: 897954146a4adc0c9cdadd4c31f9288de94159bc
+  data.tar.gz: 7977f8c2cd010bf15fa9aaa087d8e71cb66f9c30
 SHA512:
-  metadata.gz: dcd77e467aa2586383c36d9b190134f434903f0225fa9c2acd3712936d1c5970ece83ab07c8910249249bf7fc6e74343aac8c6b1bb99b11693516f8896d090cb
-  data.tar.gz: 711f197dc725f4c81505b837d54ea9a45ccf96ab4ed55d8602c21688d5b157ad13286c51a5916c8416166c9cc5f4dd4ba3cd9e274e89037fc82ba32ffa356d98
+  metadata.gz: 00c473c17dd68f6fb43edffbec8fd092f21fb4f3d01f58432d3b2c72b176d1d7426f61274f8b57269d2f7730b727e43cf20ce7f6998f5278347b577eea2a6135
+  data.tar.gz: d1378177010aa6cf2808d020c10ea7c2c7fed2c27793e900eb3c805dae48cb4f0c305c8fa71d78cb56fdeda8882426a549b9eb5c10110f9e393a572e10a7a1eb

data/.travis.yml

@@ -16,6 +16,7 @@ env:
 branches:
   only:
   - master
+  - /^v\d+\.\d+\.\d+/
 git:
   depth: 1000
 install:

data/History.markdown

@@ -1,3 +1,10 @@
+## 1.1.0 / 2017-04-10
+
+### Minor Enhancements
+
+  * escape& (#162)
+  * feat: remove 404 pages from the sitemap. closes #113 (#164)
+
 ## 1.0.0 / 2017-01-06
 
   * No new changes

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/jekyll-sitemap.gemspec

@@ -3,15 +3,15 @@
 Gem::Specification.new do |spec|
   spec.name        = "jekyll-sitemap"
   spec.summary     = "Automatically generate a sitemap.xml for your Jekyll site."
-  spec.version     = "1.0.0"
+  spec.version     = "1.1.0"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/jekyll/jekyll-sitemap"
   spec.licenses    = ["MIT"]
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(%r!^bin/!) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
   spec.require_paths = ["lib"]
 
   spec.add_dependency "jekyll", "~> 3.3"

data/lib/sitemap.xml

@@ -8,7 +8,7 @@
     {% assign docs = collection.docs | where_exp:'doc','doc.sitemap != false' %}
     {% for doc in docs %}
       <url>
-        <loc>{{ doc.url | replace:'/index.html','/' | absolute_url }}</loc>
+        <loc>{{ doc.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
         {% if doc.last_modified_at or doc.date %}
           <lastmod>{{ doc.last_modified_at | default: doc.date | date_to_xmlschema }}</lastmod>
         {% endif %}
@@ -16,19 +16,20 @@
     {% endfor %}
   {% endfor %}
 
-  {% assign pages = site.html_pages | where_exp:'doc','doc.sitemap != false' %}
+  {% assign pages = site.html_pages | where_exp:'doc','doc.sitemap != false' | where_exp:'doc','doc.url != "/404.html"' %}
   {% for page in pages %}
     <url>
-      <loc>{{ page.url | replace:'/index.html','/' | absolute_url }}</loc>
+      <loc>{{ page.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
       {% if page.last_modified_at %}
         <lastmod>{{ page.last_modified_at | date_to_xmlschema }}</lastmod>
       {% endif %}
     </url>
   {% endfor %}
 
-  {% for file in page.static_files %}
+  {% assign static_files = page.static_files | where_exp:'page','page.name != "404.html"' %}
+  {% for file in static_files %}
     <url>
-      <loc>{{ file.path | absolute_url }}</loc>
+      <loc>{{ file.path | absolute_url | xml_escape }}</loc>
       <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>
     </url>
   {% endfor %}

data/spec/fixtures/404.md

@@ -0,0 +1,4 @@
+---
+---
+
+404. That's an error.

data/spec/fixtures/static_files/404.html

@@ -0,0 +1 @@
+404. That's an error.

data/spec/jekyll-sitemap_spec.rb

@@ -97,6 +97,10 @@ describe(Jekyll::JekyllSitemap) do
     expect(contents).to match %r!/static_files/test.pdf!
   end
 
+  it "does not include any static files named 404.html" do
+    expect(contents).not_to match %r!/static_files/404.html!
+  end
+
   it "does not include posts that have set 'sitemap: false'" do
     expect(contents).not_to match /\/exclude-this-post\.html<\/loc>/
   end
@@ -105,6 +109,10 @@ describe(Jekyll::JekyllSitemap) do
     expect(contents).not_to match /\/exclude-this-page\.html<\/loc>/
   end
 
+  it "does not include the 404 page" do
+    expect(contents).not_to match /\/404\.html<\/loc>/
+  end
+
   it "correctly formats timestamps of static files" do
     expect(contents).to match /\/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>/
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -119,6 +119,7 @@ files:
 - script/cibuild
 - script/console
 - script/release
+- spec/fixtures/404.md
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/some_default.html
 - spec/fixtures/_my_collection/custom_permalink.md
@@ -144,6 +145,7 @@ files:
 - spec/fixtures/some-subfolder/this-is-a-subfile.html
 - spec/fixtures/some-subfolder/this-is-a-subpage.html
 - spec/fixtures/some-subfolder/xhtml.xhtml
+- spec/fixtures/static_files/404.html
 - spec/fixtures/static_files/test.pdf
 - spec/jekyll-sitemap_spec.rb
 - spec/spec_helper.rb
@@ -168,11 +170,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Jekyll site.
 test_files:
+- spec/fixtures/404.md
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/some_default.html
 - spec/fixtures/_my_collection/custom_permalink.md
@@ -198,6 +201,7 @@ test_files:
 - spec/fixtures/some-subfolder/this-is-a-subfile.html
 - spec/fixtures/some-subfolder/this-is-a-subpage.html
 - spec/fixtures/some-subfolder/xhtml.xhtml
+- spec/fixtures/static_files/404.html
 - spec/fixtures/static_files/test.pdf
 - spec/jekyll-sitemap_spec.rb
 - spec/spec_helper.rb