jekyll-sitemap 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3323b2de7ce9cc47a7b7b19c452d9bf1cef594c
-  data.tar.gz: 01899664a48e7ab22b86c53db7f77eec4a0c2920
+  metadata.gz: bbd83b460e4d33dd73021c31e3f8fa37d22aca7a
+  data.tar.gz: a49f5dcd79358e134a530dadb29ccee683f66960
 SHA512:
-  metadata.gz: b29609605902d444e50be0d6880b0398ee705f8dac8e9d1b8cd8323b58791347c53723a9acc221d32e6e409455eacb7a87b99922c0b9c2031dfe5c5327de4240
-  data.tar.gz: b3c3da0e33fb40c8145270326dc92614134d8cb8684f8eef0f5ab03647cd78542454118b5771a8948777c285ce88e917e99c31048112091949fd5c8c29fae582
+  metadata.gz: b859857ceda6fde59bd558cbb15f4f29e6340caa3a2ff1ee47f60fe4678dfafffa988bfedec4b2cde4a99e0f23972111174cd24902478b3add82117dadf50c1c
+  data.tar.gz: 8456e32b951ce0735cfeee995b215bab90c81e2fbed109d8dbd40dff54cedd5a2c88883557ad30a9891b8a51c952b181a73fceeccb4256c92bf9b287c1ceab3a

data/History.markdown

@@ -1,3 +1,8 @@
+## 0.8.1 / 2015-03-11
+
+  * Do not assume all pages have changed (#35)
+  * Remove duplicated range from regex (#73)
+
 ## 0.8.0 / 2015-02-03
 
   * Call each page `page` in pages loop in `sitemap.xml` for clarity (#64)

data/README.md

@@ -6,7 +6,7 @@
 
 ## Usage
 
-1. Add `gem 'jekyll-sitemap'` to your site's Gemfile
+1. Add `gem 'jekyll-sitemap'` to your site's Gemfile and run `bundle`
 2. Add the following to your site's `_config.yml`:
 
 ```yml

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.8.0"
+  spec.version     = "0.8.1"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/jekyll/jekyll-sitemap"
@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "jekyll", "~> 2.0"
+  spec.add_development_dependency "jekyll-last-modified-at", "0.3.4"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/jekyll-sitemap.rb

@@ -9,6 +9,7 @@ module Jekyll
 
   class JekyllSitemap < Jekyll::Generator
     safe true
+    priority :lowest
 
     # Main plugin action, called by Jekyll-core
     def generate(site)
@@ -52,7 +53,7 @@ module Jekyll
       site_map.content = File.read(source_path)
       site_map.data["layout"] = nil
       site_map.render(Hash.new, @site.site_payload)
-      site_map.output.gsub(/[\s\n]*\n+/, "\n")
+      site_map.output.gsub(/\s*\n+/, "\n")
     end
 
     # Checks if a sitemap already exists in the site source

data/lib/sitemap.xml

@@ -14,14 +14,18 @@
   {% for page in site.html_pages %}{% unless page.sitemap == false %}
   <url>
     <loc>{{ page.url | replace:'/index.html','/' | prepend: site_url }}</loc>
-    <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+    {% if page.last_modified_at %}
+    <lastmod>{{ page.last_modified_at | date_to_xmlschema }}</lastmod>
+    {% endif %}
   </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>{{ doc.url | replace:'/index.html','/' | prepend: site_url }}</loc>
-    <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+    {% if doc.last_modified_at %}
+    <lastmod>{{ doc.last_modified_at | date_to_xmlschema }}</lastmod>
+    {% endif %}
   </url>
   {% endunless %}{% endfor %}
   {% endunless %}{% endfor %}

data/script/cibuild

@@ -1,3 +1,4 @@
 #! /bin/bash
 
 bundle exec rspec
+bundle exec rspec spec/test_jekyll-last-modified-at.rb

data/spec/fixtures/_config.yml

@@ -1,7 +1,9 @@
+timezone: UTC
+
 defaults:
   -
     scope:
       path: ""
       type: page
     values:
-      layout: some_default
+      layout: some_default

data/spec/fixtures/_posts/2015-01-18-jekyll-last-modified-at.md

@@ -0,0 +1,4 @@
+---
+---
+
+Please don't modify this file. It's modified time is important.

data/spec/fixtures/jekyll-last-modified-at/page.html

@@ -0,0 +1,4 @@
+---
+---
+
+This is a page with a modified time.

data/spec/jekyll-sitemap_spec.rb

@@ -29,6 +29,11 @@ describe(Jekyll::JekyllSitemap) do
     expect(File.exist?(dest_dir("sitemap.xml"))).to be_truthy
   end
 
+  it "doesn't have multiple new lines or trailing whitespace" do
+    expect(contents).to_not match /\s+\n/
+    expect(contents).to_not match /\n{2,}/
+  end
+
   it "puts all the pages in the sitemap.xml file" do
     expect(contents).to match /<loc>http:\/\/example\.org\/<\/loc>/
     expect(contents).to match /<loc>http:\/\/example\.org\/some-subfolder\/this-is-a-subpage\.html<\/loc>/

data/spec/test_jekyll-last-modified-at.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'jekyll-last-modified-at'
+
+describe(Jekyll::JekyllSitemap) do
+  let(:overrides) do
+    {
+      "source"      => source_dir,
+      "destination" => dest_dir,
+      "url"         => "http://example.org",
+      "collections" => {
+        "my_collection" => { "output" => true },
+        "other_things"  => { "output" => false }
+      }
+    }
+  end
+  let(:config) do
+    Jekyll.configuration(overrides)
+  end
+  let(:site)     { Jekyll::Site.new(config) }
+  let(:contents) { File.read(dest_dir("sitemap.xml")) }
+  before(:each) do
+    site.process
+  end
+
+  context "with jekyll-last-modified-at" do
+    it "correctly adds the modified time to the posts" do
+      expect(contents).to match  /<loc>http:\/\/example.org\/2015\/01\/18\/jekyll-last-modified-at.html<\/loc>\s+<lastmod>2015-01-19T07:03:38\+00:00<\/lastmod>/
+    end
+
+    it "correctly adds the modified time to the pages" do
+      expect(contents).to match  /<loc>http:\/\/example.org\/jekyll-last-modified-at\/page.html<\/loc>\s+<lastmod>2015-01-19T07:03:38\+00:00<\/lastmod>/
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-last-modified-at
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,15 +111,18 @@ files:
 - spec/fixtures/_posts/2014-03-02-march-the-second.md
 - spec/fixtures/_posts/2014-03-04-march-the-fourth.md
 - spec/fixtures/_posts/2014-05-11-exclude-this-post.md
+- spec/fixtures/_posts/2015-01-18-jekyll-last-modified-at.md
 - spec/fixtures/feeds/atom.xml
 - spec/fixtures/images/hubot.png
 - spec/fixtures/index.html
+- spec/fixtures/jekyll-last-modified-at/page.html
 - spec/fixtures/some-subfolder/exclude-this-page.html
 - spec/fixtures/some-subfolder/test_index.html
 - spec/fixtures/some-subfolder/this-is-a-subfile.html
 - spec/fixtures/some-subfolder/this-is-a-subpage.html
 - spec/jekyll-sitemap_spec.rb
 - spec/spec_helper.rb
+- spec/test_jekyll-last-modified-at.rb
 homepage: https://github.com/jekyll/jekyll-sitemap
 licenses:
 - MIT
@@ -141,12 +158,15 @@ test_files:
 - spec/fixtures/_posts/2014-03-02-march-the-second.md
 - spec/fixtures/_posts/2014-03-04-march-the-fourth.md
 - spec/fixtures/_posts/2014-05-11-exclude-this-post.md
+- spec/fixtures/_posts/2015-01-18-jekyll-last-modified-at.md
 - spec/fixtures/feeds/atom.xml
 - spec/fixtures/images/hubot.png
 - spec/fixtures/index.html
+- spec/fixtures/jekyll-last-modified-at/page.html
 - spec/fixtures/some-subfolder/exclude-this-page.html
 - spec/fixtures/some-subfolder/test_index.html
 - spec/fixtures/some-subfolder/this-is-a-subfile.html
 - spec/fixtures/some-subfolder/this-is-a-subpage.html
 - spec/jekyll-sitemap_spec.rb
 - spec/spec_helper.rb
+- spec/test_jekyll-last-modified-at.rb