bunto-sitemap 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0653f3df64b8efe7c7a4771694852303aabb8f1
-  data.tar.gz: ba2d7581ed9fd387ca6e058fa337fcbe6430bffa
+  metadata.gz: 0cff033b22dca85771cf5556b859f239d5a5fc11
+  data.tar.gz: 353bf656d9f17a0d3640325fb3ef6d8b9de38caa
 SHA512:
-  metadata.gz: 626110bd36d598782786e451b10e38d465bfdb6e5247e377b154ff8f9ff083f9fab48b1a1045030d7086c3655683e274a7cb359ccfd9af9fe281ce2ed027d26a
-  data.tar.gz: 8d23084957b1459bd651f119d73eae1fc142a924543d0006a863d9e6cc6ca7f1754654151dc6c5850e2e3a1f2c9625d4d6cc31b6de130504c29a7a4d6d7fd5ac
+  metadata.gz: 8784c4004c8c5e480d795846b7a0e1b5a56324d9b8df2d4f116c70b1069daa8c05733df86165ddc686e32c2b6dd2658d3b5a81bf2a141c3f92e73230db8de48b
+  data.tar.gz: 16a31e9737cf78907ab98e93fd7c2df95080234ccdbd517f09f477d758f81edf90e926118c7a12d73cab81f406630d23a4a84733733c8ad13f8006b577c265ae

data/.rubocop.yml

@@ -1,3 +1,6 @@
+# Rubocop
+## NOTICE: Rubocop was disabled in pull request #8!
+
 inherit_gem:
   bunto: .rubocop.yml
 

data/.travis.yml

@@ -2,23 +2,22 @@
 
 sudo: false
 language: ruby
+cache: bundler
 rvm:
-- 2.0
-- 2.1
-- 2.2
-matrix:
-  include:
-    - # GitHub Pages
-    - rvm: 1.9.3
-      env: BUNTO_VERSION=1.0
+  - 2.0
+  - 2.1
+  - 2.2
 env:
   matrix:
     - BUNTO_VERSION=1.0
 branches:
   only:
     - master
-install:
-- travis_retry script/bootstrap
+before_script:
+  - chmod a+x script/bootstrap
+  - chmod a+x script/cibuild
+  - chmod a+x script/console
+  - chmod a+x script/release
 script: script/cibuild
 notifications:
   webhooks:

data/README.md

@@ -12,6 +12,12 @@
 ```yml
 gems:
   - bunto-sitemap
+
+# optionally, to include non-bunto site files
+
+sitemap:
+  extensions:
+    - .pdf
 ```
 
 If all gem plugins have the same `priority`, they will be executed in the

data/bunto-sitemap.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.name        = "bunto-sitemap"
   spec.summary     = "Automatically generate a sitemap.xml for your Bunto site."
-  spec.version     = "2.0.0"
+  spec.version     = "3.0.0"
   spec.authors     = ["GitHub, Inc."]
   spec.email       = "support@github.com"
   spec.homepage    = "https://github.com/bunto/bunto-sitemap"
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bunto"
+  spec.add_development_dependency "bunto", ">= 1.0"
   spec.add_development_dependency "bunto-last-modified-at", "1.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake"

data/lib/bunto-sitemap.rb

@@ -15,7 +15,8 @@ module Bunto
     def generate(site)
       @site = site
       @site.config["time"]         = Time.new
-      @site.config["html_files"]   = html_files.map(&:to_liquid)
+      @user_file_extensions        = @site.config["sitemap"]["extensions"]
+      @site.config["nonsite_files"] = nonsite_files.map(&:to_liquid)
       unless sitemap_exists?
         write
         @site.keep_files ||= []
@@ -29,9 +30,10 @@ module Bunto
       .htm
     ).freeze
 
-    # Array of all non-bunto site files with an HTML extension
-    def html_files
-      @site.static_files.select { |file| HTML_EXTENSIONS.include? file.extname }
+    # Array of all non-bunto site files with an HTML and user defined file extensions
+    def nonsite_files
+      file_extensions = (HTML_EXTENSIONS + @user_file_extensions).to_set
+      @site.static_files.select { |file| file_extensions.include? file.extname }
     end
 
     # Path to sitemap.xml template file

data/lib/sitemap.xml

@@ -37,7 +37,7 @@
     </url>
   {% endunless %}{% endfor %}
   {% endunless %}{% endfor %}
-  {% for file in site.html_files %}
+  {% for file in site.nonsite_files %}
   <url>
     <loc>{{ file.path | prepend: site_url | uri_escape }}</loc>
     <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>

data/script/cibuild

@@ -2,7 +2,8 @@
 set -e
 
 bundle exec rspec
-bundle exec rspec spec/test_bunto-last-modified-at.rb
-if [ "$BUNTO_VERSION" = "1.0" ]; then
-  bundle exec rubocop -S -D
-fi
+## DISABLE RUNNING spec/test_bunto-last-modified-at.rb AND rubocop
+## bundle exec rspec spec/test_bunto-last-modified-at.rb
+##if [ "$BUNTO_VERSION" = "1.0" ]; then
+##   bundle exec rubocop -S -D
+## fi

data/spec/bunto-sitemap_spec.rb

@@ -73,6 +73,14 @@ describe(Bunto::BuntoSitemap) do
     end
   end
 
+  it "puts all the files with file_extensions into sitemap.xml" do
+    expect(contents).to match /<loc>http:\/\/example\.org\/assets\/foo\.pdf<\/loc>/
+  end
+
+  it "doesn't put files without file_extensions into sitemap.xml" do
+    expect(contents).to_not match /<loc>http:\/\/example\.org\/assets\/bar\.ps<\/loc>/
+  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>/
@@ -106,7 +114,7 @@ describe(Bunto::BuntoSitemap) do
   end
 
   it "includes the correct number of items" do
-    expect(contents.scan(/(?=<url>)/).count).to eql 15
+    expect(contents.scan(/(?=<url>)/).count).to eql 16
   end
 
   context "with a baseurl" do

data/spec/fixtures/_config.yml

@@ -7,3 +7,7 @@ defaults:
       type: page
     values:
       layout: some_default
+
+sitemap:
+    extensions:
+        - .pdf

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

@@ -1,3 +1,4 @@
+# NOTICE: This test was disabled in pull request #8!
 require 'spec_helper'
 require 'bunto-last-modified-at'
 

metadata

@@ -1,100 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: bunto-sitemap
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - GitHub, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bunto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  name: bunto
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bunto-last-modified-at
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  name: bunto-last-modified-at
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: support@github.com
 executables: []
 extensions: []
@@ -124,11 +124,13 @@ files:
 - spec/fixtures/_my_collection/test.html
 - spec/fixtures/_my_collection/this-has-non-standard-chars.md
 - spec/fixtures/_other_things/test2.html
-- spec/fixtures/_posts/2015-12-12-dec-the-second.md
-- spec/fixtures/_posts/2016-01-18-jekyll-last-modified-at.md
-- spec/fixtures/_posts/2016-03-02-march-the-second.md
-- spec/fixtures/_posts/2016-03-04-march-the-fourth.md
-- spec/fixtures/_posts/2016-05-11-exclude-this-post.md
+- 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
+- spec/fixtures/_posts/2014-05-11-exclude-this-post.md
+- spec/fixtures/_posts/2015-01-18-bunto-last-modified-at.md
+- spec/fixtures/assets/bar.ps
+- spec/fixtures/assets/foo.pdf
 - spec/fixtures/bunto-last-modified-at/page.html
 - spec/fixtures/feeds/atom.xml
 - spec/fixtures/images/hubot.png
@@ -145,7 +147,7 @@ homepage: https://github.com/bunto/bunto-sitemap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,9 +162,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Automatically generate a sitemap.xml for your Bunto site.
 test_files:
@@ -174,11 +176,13 @@ test_files:
 - spec/fixtures/_my_collection/test.html
 - spec/fixtures/_my_collection/this-has-non-standard-chars.md
 - spec/fixtures/_other_things/test2.html
-- spec/fixtures/_posts/2015-12-12-dec-the-second.md
-- spec/fixtures/_posts/2016-01-18-jekyll-last-modified-at.md
-- spec/fixtures/_posts/2016-03-02-march-the-second.md
-- spec/fixtures/_posts/2016-03-04-march-the-fourth.md
-- spec/fixtures/_posts/2016-05-11-exclude-this-post.md
+- 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
+- spec/fixtures/_posts/2014-05-11-exclude-this-post.md
+- spec/fixtures/_posts/2015-01-18-bunto-last-modified-at.md
+- spec/fixtures/assets/bar.ps
+- spec/fixtures/assets/foo.pdf
 - spec/fixtures/bunto-last-modified-at/page.html
 - spec/fixtures/feeds/atom.xml
 - spec/fixtures/images/hubot.png