octopress-feeds 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd728ec448b8e141757d5f6182aae70a3e8556c
-  data.tar.gz: a5bf1c25a69d11bb40d633b7a159fe4080c673b2
+  metadata.gz: 71bee0e15a5b3f5e34b414c4c2c6d89e8c06bb89
+  data.tar.gz: 34990d035956040f710ecbd122834cf9d6677fb1
 SHA512:
-  metadata.gz: 0022830a0f430dd5ec1e3fb6f6d2d5f3139475eec936ea524eab0b9607645e9624cd8e7e3e5b8741697943fe2fa61fc3f6ba7018a242a0cb440c299d5a3b7ec6
-  data.tar.gz: 2e98b682b48988a9c3d34299471cfa0389f643a4c03959dd0515e74fda81dfd4c9e695e306e51ebfd59b2e226fafd441d6a3153822eea6f386746a3f894c7143
+  metadata.gz: 4f20f380fc274eef3c11dca8dfbaefba9b96830a0b03eb3af0613f4b552b467ccda5f264733cd279d566d22c3ffe05706eeecc151ac906cd6d8d54fd9aa434b6
+  data.tar.gz: d5e973edb2bfa19ac32f6b6061d38e128196556e862f7d626bfb4d84d40460b7db8568d8c3571e9c59db78b9bf9933524b73383380b134085de76089f5c272ac

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.6 (2015-01-27)
+
+- On multilanguage sites, the main language feed URL will default to `/[lang]/feed/index.xml`
+
 ### 1.2.5 (2015-01-26)
 
 - Fix: Feed excerpts work with linkblog and multilingual sites.

data/README.md

@@ -67,9 +67,20 @@ Install [octopress-linkblog](https://github.com/octopress/linkblog) and posts wi
 
 ## Multilingual support
 
-If you are using [octopress-multilingual](https://github.com/octopress/multilingual), adding a secondary language feed is pretty simple. Let's say your primary language is English, but you want to add a German feed. Here's what you'd do.
+If you are using [octopress-multilingual](https://github.com/octopress/multilingual), your feed urls will be organized by language. If
+your site's main language is `en` your English feeds will be here:
 
-First, create a language feed at `/de/feed/index.xml` (or whatever path suits your site) and add the following.
+```
+/en/feed/index.xml       # All English posts feed
+/en/links/index.xml      # English link posts (if using octopress-linkblog)
+/en/articles/index.xml   # English article posts (if using octopress-linkblog)
+```
+
+To change the URL for these pages, read the [Feed Permalinks](#feed-permalinks) section below.
+
+Adding a secondary language feed is pretty simple. Let's say you want to add a German language feed. Here's what you'd do.
+
+First, create a page at `/de/feed/index.xml` (or whatever path suits your site's URL conventions) and add the following.
 
 ```
 ---

data/lib/octopress-feeds/config-asset.rb

@@ -0,0 +1,22 @@
+module Octopress
+  module Feeds
+    class Config < Ink::Assets::Config
+      def read
+        config = super
+        if defined? Octopress::Multilingual
+          config = Jekyll::Utils.deep_merge_hashes(multilingual_permalinks, config)
+        end
+        config
+      end
+
+      def multilingual_permalinks
+        lang = Octopress.site.config['lang']
+        { "permalinks" => {
+          "main-feed"    => "/#{lang}/feed/",
+          "link-feed"    => "/#{lang}/feed/links/",
+          "article-feed" => "/#{lang}/feed/articles/"
+        }}
+      end
+    end
+  end
+end

data/lib/octopress-feeds/tags.rb

@@ -3,10 +3,9 @@ module Octopress
     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) } \
+          .select  { |p| p.data['feed'] } \
+          .sort_by { |p| p.path.size } \
+          .map     { |p| tag(p) } \
           .join("\n")
       end
 

data/lib/octopress-feeds/version.rb

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

data/lib/octopress-feeds.rb

@@ -5,12 +5,17 @@ require 'octopress-abort-tag'
 require 'octopress-return-tag'
 require 'octopress-date-format'
 require 'octopress-feeds/tags'
+require 'octopress-feeds/config-asset'
 
 
 module Octopress
   module Feeds
     class Plugin < Ink::Plugin
 
+      def config_defaults
+        @config ||= Feeds::Config.new(self, @config_file)
+      end
+
       def add_pages
         super
 
@@ -35,5 +40,3 @@ Octopress::Ink::Plugins.register_plugin(Octopress::Feeds::Plugin, {
   description:   "RSS feeds for Jekyll sites, featuring link-blogging and multilingual support",
   website:       "https://github.com/octopress/feeds"
 })
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -198,6 +198,7 @@ files:
 - assets/pages/link-feed.xml
 - assets/pages/main-feed.xml
 - lib/octopress-feeds.rb
+- lib/octopress-feeds/config-asset.rb
 - lib/octopress-feeds/tags.rb
 - lib/octopress-feeds/version.rb
 homepage: https://github.com/octopress/feeds