jekyll-feed 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29260f36998522e4c79581e9db32ab1da5beacbe
-  data.tar.gz: 8f471054cec8cadb271288e79b84e90604ab667a
+  metadata.gz: 31ec255441efdec76e24a57228ad15d4df8792aa
+  data.tar.gz: 771f380686b7c6b1f988924ad385abc7e45c044a
 SHA512:
-  metadata.gz: bd31985f2ffb8f3d10de9025ebd3a333b4d9bb4344953f633fe0fc94d458e2130b3a7c758f6c206a37075b1d2884f6a21c60bd59781359c542856936dd9e88c4
-  data.tar.gz: 6f4ca44cab5047f5910c0e2b2b6c0c14baa7c8484d734d9b349ad2cd033a5fc6368005187000590a822654ba247f547dbef0d2199e77b4c4e794475f785f74cb
+  metadata.gz: 4f380d4240ccedfe0d193b5ec88cf10feabae1bd948c982340fc078b1fb3653784c3be9188d42923978a67dc13d3be086d306fc324101cdc610dcd36530c664a
+  data.tar.gz: 85c8856882d47079feb5cedbb44975d077c48a6291e6ae181fc924952292fd02b8c1b09d60d3a561cb2b59cbafe281ea5a254b1be71864b2904b7b90cd8fef50

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 1.9
+  TargetRubyVersion: 2.0
   Include:
     - lib/*.rb
 

data/History.markdown

@@ -1,3 +1,15 @@
+## 0.8.0 / 2016-10-06
+
+  * Use filters to clean up Liquid template (#134)
+
+### Minor Enhancements
+
+  * Don't set @site.config["time"] on feed generation (#138)
+
+### pedantry
+
+  * Appease Rubocop (#139)
+
 ## 0.7.2 / 2016-10-06
 
   * Support `image.path` when `post.image` is an object (#137)

data/jekyll-feed.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-feed"
-  spec.version       = "0.7.2"
+  spec.version       = "0.8.0"
   spec.authors       = ["Ben Balter"]
   spec.email         = ["ben.balter@github.com"]
   spec.summary       = "A Jekyll plugin to generate an Atom feed of your Jekyll posts"
@@ -14,7 +14,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "jekyll", ">= 3.1.0", "< 3.2.0"
+  spec.add_dependency "jekyll", "~> 3.3"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/feed.xml

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-{% if site.url %}
-  {% assign url_base = site.url | append: site.baseurl %}
-{% else %}
-  {% assign url_base = site.github.url %}
-{% endif %}
-<?xml-stylesheet type="text/xml" href="{{ url_base }}/feed.xslt.xml"?>
+<?xml-stylesheet type="text/xml" href="{{ '/feed.xslt.xml' | absolute_url }}"?>
 <feed xmlns="http://www.w3.org/2005/Atom"{% if site.lang %} xml:lang="{{ site.lang }}"{% endif %}>
   <generator uri="http://jekyllrb.com" version="{{ jekyll.version }}">Jekyll</generator>
-  <link href="{{ page.url | prepend: url_base }}" rel="self" type="application/atom+xml" />
-  <link href="{{ url_base }}/" rel="alternate" type="text/html" {% if site.lang %}hreflang="{{ site.lang }}" {% endif %}/>
+  <link href="{{ page.url | absolute_url }}" rel="self" type="application/atom+xml" />
+  <link href="{{ '/' | absolute_url }}" rel="alternate" type="text/html" {% if site.lang %}hreflang="{{ site.lang }}" {% endif %}/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
-  <id>{{ url_base | xml_escape }}/</id>
+  <id>{{ '/' | absolute_url | xml_escape }}/</id>
 
   {% if site.title %}
     <title type="html">{{ site.title | smartify | xml_escape }}</title>
@@ -24,11 +19,7 @@
 
   {% if site.author %}
     <author>
-      {% if site.author.name %}
-        <name>{{ site.author.name | xml_escape }}</name>
-      {% else %}
-        <name>{{ site.author | xml_escape }}</name>
-      {% endif %}
+        <name>{{ site.author.name | default: site.author | xml_escape }}</name>
       {% if site.author.email %}
         <email>{{ site.author.email | xml_escape }}</email>
       {% endif %}
@@ -42,16 +33,11 @@
   {% unless post.draft %}
     <entry{% if post.lang %} xml:lang="{{ post.lang }}"{% endif %}>
       <title type="html">{{ post.title | smartify | strip_html | replace: '\n', ' ' | strip | xml_escape }}</title>
-      <link href="{{ post.url | prepend: url_base }}" rel="alternate" type="text/html" title="{{ post.title | xml_escape }}" />
+      <link href="{{ post.url | absolute_url }}" rel="alternate" type="text/html" title="{{ post.title | xml_escape }}" />
       <published>{{ post.date | date_to_xmlschema }}</published>
-      {% if post.last_modified_at %}
-        <updated>{{ post.last_modified_at | date_to_xmlschema }}</updated>
-      {% else %}
-        <updated>{{ post.date | date_to_xmlschema }}</updated>
-      {% endif %}
-
-      <id>{{ post.id | prepend: url_base | xml_escape }}</id>
-      <content type="html" xml:base="{{ post.url | prepend: url_base | xml_escape }}">{{ post.content | strip | xml_escape }}</content>
+      <updated>{{ post.last_modified_at | default: post.date | date_to_xmlschema }}</updated>
+      <id>{{ post.id | absolute_url | xml_escape }}</id>
+      <content type="html" xml:base="{{ post.url | absolute_url | xml_escape }}">{{ post.content | strip | xml_escape }}</content>
 
       {% assign post_author = post.author | default: post.authors[0] | default: site.author %}
       {% assign post_author = site.data.authors[post_author] | default: post_author %}
@@ -86,7 +72,7 @@
       {% assign post_image = post.image.path | default: post.image %}
       {% if post_image %}
         {% unless post_image contains "://" %}
-          {% assign post_image = post_image | prepend: url_base | xml_escape  %}
+          {% assign post_image = post_image | absolute_url | xml_escape  %}
         {% endunless %}
         <media:thumbnail xmlns:media="http://search.yahoo.com/mrss/" url="{{ post_image }}" />
       {% endif %}

data/lib/jekyll-feed.rb

@@ -1,4 +1,3 @@
 require "jekyll/feed_meta_tag"
 require "jekyll/jekyll-feed"
 require "jekyll/page_without_a_file"
-require "jekyll/strip_whitespace"

data/lib/jekyll/feed_meta_tag.rb

@@ -2,7 +2,7 @@ module Jekyll
   class FeedMetaTag < Liquid::Tag
     def render(context)
       @context = context
-      attrs    = attributes.map { |k, v| %(#{k}="#{v}") }.join(' ')
+      attrs    = attributes.map { |k, v| %(#{k}="#{v}") }.join(" ")
       "<link #{attrs} />"
     end
 
@@ -14,9 +14,9 @@ module Jekyll
 
     def attributes
       {
-        :type => 'application/atom+xml',
-        :rel => 'alternate',
-        :href => "#{url}/#{path}",
+        :type  => "application/atom+xml",
+        :rel   => "alternate",
+        :href  => "#{url}/#{path}",
         :title => title
       }.keep_if { |_, v| v }
     end

data/lib/jekyll/jekyll-feed.rb

@@ -8,7 +8,6 @@ module Jekyll
     # Main plugin action, called by Jekyll-core
     def generate(site)
       @site = site
-      @site.config["time"] = Time.new
       unless file_exists?(feed_path)
         @site.pages << content_for_file(feed_path, feed_source_path)
       end
@@ -55,7 +54,7 @@ module Jekyll
     # Generates contents for a file
     def content_for_file(file_path, file_source_path)
       file = PageWithoutAFile.new(@site, File.dirname(__FILE__), "", file_path)
-      file.content = File.read(file_source_path).gsub(/(?<!\")\s+([<{])/, '\1')
+      file.content = File.read(file_source_path).gsub(%r!(?<\!")\s+([<{])!, '\1')
       file.data["layout"] = nil
       file.data["sitemap"] = false
       file.output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-feed
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Balter
@@ -14,22 +14,16 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
+        version: '3.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +131,6 @@ files:
 - lib/jekyll/feed_meta_tag.rb
 - lib/jekyll/jekyll-feed.rb
 - lib/jekyll/page_without_a_file.rb
-- lib/jekyll/strip_whitespace.rb
 - script/bootstrap
 - script/cibuild
 - script/release

data/lib/jekyll/strip_whitespace.rb

@@ -1,15 +0,0 @@
-# The `strip` filter was added to Liquid in version 3
-# Jekyll did not require Liquid 3 until Jekyll 3.0.0
-# This shim is needed for compatibility with Jekyll 2.x
-
-module Jekyll
-  module StripWhitespace
-    def strip(input)
-      input.to_s.strip
-    end
-  end
-end
-
-unless Liquid::StandardFilters.method_defined?(:strip)
-  Liquid::Template.register_filter(Jekyll::StripWhitespace)
-end