jekyll-sitemap 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f132cc4e250a79b3f479249b8d069d1f390bfd8a
-  data.tar.gz: d6762c431548f94b50bae4b3856ad1c83b8088fd
+  metadata.gz: c389f3b3fb31f59c71861d1db7fb3ead58b6cd55
+  data.tar.gz: 71d6f86a78f5b2f403ac9119953af38eb05bc8bf
 SHA512:
-  metadata.gz: e6120fae9a6609421b111f579c5e476d3cdf08417ab6e804d12633ed4cba5ca8f13b84fbb612359107bb659472234c89d88979fa2d869dc51e4315267e5a199d
-  data.tar.gz: d68e7445917f84a6c0f16d26cb259d74fd2b8158a05754c8214d826df5e5b24eb7abc22817aa831ca7e591ba29867ebf58930b978de285f7a04da7b71277b292
+  metadata.gz: 3cedbd8b869f0905b9b6cf6b8a8fe2961b4b2e7191d44cd68539c7d4742a38d75f689cc19007d8cdc548c6c19bc9b9579bdbcfc049756541f7948dee6b046fc2
+  data.tar.gz: 3d9c5ce959997df32df9ccaadd28a3be44dca64cd4c0f3f06b99589f83c0265572e6ed3af161b8ab0b0413eeaebece48f5c7311bae8e9220b25b6d849aacbfca

data/.travis.yml

@@ -8,14 +8,11 @@ rvm:
 matrix:
   include:
     - # GitHub Pages
-      rvm: 2.1.1
-      env: JEKYLL_VERSION=2.4.0
-    - rvm: 1.9.3
-      env: JEKYLL_VERSION=2.5
+      rvm: 2.3.1
+      env: JEKYLL_VERSION=3.3.0
 env:
   matrix:
-    - JEKYLL_VERSION=2.5
-    - JEKYLL_VERSION=3.0
+    - JEKYLL_VERSION=3.3
 branches:
   only:
     - master

data/History.markdown

@@ -1,3 +1,15 @@
+## 0.12.0 / 2016-10-06
+
+### Minor Enhancements
+
+  * Don't set @site.config["time"] on sitemap generation (#131)
+  * Use filters to clean up Liquid template (#128)
+
+### Development Fixes
+
+  * Appease Rubocop (#132)
+  * Drop Addressable dependency (#133)
+
 ## 0.11.0 / 2016-07-08
 
   * Add Rubocop (#100)

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.11.0"
+  spec.version     = "0.12.0"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/jekyll/jekyll-sitemap"
@@ -14,9 +14,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "addressable", "~>2.4.0"
+  spec.add_dependency "jekyll", "~> 3.3"
 
-  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"

data/lib/jekyll-sitemap.rb

@@ -1,3 +1,2 @@
-require 'jekyll/sitemap_filters'
-require 'jekyll/page_without_a_file'
-require 'jekyll/jekyll-sitemap'
+require "jekyll/page_without_a_file"
+require "jekyll/jekyll-sitemap"

data/lib/jekyll/jekyll-sitemap.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module Jekyll
   class JekyllSitemap < Jekyll::Generator
@@ -8,7 +8,6 @@ module Jekyll
     # Main plugin action, called by Jekyll-core
     def generate(site)
       @site = site
-      @site.config["time"] = Time.new
       unless sitemap_exists?
         write
         @site.keep_files ||= []
@@ -45,7 +44,7 @@ module Jekyll
     # copy sitemap template from source to destination
     def write
       FileUtils.mkdir_p File.dirname(destination_path)
-      File.open(destination_path, 'w') { |f| f.write(sitemap_content) }
+      File.open(destination_path, "w") { |f| f.write(sitemap_content) }
     end
 
     def sitemap_content
@@ -54,7 +53,7 @@ module Jekyll
       site_map.data["layout"] = nil
       site_map.data["static_files"] = static_files.map(&:to_liquid)
       site_map.render({}, @site.site_payload)
-      site_map.output.gsub(/\s{2,}/, "\n")
+      site_map.output.gsub(%r!\s{2,}!, "\n")
     end
 
     # Checks if a sitemap already exists in the site source

data/lib/sitemap.xml

@@ -1,19 +1,14 @@
 <?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 | append: site.baseurl }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
   {% for post in site.posts %}{% unless post.sitemap == false %}
   <url>
-    <loc>{{ post.url | prepend: site_url | normalize_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 %}
+    <loc>{{ post.url | absolute_url }}</loc>
+    <lastmod>{{ post.last_modified_at | default: post.date | date_to_xmlschema }}</lastmod>
   </url>
   {% endunless %}{% endfor %}
   {% for page in site.html_pages %}{% unless page.sitemap == false %}
   <url>
-    <loc>{{ page.url | replace:'/index.html','/' | prepend: site_url | normalize_url }}</loc>
+    <loc>{{ page.url | replace:'/index.html','/' | absolute_url }}</loc>
     {% if page.last_modified_at %}
     <lastmod>{{ page.last_modified_at | date_to_xmlschema }}</lastmod>
     {% endif %}
@@ -22,7 +17,7 @@
   {% for collection in site.collections %}{% unless collection.last.output == false or collection.output == false or collection.label == 'posts' %}
   {% for doc in collection.last.docs %}{% unless doc.sitemap == false %}
   <url>
-    <loc>{{ doc.url | replace:'/index.html','/' | prepend: site_url | normalize_url }}</loc>
+    <loc>{{ doc.url | replace:'/index.html','/' | absolute_url }}</loc>
     {% if doc.last_modified_at %}
     <lastmod>{{ doc.last_modified_at | date_to_xmlschema }}</lastmod>
     {% endif %}
@@ -30,7 +25,7 @@
   {% endunless %}{% endfor %}
   {% for doc in collection.docs %}{% unless doc.sitemap == false %}
     <url>
-      <loc>{{ doc.url | replace:'/index.html','/' | prepend: site_url | normalize_url }}</loc>
+      <loc>{{ doc.url | replace:'/index.html','/' | absolute_url }}</loc>
       {% if doc.last_modified_at %}
       <lastmod>{{ doc.last_modified_at | date_to_xmlschema }}</lastmod>
       {% endif %}
@@ -39,7 +34,7 @@
   {% endunless %}{% endfor %}
   {% for file in page.static_files %}
   <url>
-    <loc>{{ file.path | prepend: site_url | normalize_url }}</loc>
+    <loc>{{ file.path | absolute_url }}</loc>
     <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>
   </url>
   {% endfor %}

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: jekyll-last-modified-at
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +113,6 @@ files:
 - lib/jekyll-sitemap.rb
 - lib/jekyll/jekyll-sitemap.rb
 - lib/jekyll/page_without_a_file.rb
-- lib/jekyll/sitemap_filters.rb
 - lib/sitemap.xml
 - script/bootstrap
 - script/cibuild
@@ -182,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Jekyll site.

data/lib/jekyll/sitemap_filters.rb

@@ -1,10 +0,0 @@
-require 'addressable/uri'
-
-module Jekyll
-  module SitemapFilters
-    def normalize_url(input)
-      Addressable::URI.parse(input).normalize.to_s
-    end
-  end
-end
-Liquid::Template.register_filter(Jekyll::SitemapFilters)