jekyll-feed 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fc06c19cf7a822a53cc32bbf9cce036aeca5bf709a111830442897033811850d
-  data.tar.gz: c4729a2bfe3abb4490f32dcc04c6080259d3189c060f35af06242f5fa995ef7b
+SHA1:
+  metadata.gz: 8f54ea4d5e7e1cca4e3f97822892ebbbbf0e1e14
+  data.tar.gz: a8f9d0597adee1a4f894dd7721c708099135bdce
 SHA512:
-  metadata.gz: 844acc55c1bc3d14bc9fe1f061acc6ed8be1f425dcb86eaa1a51de6ccbb590f4424a77203a0f6faf6791f9a6302fbcbd213f297768835fa6ae4323a873feb63b
-  data.tar.gz: 944201044de4e0efdcc0ac5fe5a8cb122a15f72c2b3526e757ce1f1a15c8771676978e506a1d7d2d1792a748ef73340c2602e41fdeef9f3f371cff7dbe485e91
+  metadata.gz: 4886bdd3fc8bf4bc520ddeab68ee7cc8823e3f6021f8633a5173390fc4ac59243edea9d69b651546f33f7d80e8aafba32cb21929bcdfda8c4480a7aeb2ac5212
+  data.tar.gz: 3b3614f94497c50ce1c091760be4e932b6cd917d40c540434d391e4d15cd5469e17a59f5d9a2bc61e61d807695071e2b945677e9b70391ac81625d1846d8f060

data/.rubocop.yml

@@ -4,26 +4,25 @@ inherit_gem:
 AllCops:
   TargetRubyVersion: 2.3
   Include:
-    - lib/*.rb
+    - lib/**/*.rb
 
   Exclude:
-    - .rubocop.yml
-    - .codeclimate.yml
-    - .travis.yml
     - .gitignore
     - .rspec
+    - .rubocop.yml
+    - .travis.yml
 
     - Gemfile.lock
-    - CHANGELOG.md
-    - readme.md
+    - History.markdown
+    - LICENSE.txt
     - README.md
-    - Readme.md
-    - ReadMe.md
-    - COPYING
-    - LICENSE
 
-    - test/**/*
-    - vendor/**/*
     - features/**/*
     - script/**/*
     - spec/**/*
+    - test/**/*
+    - vendor/**/*
+
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - lib/jekyll-feed/page-without-a-file.rb

data/.travis.yml

@@ -5,12 +5,12 @@ rvm:
 - 2.5
 - 2.4
 - 2.3
-- 2.2
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 before_install:
 - gem update --system
+- gem install bundler
 before_script: bundle update
 script: script/cibuild
 notifications:

data/History.markdown

@@ -1,3 +1,18 @@
+## 0.10.0 / 2018-06-04
+
+### Bug Fixes
+
+  * Escape image URL (#209)
+
+### Development Fixes
+
+  * Rubocop 0.55 (#223)
+  * Bump Rubocop (#230)
+
+### Minor Enhancements
+
+  * Support Typhoeus 1.0 (#232)
+
 ## 0.9.3 / 2018-02-04
 
   * Define path with __dir (#187)
@@ -7,6 +22,7 @@
 
   * Fix: Add note about using plugins instead of gems key (#197)
   * Add documentation for disabling smartify filter (#205)
+  * Use `https` in more places. (#165)
 
 ### Development Fixes
 
@@ -14,15 +30,11 @@
   * Test feeds that have a `site.lang` (#164)
   * Test against Ruby 2.5 (#201)
 
-## 0.9.3 / 2017-03-28
-
 ### Minor Enhancements
 
   * fix <entry> template for posts with post.lang defined (#168)
 
-### Documentation
-
-  * Use `https` in more places. (#165)
+## 0.9.3 / 2017-03-28
 
 ## 0.9.1 / 2017-02-17
 

data/jekyll-feed.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   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.51"
-  spec.add_development_dependency "typhoeus", "~> 0.7"
+  spec.add_development_dependency "rubocop", "0.56"
+  spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0"
 end

data/lib/jekyll-feed/feed.xml

@@ -72,9 +72,9 @@
       {% assign post_image = post.image.path | default: post.image %}
       {% if post_image %}
         {% unless post_image contains "://" %}
-          {% assign post_image = post_image | absolute_url | xml_escape  %}
+          {% assign post_image = post_image | absolute_url %}
         {% endunless %}
-        <media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="{{ post_image }}" />
+        <media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="{{ post_image | xml_escape }}" />
       {% endif %}
     </entry>
   {% endfor %}

data/lib/jekyll-feed/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Feed
-    VERSION = "0.9.3"
+    VERSION = "0.10.0"
   end
 end

data/spec/fixtures/_posts/2014-03-02-march-the-second.md

@@ -1,5 +1,5 @@
 ---
-image: "https://cdn.example.org/absolute.png"
+image: https://cdn.example.org/absolute.png?h=188&w=250
 ---
 
 March the second!

data/spec/jekyll-feed_spec.rb

@@ -1,44 +1,45 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 describe(JekyllFeed) do
-  let(:overrides) { Hash.new }
+  let(:overrides) { {} }
   let(:config) do
     Jekyll.configuration(Jekyll::Utils.deep_merge_hashes({
       "full_rebuild" => true,
-      "source"      => source_dir,
-      "destination" => dest_dir,
-      "show_drafts" => true,
-      "url"         => "http://example.org",
-      "name"       => "My awesome site",
-      "author"      => {
-        "name"        => "Dr. Jekyll"
+      "source"       => source_dir,
+      "destination"  => dest_dir,
+      "show_drafts"  => true,
+      "url"          => "http://example.org",
+      "name"         => "My awesome site",
+      "author"       => {
+        "name" => "Dr. Jekyll",
       },
-      "collections" => {
+      "collections"  => {
         "my_collection" => { "output" => true },
-        "other_things"  => { "output" => false }
-      }
+        "other_things"  => { "output" => false },
+      },
     }, overrides))
   end
   let(:site)     { Jekyll::Site.new(config) }
   let(:contents) { File.read(dest_dir("feed.xml")) }
-  let(:context)  { make_context(site: site) }
+  let(:context)  { make_context(:site => site) }
   let(:feed_meta) { Liquid::Template.parse("{% feed_meta %}").render!(context, {}) }
   before(:each) do
     site.process
   end
 
   it "has no layout" do
-    expect(contents).not_to match(/\ATHIS IS MY LAYOUT/)
+    expect(contents).not_to match(%r!\ATHIS IS MY LAYOUT!)
   end
 
   it "creates a feed.xml file" do
     expect(Pathname.new(dest_dir("feed.xml"))).to exist
   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,}/
+    expect(contents).to_not match %r!\s+\n!
+    expect(contents).to_not match %r!\n{2,}!
   end
 
   it "puts all the posts in the feed.xml file" do
@@ -55,7 +56,7 @@ describe(JekyllFeed) do
   end
 
   it "preserves linebreaks in preformatted text in posts" do
-    expect(contents).to match /Line 1\nLine 2\nLine 3/
+    expect(contents).to match %r!Line 1\nLine 2\nLine 3!
   end
 
   it "supports post author name as an object" do
@@ -87,13 +88,13 @@ describe(JekyllFeed) do
   end
 
   it "renders Liquid inside posts" do
-    expect(contents).to match /Liquid is rendered\./
-    expect(contents).not_to match /Liquid is not rendered\./
+    expect(contents).to match %r!Liquid is rendered\.!
+    expect(contents).not_to match %r!Liquid is not rendered\.!
   end
 
   it "includes the item image" do
     expect(contents).to include('<media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="http://example.org/image.png" />')
-    expect(contents).to include('<media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="https://cdn.example.org/absolute.png" />')
+    expect(contents).to include('<media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="https://cdn.example.org/absolute.png?h=188&amp;w=250" />')
     expect(contents).to include('<media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="http://example.org/object-image.png" />')
   end
 
@@ -140,7 +141,7 @@ describe(JekyllFeed) do
 
     context "with site.lang set" do
       lang = "en_US"
-      let(:overrides) { {"lang" => lang} }
+      let(:overrides) { { "lang" => lang } }
       it "outputs a valid feed" do
         expect(feed.feed_type).to eql("atom")
         expect(feed.feed_version).to eql("1.0")
@@ -165,7 +166,7 @@ describe(JekyllFeed) do
 
     context "with site.title set" do
       let(:site_title) { "My Site Title" }
-      let(:overrides) { {"title" => site_title} }
+      let(:overrides) { { "title" => site_title } }
 
       it "uses site.title for the title" do
         expect(feed.title.content).to eql(site_title)
@@ -174,7 +175,7 @@ describe(JekyllFeed) do
 
     context "with site.name set" do
       let(:site_name) { "My Site Name" }
-      let(:overrides) { {"name" => site_name} }
+      let(:overrides) { { "name" => site_name } }
 
       it "uses site.name for the title" do
         expect(feed.title.content).to eql(site_name)
@@ -184,7 +185,7 @@ describe(JekyllFeed) do
     context "with site.name and site.title set" do
       let(:site_title) { "My Site Title" }
       let(:site_name) { "My Site Name" }
-      let(:overrides) { {"title" => site_title, "name" => site_name} }
+      let(:overrides) { { "title" => site_title, "name" => site_name } }
 
       it "uses site.title for the title, dropping site.name" do
         expect(feed.title.content).to eql(site_title)
@@ -206,20 +207,20 @@ describe(JekyllFeed) do
     it "validates" do
       # 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")
+      response = Typhoeus.post(url, :body => { :rawdata => contents }, :accept_encoding => "gzip")
       pending "Something went wrong with the W3 validator" unless response.success?
-      result  = Nokogiri::XML(response.body)
+      result = Nokogiri::XML(response.body)
       result.remove_namespaces!
 
       result.css("warning").each do |warning|
         # Quiet a warning that results from us passing the feed as a string
-        next if warning.css("text").text =~ /Self reference doesn't match document location/
+        next if warning.css("text").text =~ %r!Self reference doesn't match document location!
 
         # Quiet expected warning that results from blank summary test case
-        next if warning.css("text").text =~ /(content|summary) should not be blank/
+        next if warning.css("text").text =~ %r!(content|summary) should not be blank!
 
         # Quiet expected warning about multiple posts with same updated time
-        next if warning.css("text").text =~ /Two entries with the same value for atom:updated/
+        next if warning.css("text").text =~ %r!Two entries with the same value for atom:updated!
 
         warn "Validation warning: #{warning.css("text").text} on line #{warning.css("line").text} column #{warning.css("column").text}"
       end
@@ -260,12 +261,12 @@ describe(JekyllFeed) do
         Jekyll.configuration({
           "source"      => source_dir,
           "destination" => dest_dir,
-          "url"         => "http://example.org"
+          "url"         => "http://example.org",
         })
       end
 
       it "does not output blank title" do
-        expect(feed_meta).not_to include('title=')
+        expect(feed_meta).not_to include("title=")
       end
     end
   end
@@ -274,8 +275,8 @@ describe(JekyllFeed) do
     let(:overrides) do
       {
         "feed" => {
-          "path" => "atom.xml"
-        }
+          "path" => "atom.xml",
+        },
       }
     end
 
@@ -299,14 +300,14 @@ 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 %r!type="text/html" hreflang="en-US" />!
     end
   end
 
-  context "with post.lang set"do
+  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 %r!<entry xml:lang="en">!
+      expect(contents).to match %r!<entry>!
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
-require 'jekyll'
-require 'typhoeus'
-require 'nokogiri'
-require 'rss'
-require File.expand_path('../lib/jekyll-feed', __dir__)
+# frozen_string_literal: true
+
+require "jekyll"
+require "typhoeus"
+require "nokogiri"
+require "rss"
+require File.expand_path("../lib/jekyll-feed", __dir__)
 
 Jekyll.logger.log_level = :error
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.order = 'random'
+  config.order = "random"
 
   SOURCE_DIR = File.expand_path("fixtures", __dir__)
   DEST_DIR   = File.expand_path("dest",     __dir__)
@@ -23,6 +25,6 @@ RSpec.configure do |config|
   end
 
   def make_context(registers = {})
-    Liquid::Context.new({}, {}, { site: site }.merge(registers))
+    Liquid::Context.new({}, {}, { :site => site }.merge(registers))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-feed
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -86,28 +86,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.56'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.56'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - ben.balter@github.com
@@ -173,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to generate an Atom feed of your Jekyll posts