octopress-feeds 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32fe7ffd3a4d4a8b9e168653192cf322bc366ca5
-  data.tar.gz: 79a174f7ee75a3c5c01f162d86baaa95e75a0799
+  metadata.gz: abd728ec448b8e141757d5f6182aae70a3e8556c
+  data.tar.gz: a5bf1c25a69d11bb40d633b7a159fe4080c673b2
 SHA512:
-  metadata.gz: 3ef7adf155249df5cac2c22b002ee51360066cf544d3391e86459eee3d236cc5e68c2528708cc6726949c20b33478c95a26ffa080cf6bf46cb6505e94095c95c
-  data.tar.gz: 7fc999ccdc6124362d2fa58c0897c03d411f523fa4d5a03134474e4bd69dc7ba0a8c34d924a69ca11632deb3f5500370476cd2373bfe31cd9aabea461d57eb65
+  metadata.gz: 0022830a0f430dd5ec1e3fb6f6d2d5f3139475eec936ea524eab0b9607645e9624cd8e7e3e5b8741697943fe2fa61fc3f6ba7018a242a0cb440c299d5a3b7ec6
+  data.tar.gz: 2e98b682b48988a9c3d34299471cfa0389f643a4c03959dd0515e74fda81dfd4c9e695e306e51ebfd59b2e226fafd441d6a3153822eea6f386746a3f894c7143

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.2.5 (2015-01-26)
+
+- Fix: Feed excerpts work with linkblog and multilingual sites.
+- Fix: Only add link and article feeds if octopress-linkblog is installed.
+
 ### 1.2.4 (2015-01-26)
 
 - Link and Article feeds are automatically added when linkblog plugin is added.

data/assets/includes/entry.xml

@@ -14,17 +14,17 @@
     </author>
     <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 | canonical_url }}">Continue reading &rarr;</a></p>
-{% endif %}
-{% else %}
+{% if plugins.feeds.excerpts == false or post.linkpost %}
 {{ post.content | full_urls }}
 {% if post.linkpost %}
 <p><a href="{{ post.url | canonical_url }}">&infin; Permalink</a></p>
 {% endif %}
+{% else %}
+{{ post.excerpt | full_urls }}
+
+{% if post.excerpt != post.content %}
+<p><a href="{{ post.url | canonical_url }}">Continue reading &rarr;</a></p>
+{% endif %}
 {% endif %}
 ]]>
     </content>

data/assets/includes/head.xml

@@ -6,5 +6,5 @@
   <id>{{ site.url | join_url: site.baseurl }}</id>
   <updated>{% feed_updated_date %}</updated>
   <generator uri="http://octopress.org/">Octopress</generator>
-  <language>{{ site.lang }}</language>
+  <language>{% return site.lang || 'en' %}</language>
   <rights>Copyright © {{ site.time | date: '%Y' }}, {{ site.author | strip_html }}</rights>

data/assets/pages/article-feed.xml

@@ -3,4 +3,4 @@ permalink: /feed/articles/
 title: Articles Feed
 feed: true
 ---
-{% abort unless site.articles and site.articles.size > 0 %}{% include feeds:article-feed.xml %}
+{% include feeds:article-feed.xml %}

data/assets/pages/link-feed.xml

@@ -3,4 +3,4 @@ permalink: /feed/links/
 title: Links Feed
 feed: true
 ---
-{% abort unless site.linkposts and site.linkposts.size > 0 %}{% include feeds:link-feed.xml %}
+{% include feeds:link-feed.xml %}

data/lib/octopress-feeds.rb

@@ -4,68 +4,28 @@ require 'octopress-include-tag'
 require 'octopress-abort-tag'
 require 'octopress-return-tag'
 require 'octopress-date-format'
+require 'octopress-feeds/tags'
 
-begin
-  require 'octopress-linkblog'
-rescue LoadError; end
 
 module Octopress
   module Feeds
-    class FeedTag < Liquid::Tag
-      def render(context)
-        context['site.pages'].dup \
-          .select { |p| p.data['feed'] } \
-          .sort_by { |p| p.url } \
-          .sort_by { |p| p.url.size } \
-          .map    { |p| tag(p) } \
-          .join("\n")
-      end
-
-      def tag(page)
-        url = page.url.sub(File.basename(page.url), '')
-
-        "<link href='#{url}' title='#{page_title(page)}' rel='alternate' type='application/atom+xml'>"
-      end
+    class Plugin < Ink::Plugin
 
-      def page_title(page)
-        title = page.site.config['name'].dup || ''
-        title << ': ' unless title.empty?
-        title << page.data['title']
-
-        title
-      end
-    end
+      def add_pages
+        super
 
-    class FeedUpdatedTag < Liquid::Tag
-      def render(context)
-        feed = context['feed_type'] || 'posts'
-        site = context['site']
-
-        case feed
-        when 'articles'
-          posts = site['articles']
-        when 'linkposts'
-          posts = site['linkposts']
-        else
-          posts = site['posts']
-        end
-
-        if !posts.empty?
-          post = posts.sort_by do |p|
-            p.data['date_updated'] || p.date
-          end.last
-
-          post.data['date_updated_xml'] || post.data['date_xml']
+        # Remove linkblog pages if the octopress-linkblog plugin isn't installed
+        unless defined? Octopress::Linkblog
+          @pages.reject! do |p|
+            p.file =~ /(article|link)/
+          end
         end
       end
     end
   end
 end
 
-Liquid::Template.register_tag('feed_tag', Octopress::Feeds::FeedTag)
-Liquid::Template.register_tag('feed_updated_date', Octopress::Feeds::FeedUpdatedTag)
-
-Octopress::Ink.add_plugin({
+Octopress::Ink::Plugins.register_plugin(Octopress::Feeds::Plugin, {
   name:          "Octopress Feeds",
   slug:          "feeds",
   gem:           "octopress-feeds",
@@ -76,3 +36,4 @@ Octopress::Ink.add_plugin({
   website:       "https://github.com/octopress/feeds"
 })
 
+

data/lib/octopress-feeds/tags.rb

@@ -0,0 +1,56 @@
+module Octopress
+  module Feeds
+    class FeedTag < Liquid::Tag
+      def render(context)
+        context['site.pages'].dup \
+          .select { |p| p.data['feed'] } \
+          .sort_by { |p| p.url } \
+          .sort_by { |p| p.url.size } \
+          .map    { |p| tag(p) } \
+          .join("\n")
+      end
+
+      def tag(page)
+        url = page.url.sub(File.basename(page.url), '')
+
+        "<link href='#{url}' title='#{page_title(page)}' rel='alternate' type='application/atom+xml'>"
+      end
+
+      def page_title(page)
+        title = page.site.config['name'].dup || ''
+        title << ': ' unless title.empty?
+        title << page.data['title']
+
+        title
+      end
+    end
+
+    class FeedUpdatedTag < Liquid::Tag
+      def render(context)
+        feed = context['feed_type'] || 'posts'
+        site = context['site']
+
+        case feed
+        when 'articles'
+          posts = site['articles']
+        when 'linkposts'
+          posts = site['linkposts']
+        else
+          posts = site['posts']
+        end
+
+        if !posts.empty?
+          post = posts.sort_by do |p|
+            p.data['date_updated'] || p.date
+          end.last
+
+          post.data['date_updated_xml'] || post.data['date_xml']
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('feed_tag', Octopress::Feeds::FeedTag)
+Liquid::Template.register_tag('feed_updated_date', Octopress::Feeds::FeedUpdatedTag)
+

data/lib/octopress-feeds/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Feeds
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A nice RSS feeds for Octopress and Jekyll sites.
 email:
 - brandon@imathis.com
@@ -184,6 +198,7 @@ files:
 - assets/pages/link-feed.xml
 - assets/pages/main-feed.xml
 - lib/octopress-feeds.rb
+- lib/octopress-feeds/tags.rb
 - lib/octopress-feeds/version.rb
 homepage: https://github.com/octopress/feeds
 licenses: