octopress-feeds 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04ed329d37a75cec4ac021450cc76c9abe7362b
-  data.tar.gz: 820b7d2fdf05b91463e72a2bcb96de6e43494afa
+  metadata.gz: de2c2678a23fef0f6044f3f6ab6152a82caf14d3
+  data.tar.gz: 831f85ddee7b54f777c22d579b4f45e161078f73
 SHA512:
-  metadata.gz: 14e16ef273416146553716e841f2f62eb90d54d09320f2cd9cb39a1afca4ef5d3be80d9db45ef24a8c9e4c9a2476a88eda4c1a9ea454b899c911d9d0b5e68979
-  data.tar.gz: 420c6c0ee381e9805f59b2a6fdd80903afa65ca6e74ca463e597729c5398b2fbd703833ae6aa4556ec06e15b70d5b725730faec372138f0d35ab35930b10266b
+  metadata.gz: cb6ce3d0629e7c0683652d0dcc12d28b01673c9930db3d19a2b18c0297564240195de33bb917a1ed36cd53dc7044c38b41839880927d081aae658eae38072e46
+  data.tar.gz: 2e7775197b9c7933555f59e2e232120c6bd03acfd63c507f6c882589e45f3e8e0e107bd1605c17a8cb7328a9c7148af3a0f9bb0de87e42ed07b519fb114b2e51

data/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Changelog
 
+### 1.3.2 (2015-02-08)
+
+- New: Feed titles can be configured (for additional languages too).
+
 ### 1.3.1 (2015-02-03)
 
-- Now feed titles include the full language name.
+- Feed titles include the full language name.
 
 ### 1.3.0 (2015-02-01)
 
-- Now all language feeds are automatically generated.
+- New: All language feeds are automatically generated.
 
 ### 1.2.7 (2015-01-31)
 

data/README.md

@@ -102,15 +102,19 @@ https://github.com/octopress/feeds
   - link-feed.xml
   - main-feed.xml
 
-pages:                              urls:
-  - main                             /feed/
-  - links                            /feed/links/       # with octopress-linkblog
-  - articles                         /feed/articles/    # with octopress-linkblog
+ pages:                             urls:
+  - main.xml                         /feed/
+  - links.xml                        /feed/links/       # with octopress-linkblog
+  - articles.xml                     /feed/articles/    # with octopress-linkblog
 
- default configuration:
-    count: 20
-    excerpts: false         # Feed excerpts post content
-    external_links: true    # Linkposts should direct visitors to the linked site
+ config:
+   count: 20
+   excerpts: false         # Feed excerpts post content
+   external_links: true    # Linkposts should direct visitors to the linked site
+   titles:
+     main-feed: "Posts Feed"
+     article-feed: "Articles-only Feed"
+     link-feed: "Links-only Feed"
 ```
 
 If you have posts written in English and German, and are using [octopress-multilingual](https://github.com/octopress/multilingual),
@@ -121,9 +125,9 @@ pages:                              urls:
   - main                             /en/feed/
   - links                            /en/feed/links/
   - articles                         /en/feed/articles/
-  - main-de                          /de/feed/
-  - links-de                         /de/feed/links/
-  - articles-de                      /de/feed/articles/
+  - main_de                          /de/feed/
+  - links_de                         /de/feed/links/
+  - articles_de                      /de/feed/articles/
 ```
 
 Octopress Ink can copy all of the plugin's assets to `_plugins/feeds/*` where you can override them with your own modifications. This is
@@ -155,8 +159,23 @@ This will create a configuration file populated with the defaults for this plugi
 | `external_linkposts`  | Link posts should direct visitors to the linked site.       | true        |
 | `articles_feed`       | Add an additional articles-only feed.                       | false       |
 | `linkposts_feed`      | Add an additional link-posts-only feed.                     | false       |
-| `permalinks`          | Set the permalink for feed pages.                           |             |
+| `titles`              | Set feed titles for main, article, and link feeds.          | [see below] |
+| `permalinks`          | Set the permalink for feed pages.                           | {}          |
+
+
+### Feed titles
+
+The `titles` configuration allows you to control the title that RSS subscribers see for your feed.
+
+```yaml
+titles:
+  main-feed: Posts Feed
+  article-feed: Articles-only Feed
+  link-feed: Links-only Feed
+```
 
+If you want to change the title for other languages you can add a new language localized config file. For example if you have German
+feeds, you would add a config file at `_plugins/feeds/config_de.yml` and set titles for your German language feeds.
 
 ### Feed permalinks
 

data/assets/config.yml

@@ -1,3 +1,8 @@
 count: 20
 excerpts: false         # Feed excerpts post content
 external_links: true    # Linkposts should direct visitors to the linked site
+
+titles:
+  main-feed: Posts Feed
+  article-feed: Articles-only Feed
+  link-feed: Links-only Feed

data/assets/pages/articles.xml

@@ -1,6 +1,5 @@
 ---
 permalink: /feed/articles/
-title: Articles only
 feed: true
 ---
 {% include feeds:article-feed.xml %}

data/assets/pages/links.xml

@@ -1,6 +1,5 @@
 ---
 permalink: /feed/links/
-title: Links only
 feed: true
 ---
 {% include feeds:link-feed.xml %}

data/assets/pages/main.xml

@@ -1,6 +1,5 @@
 ---
 permalink: /feed/
-title: Posts
 feed: true
 ---
 {% include feeds:main-feed.xml %}

data/lib/octopress-feeds/tags.rb

@@ -2,9 +2,8 @@ module Octopress
   module Feeds
     class FeedTag < Liquid::Tag
       def render(context)
-        context['site.pages'].dup \
-          .select  { |p| p.data['feed'] } \
-          .map     { |p| tag(p) } \
+        Octopress::Ink.plugin('feeds').pages.dup
+          .map { |p| tag(p.page) }
           .join("\n")
       end
 
@@ -17,7 +16,7 @@ module Octopress
       def page_title(page)
         title = page.site.config['name'].dup || ''
         title << ': ' unless title.empty?
-        title << page.data['title']
+        title << page_title_config(page)
 
         if defined?(Octopress::Multilingual) && page.lang
           title << " (#{Octopress::Multilingual.language_name(page.lang)})"
@@ -25,6 +24,17 @@ module Octopress
 
         title
       end
+
+      def page_title_config(page)
+        plugin = page.plugin
+        config = plugin.config(page.lang)
+
+        case plugin.feed_type(page.asset)
+        when 'article'; config['titles']['article-feed']
+        when 'link'; config['titles']['link-feed']
+        else config['titles']['main-feed']
+        end
+      end
     end
 
     class FeedUpdatedTag < Liquid::Tag
@@ -41,7 +51,7 @@ module Octopress
           posts = site['posts']
         end
 
-        if !posts.empty?
+        if posts && !posts.empty?
           post = posts.sort_by do |p|
             p.data['date_updated'] || p.date
           end.last

data/lib/octopress-feeds/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Feeds
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/lib/octopress-feeds.rb

@@ -33,20 +33,26 @@ module Octopress
 
           # Add default language to main feeds
           @pages.each do |page| 
-            page.data.merge!({'lang' => Octopress.site.config['lang']}) 
+            lang = Octopress.site.config['lang']
+            page.data.merge!({'lang' => lang}) 
+            page.permalink ||= lang_permalink(page, lang)
           end
 
           # Ensure multilingual pages are set up for `ink list` view
           Octopress.site.read if Octopress.site.posts.empty?
 
           # Add pages for other languages
-          Octopress.site.languages.each do |lang|
-            next if lang == Octopress.site.config['lang']
+          Octopress::Multilingual.languages.each do |lang|
+            next if lang == Octopress::Multilingual.main_language
             @pages.concat add_lang_pages(lang)
           end
         end
       end
 
+      def lang_permalink(page, lang)
+        File.join("/#{lang}", "feed", feed_url(page), '/')
+      end
+
       def add_lang_pages(lang)
         lang_pages = []
 
@@ -54,10 +60,10 @@ module Octopress
         #
         @pages.each do |page|
           # New name for permalink settings in plugin config.yml
-          permalink_name = "#{page.permalink_name}-#{lang}"
+          permalink_name = "#{page.permalink_name}_#{lang}"
 
-          # Set the permalink defaul to /[lang]/feed/[type]
-          permalink = File.join("/#{lang}", "feed", feed_type(page), '/')
+          # Set the permalink default to /[lang]/feed/[type]
+          permalink = File.join("/#{lang}", "feed", feed_url(page), '/')
 
           # Create a copy of the page
           lang_pages << page.clone(permalink_name, permalink, {'lang'=>lang})
@@ -66,13 +72,21 @@ module Octopress
         lang_pages.sort_by {|p| p.path.size }
       end
 
+      def feed_url(page)
+        case feed_type(page)
+        when 'article'; 'articles'
+        when 'link'; 'links'
+        else ''
+        end
+      end
+
       def feed_type(page)
-        url = if page.file =~ /article/
-          'articles'
+        if page.file =~ /article/
+          'article'
         elsif page.file =~ /link/
-          'links'
+          'link'
         else
-          ''
+          'main'
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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'
 - !ruby/object:Gem::Dependency
   name: octopress-debugger
   requirement: !ruby/object:Gem::Requirement