jekyll-sitemap 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f026f8fe9011d1fd2618fb41b4a0001c703ee245
-  data.tar.gz: 04f2fc12e13e2c54c6b26a947c153cf61083380a
+  metadata.gz: 1d60832fcf2200f1b281775fd70f65e6771ccc80
+  data.tar.gz: f7480fa2583546629192d7f30f65f065d8612be8
 SHA512:
-  metadata.gz: cea99d7d379e464d831acab88c61e3dc7ab1e86a2636a0eba54ea758ca1f3573d5cf676ce2d65778e16f026d593cf65466d020d61c881517e3038645503430e1
-  data.tar.gz: 36f3207dfada71c6fbcb2e835969420cc24c0c689a30a3588c950f7e40d3af6eb12adfc8c888b0cf34f9a3372aa8a64b436f00068f9f0446c9d5c5b6946207c0
+  metadata.gz: 7b429f24897b934498d57a41cba03a712d4f7af0477e4e2e94690df1c5208e8e1ceac2ea15ef87d236caae4911f37866b463f1538491ebc2350beeff2b9e3038
+  data.tar.gz: 5bd5341beb212f978ca1d82c4928c5b19008de0321b4f031dd7f1c4e8903ae0ad2db3b44d8851477a01faa18a1632ffe2f1e9d9a193c8ca3a8f103c7b6898268

data/History.markdown

@@ -1,5 +1,18 @@
 ## HEAD
 
+### Minor Enhancements
+
+### Bug Fixes
+
+## 0.6.0 / 2014-09-05
+
+### Minor Enhancements
+
+  * Include custom collections in the sitemap. (#30)
+  * Use `post.last_modified_at` for post `<lastmod>` if available (#37)
+
+## 0.5.1 / 2014-07-31
+
 ### Bug Fixes
 
   * Explicitly set sitemap layout to `nil` to avoid warning (#32)

data/README.md

@@ -14,6 +14,14 @@ gems:
   - jekyll-sitemap
 ```
 
+If all gem plugins have the same `priority`, they will be executed in the
+order they are required, generally. Thus, if you have other plugins which
+generate content and store that content in `site.pages`, `site.posts`, or
+`site.collections`, be sure to require `jekyll-sitemap` either *after*
+those other gems if you *want* the sitemap to include the generated
+content, or *before* those other gems if you *don't want* the sitemap to
+include the generated content from the gems. (Programming is *hard*.)
+
 ## Developing locally
 
 Use `script/bootstrap` to bootstrap your local development environment.

data/jekyll-sitemap.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.name        = "jekyll-sitemap"
   spec.summary     = "Automatically generate a sitemap.xml for your Jekyll site."
-  spec.version     = "0.5.1"
+  spec.version     = "0.6.0"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/jekyll/jekyll-sitemap"

data/lib/sitemap.xml

@@ -4,7 +4,11 @@
   {% for post in site.posts %}{% unless post.sitemap == false %}
   <url>
     <loc>{{ site_url }}{{ post.url }}</loc>
+    {% if post.last_modified_at %}
+    <lastmod>{{ post.last_modified_at | date_to_xmlschema }}</lastmod>
+    {% else %}
     <lastmod>{{ post.date | date_to_xmlschema }}</lastmod>
+    {% endif %}
     <priority>0.8</priority>
   </url>
   {% endunless %}{% endfor %}
@@ -16,6 +20,16 @@
     <priority>{% if post.url == "/" or post.url == "/index.html" %}1.0{% else %}0.7{% endif %}</priority>
   </url>
   {% endunless %}{% endfor %}
+  {% for collection in site.collections %}{% unless collection.last.output == false %}
+  {% for doc in collection.last.docs %}{% unless doc.sitemap == false %}
+  <url>
+    <loc>{{ site_url }}{{ doc.url | replace:'index.html','' }}</loc>
+    <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>{% if doc.url == "/" or doc.url == "/index.html" %}1.0{% else %}0.7{% endif %}</priority>
+  </url>
+  {% endunless %}{% endfor %}
+  {% endunless %}{% endfor %}
   {% for file in site.html_files %}
   <url>
     <loc>{{ site_url }}{{ file.path }}</loc>

data/spec/fixtures/_my_collection/custom_permalink.md

@@ -0,0 +1,5 @@
+---
+permalink: /permalink/
+---
+
+# Custom permalink

data/spec/fixtures/_my_collection/custom_permalink_2.md

@@ -0,0 +1,5 @@
+---
+permalink: /permalink/unique_name.html
+---
+
+# Unique html name

data/spec/fixtures/_my_collection/test.html

@@ -0,0 +1,4 @@
+---
+---
+
+This is just a test.

data/spec/fixtures/_other_things/test2.html

@@ -0,0 +1,4 @@
+---
+---
+
+This file shouldn't show up in the sitemap.

data/spec/jekyll-sitemap_spec.rb

@@ -5,7 +5,10 @@ describe(Jekyll::JekyllSitemap) do
     Jekyll.configuration({
       "source"      => source_dir,
       "destination" => dest_dir,
-      "url"         => "http://example.org"
+      "url"         => "http://example.org",
+      "collections" => { "my_collection" => { "output" => true },
+                         "other_things"  => { "output" => false }
+                       }
     })
   end
   let(:site)     { Jekyll::Site.new(config) }
@@ -37,6 +40,24 @@ describe(Jekyll::JekyllSitemap) do
     expect(contents).to match /<loc>http:\/\/example\.org\/2013\/12\/12\/dec-the-second\.html<\/loc>/
   end
 
+  describe "collections" do
+    it "puts all the `output:true` into sitemap.xml" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/my_collection\/test\.html<\/loc>/
+    end
+
+    it "doesn't put all the `output:false` into sitemap.xml" do
+      expect(contents).to_not match /<loc>http:\/\/example\.org\/other_things\/test2\.html<\/loc>/
+    end
+
+    it "remove 'index.html' for directory custom permalinks" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/permalink\/<\/loc>/
+    end
+
+    it "doesn't remove filename for non-directory custom permalinks" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/permalink\/unique_name\.html<\/loc>/
+    end
+  end
+
   it "generates the correct date for each of the posts" do
     expect(contents).to match /<lastmod>2014-03-04T00:00:00(-|\+)\d+:\d+<\/lastmod>/
     expect(contents).to match /<lastmod>2014-03-02T00:00:00(-|\+)\d+:\d+<\/lastmod>/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -89,6 +89,10 @@ files:
 - script/release
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/some_default.html
+- spec/fixtures/_my_collection/custom_permalink.md
+- spec/fixtures/_my_collection/custom_permalink_2.md
+- spec/fixtures/_my_collection/test.html
+- spec/fixtures/_other_things/test2.html
 - spec/fixtures/_posts/2013-12-12-dec-the-second.md
 - spec/fixtures/_posts/2014-03-02-march-the-second.md
 - spec/fixtures/_posts/2014-03-04-march-the-fourth.md
@@ -121,13 +125,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Jekyll site.
 test_files:
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/some_default.html
+- spec/fixtures/_my_collection/custom_permalink.md
+- spec/fixtures/_my_collection/custom_permalink_2.md
+- spec/fixtures/_my_collection/test.html
+- spec/fixtures/_other_things/test2.html
 - spec/fixtures/_posts/2013-12-12-dec-the-second.md
 - spec/fixtures/_posts/2014-03-02-march-the-second.md
 - spec/fixtures/_posts/2014-03-04-march-the-fourth.md