jekyll-feed 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f39a0bbb0b44fe86056121002e483fdad9fd750d80df250c3bb8d2773deb62
-  data.tar.gz: 5b8873c7d89f01de3ab5d87c02a30b0186153d1f6c0b05812f8f428b83bfb54a
+  metadata.gz: 7e77140740225fa49fbadfe32c5275a1d30397f31623fd420c9ba5f79cc7bf2a
+  data.tar.gz: 941023141247ae54c55732f4cf41897733bd14f41869d0c266f18f1bf54c4a03
 SHA512:
-  metadata.gz: 0dcd26441f769bef785939357a38cf4b7f299f10bd273553b2f0ee2aa1fde50b1664c94fbac3534bb14b3f8cb8e36e5f361b21e339a8b8e140f6ba3c839e68f6
-  data.tar.gz: 9f682591707af1c16b6756e1638acadaa1cd19ac141f3b816dcf3129cea5ef661fa9e6fe0b7a05a6c6000e07d7a147c89ba155e1932f1062211bbabc2e4f27c2
+  metadata.gz: fbc5e719e5fd921947c6ecefb890f571bab7a126187822955e11bd2373672644d8c7aad17f637a9da7dbd9e66ec73acf4abc80fe4b805d12bba4129d7bf7e0e9
+  data.tar.gz: 89f35a3d116d90583f74d36f4f7c514b1bc320b4802449285ac46fd13fdd42fc62828efaf4cda52b7c77fb3acdf94cf8e99d88085d1b5231c47cf8fbc4c0bfd3

data/.gitignore

@@ -18,3 +18,4 @@ Gemfile.lock
 spec/dest
 .bundle
 spec/fixtures/.jekyll-metadata
+spec/fixtures/.jekyll-cache

data/.rubocop.yml

@@ -1,8 +1,10 @@
+require: rubocop-jekyll
+
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Include:
     - lib/**/*.rb
 
@@ -17,10 +19,7 @@ AllCops:
     - LICENSE.txt
     - README.md
 
-    - features/**/*
     - script/**/*
-    - spec/**/*
-    - test/**/*
     - vendor/**/*
 
 Naming/MemoizedInstanceVariableName:

data/.travis.yml

@@ -2,9 +2,8 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-- 2.5
+- 2.6
 - 2.4
-- 2.3
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -3,6 +3,9 @@
 source "https://rubygems.org"
 gemspec
 
-if ENV["JEKYLL_VERSION"]
-  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
+gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}" if ENV["JEKYLL_VERSION"]
+
+install_if -> { Gem.win_platform? } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
 end

data/History.markdown

@@ -1,6 +1,16 @@
 ## HEAD
 
-  * Release 💎 0.11 (#241)
+  * Release: v0.12.0 (#271)
+
+## 0.12.0 / 2019-03-21
+
+  * Allow Jekyll v4 (still alpha)
+
+### Development Fixes
+
+  * style: fix offenses in specs (#248)
+  * dev: update CI and style settings (#258)
+  * Enable testing for Windows platform (#265)
 
 ## 0.11.0 / 2018-09-09
 

data/appveyor.yml

@@ -0,0 +1,23 @@
+version: "{build}"
+clone_depth: 5
+build: off
+
+environment:
+  NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+  matrix:
+    - RUBY_FOLDER_VER: "26"
+    - RUBY_FOLDER_VER: "24"
+
+install:
+  - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%
+  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle
+
+test_script:
+  - ruby --version
+  - gem --version
+  - bundler --version
+  - bash ./script/test
+
+cache:
+  # If one of the files after the right arrow changes, cache will be invalidated
+  - 'vendor\bundle -> appveyor.yml, Gemfile, jekyll-feed.gemspec'

data/jekyll-feed.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.4.0"
 
-  spec.add_dependency "jekyll", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.57.2"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.5"
   spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0"
 end

data/lib/jekyll-feed/generator.rb

@@ -13,6 +13,7 @@ module JekyllFeed
         (meta["categories"] + [nil]).each do |category|
           path = feed_path(:collection => name, :category => category)
           next if file_exists?(path)
+
           @site.pages << make_page(path, :collection => name, :category => category)
         end
       end
@@ -24,7 +25,7 @@ module JekyllFeed
     #   1. A '>', which closes an XML tag or
     #   2. A '}', which closes a Liquid tag
     # We will strip all of this whitespace to minify the template
-    MINIFY_REGEX = %r!(?<=>|})\s+!
+    MINIFY_REGEX = %r!(?<=>|})\s+!.freeze
 
     # Returns the plugin's config or an empty hash if not set
     def config

data/lib/jekyll-feed/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Feed
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/spec/fixtures/_config.yml

@@ -4,6 +4,6 @@ defaults:
   -
     scope:
       path: ""
-      type: page
+      type: pages
     values:
       layout: some_default

data/spec/jekyll-feed_spec.rb

@@ -43,53 +43,53 @@ describe(JekyllFeed) do
   end
 
   it "puts all the posts in the feed.xml file" do
-    expect(contents).to match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
-    expect(contents).to match /http:\/\/example\.org\/news\/2014\/03\/02\/march-the-second\.html/
-    expect(contents).to match /http:\/\/example\.org\/news\/2013\/12\/12\/dec-the-second\.html/
+    expect(contents).to match "http://example.org/updates/2014/03/04/march-the-fourth.html"
+    expect(contents).to match "http://example.org/news/2014/03/02/march-the-second.html"
+    expect(contents).to match "http://example.org/news/2013/12/12/dec-the-second.html"
     expect(contents).to match "http://example.org/2015/08/08/stuck-in-the-middle.html"
-    expect(contents).to_not match /http:\/\/example\.org\/2016\/02\/09\/a-draft\.html/
+    expect(contents).to_not match "http://example.org/2016/02/09/a-draft.html"
   end
 
   it "does not include assets or any static files that aren't .html" do
-    expect(contents).not_to match /http:\/\/example\.org\/images\/hubot\.png/
-    expect(contents).not_to match /http:\/\/example\.org\/feeds\/atom\.xml/
+    expect(contents).not_to match "http://example.org/images/hubot.png"
+    expect(contents).not_to match "http://example.org/feeds/atom.xml"
   end
 
   it "preserves linebreaks in preformatted text in posts" do
-    expect(contents).to match %r!Line 1\nLine 2\nLine 3!
+    expect(contents).to match "Line 1\nLine 2\nLine 3"
   end
 
   it "supports post author name as an object" do
-    expect(contents).to match /<author>\s*<name>Ben<\/name>\s*<email>ben@example.com<\/email>\s*<uri>http:\/\/ben.balter.com<\/uri>\s*<\/author>/
+    expect(contents).to match %r!<author>\s*<name>Ben</name>\s*<email>ben@example\.com</email>\s*<uri>http://ben\.balter\.com</uri>\s*</author>!
   end
 
   it "supports post author name as a string" do
-    expect(contents).to match /<author>\s*<name>Pat<\/name>\s*<\/author>/
+    expect(contents).to match %r!<author>\s*<name>Pat</name>\s*</author>!
   end
 
   it "does not output author tag no author is provided" do
-    expect(contents).not_to match /<author>\s*<name><\/name>\s*<\/author>/
+    expect(contents).not_to match %r!<author>\s*<name></name>\s*</author>!
   end
 
   it "does use author reference with data from _data/authors.yml" do
-    expect(contents).to match /<author>\s*<name>Garth<\/name>\s*<email>example@mail.com<\/email>\s*<uri>http:\/\/garthdb.com<\/uri>\s*<\/author>/
+    expect(contents).to match %r!<author>\s*<name>Garth</name>\s*<email>example@mail\.com</email>\s*<uri>http://garthdb\.com</uri>\s*</author>!
   end
 
   it "converts markdown posts to HTML" do
-    expect(contents).to match /&lt;p&gt;March the second!&lt;\/p&gt;/
+    expect(contents).to match %r!&lt;p&gt;March the second\!&lt;/p&gt;!
   end
 
   it "uses last_modified_at where available" do
-    expect(contents).to match /<updated>2015-05-12T13:27:59\+00:00<\/updated>/
+    expect(contents).to match %r!<updated>2015-05-12T13:27:59\+00:00</updated>!
   end
 
   it "replaces newlines in posts to spaces" do
-    expect(contents).to match %r!<title type="html">The plugin will properly strip newlines.</title>!
+    expect(contents).to match '<title type="html">The plugin will properly strip newlines.</title>'
   end
 
   it "renders Liquid inside posts" do
-    expect(contents).to match %r!Liquid is rendered\.!
-    expect(contents).not_to match %r!Liquid is not rendered\.!
+    expect(contents).to match "Liquid is rendered."
+    expect(contents).not_to match "Liquid is not rendered."
   end
 
   it "includes the item image" do
@@ -205,6 +205,7 @@ describe(JekyllFeed) do
 
   context "validation" do
     it "validates" do
+      skip "Typhoeus couldn't find the 'libcurl' module on Windows" if Gem.win_platform?
       # See https://validator.w3.org/docs/api.html
       url = "https://validator.w3.org/feed/check.cgi?output=soap12"
       response = Typhoeus.post(url, :body => { :rawdata => contents }, :accept_encoding => "gzip")
@@ -239,9 +240,9 @@ describe(JekyllFeed) do
     end
 
     it "correctly adds the baseurl to the posts" do
-      expect(contents).to match /http:\/\/example\.org\/bass\/updates\/2014\/03\/04\/march-the-fourth\.html/
-      expect(contents).to match /http:\/\/example\.org\/bass\/news\/2014\/03\/02\/march-the-second\.html/
-      expect(contents).to match /http:\/\/example\.org\/bass\/news\/2013\/12\/12\/dec-the-second\.html/
+      expect(contents).to match "http://example.org/bass/updates/2014/03/04/march-the-fourth.html"
+      expect(contents).to match "http://example.org/bass/news/2014/03/02/march-the-second.html"
+      expect(contents).to match "http://example.org/bass/news/2013/12/12/dec-the-second.html"
     end
 
     it "renders the feed meta" do
@@ -258,11 +259,11 @@ describe(JekyllFeed) do
 
     context "with a blank site name" do
       let(:config) do
-        Jekyll.configuration({
+        Jekyll.configuration(
           "source"      => source_dir,
           "destination" => dest_dir,
-          "url"         => "http://example.org",
-        })
+          "url"         => "http://example.org"
+        )
       end
 
       it "does not output blank title" do
@@ -296,9 +297,9 @@ describe(JekyllFeed) do
         "feed" => {
           "collections" => {
             "posts" => {
-              "path" => "atom.xml"
-            }
-          }
+              "path" => "atom.xml",
+            },
+          },
         },
       }
     end
@@ -323,70 +324,70 @@ describe(JekyllFeed) do
     let(:overrides) { { "lang" => "en-US" } }
 
     it "should set the language" do
-      expect(contents).to match %r!type="text/html" hreflang="en-US" />!
+      expect(contents).to match 'type="text/html" hreflang="en-US" />'
     end
   end
 
   context "with post.lang set" do
     it "should set the language for that entry" do
-      expect(contents).to match %r!<entry xml:lang="en">!
-      expect(contents).to match %r!<entry>!
+      expect(contents).to match '<entry xml:lang="en">'
+      expect(contents).to match '<entry>'
     end
   end
 
   context "categories" do
     context "with top-level post categories" do
-      let(:overrides) {
+      let(:overrides) do
         {
-          "feed" => { "categories" => ["news"] }
+          "feed" => { "categories" => ["news"] },
         }
-      }
+      end
       let(:news_feed) { File.read(dest_dir("feed/news.xml")) }
 
       it "outputs the primary feed" do
-        expect(contents).to match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
-        expect(contents).to match /http:\/\/example\.org\/news\/2014\/03\/02\/march-the-second\.html/
-        expect(contents).to match /http:\/\/example\.org\/news\/2013\/12\/12\/dec-the-second\.html/
+        expect(contents).to match "http://example.org/updates/2014/03/04/march-the-fourth.html"
+        expect(contents).to match "http://example.org/news/2014/03/02/march-the-second.html"
+        expect(contents).to match "http://example.org/news/2013/12/12/dec-the-second.html"
         expect(contents).to match "http://example.org/2015/08/08/stuck-in-the-middle.html"
-        expect(contents).to_not match /http:\/\/example\.org\/2016\/02\/09\/a-draft\.html/
+        expect(contents).to_not match "http://example.org/2016/02/09/a-draft.html"
       end
 
       it "outputs the category feed" do
-        expect(news_feed).to match "<title type=\"html\">My awesome site | News</title>"
-        expect(news_feed).to match /http:\/\/example\.org\/news\/2014\/03\/02\/march-the-second\.html/
-        expect(news_feed).to match /http:\/\/example\.org\/news\/2013\/12\/12\/dec-the-second\.html/
-        expect(news_feed).to_not match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
+        expect(news_feed).to match '<title type="html">My awesome site | News</title>'
+        expect(news_feed).to match "http://example.org/news/2014/03/02/march-the-second.html"
+        expect(news_feed).to match "http://example.org/news/2013/12/12/dec-the-second.html"
+        expect(news_feed).to_not match "http://example.org/updates/2014/03/04/march-the-fourth.html"
         expect(news_feed).to_not match "http://example.org/2015/08/08/stuck-in-the-middle.html"
       end
     end
 
     context "with collection-level post categories" do
-      let(:overrides) {
+      let(:overrides) do
         {
           "feed" => {
             "collections" => {
               "posts" => {
-                "categories" => ["news"]
-              }
-            }
-          }
+                "categories" => ["news"],
+              },
+            },
+          },
         }
-      }
+      end
       let(:news_feed) { File.read(dest_dir("feed/news.xml")) }
 
       it "outputs the primary feed" do
-        expect(contents).to match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
-        expect(contents).to match /http:\/\/example\.org\/news\/2014\/03\/02\/march-the-second\.html/
-        expect(contents).to match /http:\/\/example\.org\/news\/2013\/12\/12\/dec-the-second\.html/
+        expect(contents).to match "http://example.org/updates/2014/03/04/march-the-fourth.html"
+        expect(contents).to match "http://example.org/news/2014/03/02/march-the-second.html"
+        expect(contents).to match "http://example.org/news/2013/12/12/dec-the-second.html"
         expect(contents).to match "http://example.org/2015/08/08/stuck-in-the-middle.html"
-        expect(contents).to_not match /http:\/\/example\.org\/2016\/02\/09\/a-draft\.html/
+        expect(contents).to_not match "http://example.org/2016/02/09/a-draft.html"
       end
 
       it "outputs the category feed" do
-        expect(news_feed).to match "<title type=\"html\">My awesome site | News</title>"
-        expect(news_feed).to match /http:\/\/example\.org\/news\/2014\/03\/02\/march-the-second\.html/
-        expect(news_feed).to match /http:\/\/example\.org\/news\/2013\/12\/12\/dec-the-second\.html/
-        expect(news_feed).to_not match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
+        expect(news_feed).to match '<title type="html">My awesome site | News</title>'
+        expect(news_feed).to match "http://example.org/news/2014/03/02/march-the-second.html"
+        expect(news_feed).to match "http://example.org/news/2013/12/12/dec-the-second.html"
+        expect(news_feed).to_not match "http://example.org/updates/2014/03/04/march-the-fourth.html"
         expect(news_feed).to_not match "http://example.org/2015/08/08/stuck-in-the-middle.html"
       end
     end
@@ -396,73 +397,72 @@ describe(JekyllFeed) do
     let(:collection_feed) { File.read(dest_dir("feed/collection.xml")) }
 
     context "when initialized as an array" do
-      let(:overrides) {
+      let(:overrides) do
         {
           "collections" => {
             "collection" => {
-              "output" => true
-            }
+              "output" => true,
+            },
           },
-          "feed" => { "collections" => ["collection"] }
+          "feed"        => { "collections" => ["collection"] },
         }
-      }
-
+      end
 
       it "outputs the collection feed" do
-        expect(collection_feed).to match "<title type=\"html\">My awesome site | Collection</title>"
+        expect(collection_feed).to match '<title type="html">My awesome site | Collection</title>'
         expect(collection_feed).to match "http://example.org/collection/2018-01-01-collection-doc.html"
         expect(collection_feed).to match "http://example.org/collection/2018-01-02-collection-category-doc.html"
-        expect(collection_feed).to_not match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
+        expect(collection_feed).to_not match "http://example.org/updates/2014/03/04/march-the-fourth.html"
         expect(collection_feed).to_not match "http://example.org/2015/08/08/stuck-in-the-middle.html"
       end
     end
 
     context "with categories" do
-      let(:overrides) {
+      let(:overrides) do
         {
           "collections" => {
             "collection" => {
-              "output" => true
-            }
+              "output" => true,
+            },
           },
-          "feed" => {
+          "feed"        => {
             "collections" => {
               "collection" => {
-                "categories" => ["news"]
-              }
-            }
-          }
+                "categories" => ["news"],
+              },
+            },
+          },
         }
-      }
+      end
       let(:news_feed) { File.read(dest_dir("feed/collection/news.xml")) }
 
       it "outputs the collection category feed" do
-        expect(news_feed).to match "<title type=\"html\">My awesome site | Collection | News</title>"
+        expect(news_feed).to match '<title type="html">My awesome site | Collection | News</title>'
         expect(news_feed).to match "http://example.org/collection/2018-01-02-collection-category-doc.html"
         expect(news_feed).to_not match "http://example.org/collection/2018-01-01-collection-doc.html"
-        expect(news_feed).to_not match /http:\/\/example\.org\/updates\/2014\/03\/04\/march-the-fourth\.html/
+        expect(news_feed).to_not match "http://example.org/updates/2014/03/04/march-the-fourth.html"
         expect(news_feed).to_not match "http://example.org/2015/08/08/stuck-in-the-middle.html"
       end
     end
 
     context "with a custom path" do
-      let(:overrides) {
+      let(:overrides) do
         {
           "collections" => {
             "collection" => {
-              "output" => true
-            }
+              "output" => true,
+            },
           },
-          "feed" => {
+          "feed"        => {
             "collections" => {
               "collection" => {
                 "categories" => ["news"],
-                "path" => "custom.xml"
-              }
-            }
-          }
+                "path"       => "custom.xml",
+              },
+            },
+          },
         }
-      }
+      end
 
       it "should write to the custom path" do
         expect(Pathname.new(dest_dir("custom.xml"))).to exist

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "jekyll"
-require "typhoeus"
+require "typhoeus" unless Gem.win_platform?
 require "nokogiri"
 require "rss"
 require File.expand_path("../lib/jekyll-feed", __dir__)

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-feed
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +136,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - jekyll-feed.gemspec
 - lib/jekyll-feed.rb
 - lib/jekyll-feed/feed.xml
@@ -173,15 +180,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to generate an Atom feed of your Jekyll posts