octopress-feeds 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67d3569bee9cc4ff20dadc70c73c5e53e43325d
-  data.tar.gz: b05e03df8716af6c9e976c9183a0eb9012ff8099
+  metadata.gz: 60983f3c3127540cf1d3793d155045c3dabde8fe
+  data.tar.gz: 895719b413c047564f3234273a8346c6b8887335
 SHA512:
-  metadata.gz: 8a91e779a29298c6ac87286ae19e770430913515e042c9f9cd3295651509cddab0f7793c37080f7f5bf47a2d4f29a77c9d069c79d487d20a195e6f21dc0a870c
-  data.tar.gz: 2214001d957adbf3ab3644377f19fb2f99cdb395dfa886694281899e93c542bc785ae2a07ade836c55b009a37881d9f0f237ee5336b776577b0548c20f1a9c11
+  metadata.gz: b489b2b14909a1d9731f8a81d0738683820b121879032393034475c4dd02dc2f8840081091b8bfbea860654b05e8f7e7e18ab6f2e8214091eca8767cbf4fda6f
+  data.tar.gz: fafc9a88c2506b9ad0260e538a41943409d93ab95821c745717e1f976d036b3f2748720f35d2386d1c185bd8bbbf102ede4008b701d991be0654c11e8c06d2ec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.3 (2015-01-24)
+- Fix: Posts use canonical URLs in feeds.
+- Improved `baseurl` support.
+
 ### 1.2.2 (2015-01-22)
 - Removed faux `set_lang` tag as it is now integrated into Octopress Ink.
 

data/assets/includes/entry.xml

@@ -1,29 +1,29 @@
 <title type="html">{% return post.title_text || post.title %}</title>
     {% if post.linkpost and plugins.feeds.external_links %}
     <link rel="alternate" type="text/html" href="{{ post.external-url }}"/>
-    <link rel="related" type="text/html" href="{{ post.url | full_url }}"/>
+    <link rel="related" type="text/html" href="{{ post.url | canonical_url }}"/>
     {% else %}
-    <link rel="alternate" type="text/html" href="{{ post.url | full_url }}"/>
+    <link rel="alternate" type="text/html" href="{{ post.url | canonical_url }}"/>
     {% endif %}
     <id>{{ post.id }}</id>
     <published>{{ post.date_xml }}</published>
     <updated>{% return post.date_updated_xml || post.date_xml %}</updated>
     <author>
       <name>{% return post.author || site.author %}</name>
-      <uri>{% return post.author_site || site.url %}</uri>
+      <uri>{% if post.author_site %}{{ post.author_site }}{% else %}{{ site.url | join_url: site.baseurl }}{% endif %}</uri>
     </author>
-    <content type="html" xml:base="{{ site.url }}" xml:lang="{% return site.lang || 'en' %}">
+    <content type="html" xml:base="{{ site.url | join_url: site.baseurl }}" xml:lang="{% return site.lang || 'en' %}">
 <![CDATA[
 {% if plugins.feeds.excerpts and post.linkpost == false %}
 {{ post.excerpt | full_urls }}
 
 {% if post.excerpted %}
-<p><a href="{{ post.url | full_url }}">Continue reading &rarr;</a></p>
+<p><a href="{{ post.url | canonical_url }}">Continue reading &rarr;</a></p>
 {% endif %}
 {% else %}
 {{ post.content | full_urls }}
 {% if post.linkpost %}
-<p><a href="{{ post.url | full_url }}">&infin; Permalink</a></p>
+<p><a href="{{ post.url | canonical_url }}">&infin; Permalink</a></p>
 {% endif %}
 {% endif %}
 ]]>

data/assets/includes/head.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <title>{% return site.name || site.title %}</title>
-  <link rel="alternate" type="text/html" href="{{ site.url }}/"/>
-  <link rel="self" type="application/atom+xml" href="{{ page.url | remove:'index.xml' | full_url }}"/>
-  <id>{{ site.url }}</id>
+  <title>{{ site.name }}</title>
+  <link rel="alternate" type="text/html" href="{{ site.url | join_url: site.baseurl }}"/>
+  <link rel="self" type="application/atom+xml" href="{{ page.url | canonical_url }}"/>
+  <id>{{ site.url | join_url: site.baseurl }}</id>
   <updated>{% feed_updated_date %}</updated>
   <generator uri="http://octopress.org/">Octopress</generator>
   <language>{{ site.lang }}</language>

data/lib/octopress-feeds/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Feeds
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink