jekyll-sitemap 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8404cca92ec1c9c3be35db7d6c28c5ec99267a3
-  data.tar.gz: 9f1afcf5fe3b94a29c89cda2d4a387d57c7aaa5f
+  metadata.gz: 63fc14261e170a339f8c31cb7944a2dff1701aa0
+  data.tar.gz: 8ac3ae2638c6aaa04aa295bfccb80a6e4dd24c36
 SHA512:
-  metadata.gz: 9480487c055cc658c9765b01b0d4c51448943128ce4be9e10a60103d505d600d69b2b062df34ff2b1c43144f958781130b6cfcacba1056b631ba758cc28eb2a5
-  data.tar.gz: f526d084eafa64b35b79c1c56677a6e7d2fa5b5532f3e848af9cdcb4b2eeddde9875c961b764f1c809a4aea31a3f35dabec2bd6d0b13ca696b991f7bac6ac5c4
+  metadata.gz: 425ab53b7c2f6f6c1348e96cd2549d63f07984319358c0225dd42d8308e7b2c5c845765caa933a3188170abda1bb3b88d46b785bf4d47f15cbc1a50003c568d7
+  data.tar.gz: 09e7485fd2663ed700ecfdd9ded5a05455c5e46a82f82236bfad375c29c96704dd77653e0af11ab76a58f2051dcd2dd541b0288412190d51095e3f154b0a95da

data/History.markdown

@@ -1,3 +1,14 @@
+## 0.7.0 / 2014-12-07
+
+## Minor Enhancements
+
+  * Make `site.baseurl` support more robust (#59)
+  * Add `site.baseurl` to base site URL construction (#50)
+
+## Development Fixes
+
+  * Remove unnecessary spaces and escaping in README (#58)
+
 ## 0.6.3 / 2014-11-11
 
 ## Bug Fixes

data/README.md

@@ -24,7 +24,7 @@ include the generated content from the gems. (Programming is *hard*.)
 
 ## Exclusions
 
-If you would like to exclude specific pages/posts from the sitemap set the 
+If you would like to exclude specific pages/posts from the sitemap set the
 sitemap flag to `false` in the front matter for the page/post.
 
 ```yml
@@ -50,7 +50,6 @@ Use `script/console` to load a local IRB console with the Gem.
 4. Submit a pull request
 
 ## Issues
-1. If the `sitemap.xml` doesn't generate in the `\_site` folder ensure `\_config.yml` doesn't have `safe: true`. That prevents all plugins from working.
-2. If the `sitemap.xml` doesn't generate in the `\_site` folder, ensure that you don't have a sitemap generator plugin in your `_plugin` folder.
-
 
+1. If the `sitemap.xml` doesn't generate in the `_site` folder, ensure `_config.yml` doesn't have `safe: true`. That prevents all plugins from working.
+2. If the `sitemap.xml` doesn't generate in the `_site` folder, ensure that you don't have a sitemap generator plugin in your `_plugin` folder.

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.6.3"
+  spec.version     = "0.7.0"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/jekyll/jekyll-sitemap"

data/lib/sitemap.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {% capture site_url %}{% if site.url %}{{ site.url }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
+  {% capture site_url %}{% if site.url %}{{ site.url | append: site.baseurl }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
   {% for post in site.posts %}{% unless post.sitemap == false %}
   <url>
-    <loc>{{ site_url }}{{ post.url }}</loc>
+    <loc>{{ post.url | prepend: site_url }}</loc>
     {% if post.last_modified_at %}
     <lastmod>{{ post.last_modified_at | date_to_xmlschema }}</lastmod>
     {% else %}
@@ -14,7 +14,7 @@
   {% endunless %}{% endfor %}
   {% for post in site.html_pages %}{% unless post.sitemap == false %}
   <url>
-    <loc>{{ site_url }}{{ post.url | replace:'index.html','' }}</loc>
+    <loc>{{ post.url | replace:'index.html','' | prepend: site_url }}</loc>
     <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
     <changefreq>weekly</changefreq>
     <priority>{% if post.url == "/" or post.url == "/index.html" %}1.0{% else %}0.7{% endif %}</priority>
@@ -23,7 +23,7 @@
   {% 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>
+    <loc>{{ doc.url | replace:'index.html','' | prepend: site_url }}</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>
@@ -32,7 +32,7 @@
   {% endunless %}{% endfor %}
   {% for file in site.html_files %}
   <url>
-    <loc>{{ site_url }}{{ file.path }}</loc>
+    <loc>{{ file.path | prepend: site_url }}</loc>
     <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>
     <priority>0.6</priority>
   </url>

data/spec/jekyll-sitemap_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
 describe(Jekyll::JekyllSitemap) do
-  let(:config) do
-    Jekyll.configuration({
+  let(:overrides) do
+    {
       "source"      => source_dir,
       "destination" => dest_dir,
       "url"         => "http://example.org",
-      "collections" => { "my_collection" => { "output" => true },
-                         "other_things"  => { "output" => false }
-                       }
-    })
+      "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")) }
@@ -84,4 +88,29 @@ describe(Jekyll::JekyllSitemap) do
   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
+
+  context "with a baseurl" do
+    let(:config) do
+      Jekyll.configuration(Jekyll::Utils.deep_merge_hashes(overrides, {"baseurl" => "/bass"}))
+    end
+
+    it "correctly adds the baseurl to the static files" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/some-subfolder\/this-is-a-subfile\.html<\/loc>/
+    end
+
+    it "correctly adds the baseurl to the collections" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/my_collection\/test\.html<\/loc>/
+    end
+
+    it "correctly adds the baseurl to the pages" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/<\/loc>/
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/some-subfolder\/this-is-a-subpage\.html<\/loc>/
+    end
+
+    it "correctly adds the baseurl to the posts" do
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/2014\/03\/04\/march-the-fourth\.html<\/loc>/
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/2014\/03\/02\/march-the-second\.html<\/loc>/
+      expect(contents).to match /<loc>http:\/\/example\.org\/bass\/2013\/12\/12\/dec-the-second\.html<\/loc>/
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll