octopress-feeds 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60983f3c3127540cf1d3793d155045c3dabde8fe
-  data.tar.gz: 895719b413c047564f3234273a8346c6b8887335
+  metadata.gz: 32fe7ffd3a4d4a8b9e168653192cf322bc366ca5
+  data.tar.gz: 79a174f7ee75a3c5c01f162d86baaa95e75a0799
 SHA512:
-  metadata.gz: b489b2b14909a1d9731f8a81d0738683820b121879032393034475c4dd02dc2f8840081091b8bfbea860654b05e8f7e7e18ab6f2e8214091eca8767cbf4fda6f
-  data.tar.gz: fafc9a88c2506b9ad0260e538a41943409d93ab95821c745717e1f976d036b3f2748720f35d2386d1c185bd8bbbf102ede4008b701d991be0654c11e8c06d2ec
+  metadata.gz: 3ef7adf155249df5cac2c22b002ee51360066cf544d3391e86459eee3d236cc5e68c2528708cc6726949c20b33478c95a26ffa080cf6bf46cb6505e94095c95c
+  data.tar.gz: 7fc999ccdc6124362d2fa58c0897c03d411f523fa4d5a03134474e4bd69dc7ba0a8c34d924a69ca11632deb3f5500370476cd2373bfe31cd9aabea461d57eb65

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.4 (2015-01-26)
+
+- Link and Article feeds are automatically added when linkblog plugin is added.
+
 ### 1.2.3 (2015-01-24)
 - Fix: Posts use canonical URLs in feeds.
 - Improved `baseurl` support.

data/README.md

@@ -94,7 +94,7 @@ title: Deutsch Artikel Feed
 {% include feeds:article-feed.xml lang='de' %}
 ```
 
-To add a link posts feed, add a file to `/de/feed/links/index.xml` containing the following:
+To add a link-posts feed, add a file to `/de/feed/links/index.xml` containing the following:
 
 ```
 ---
@@ -106,7 +106,7 @@ title: Deutsch Link Feed
 
 That's it. When you generate your site. These feeds should contain only German posts. If you have more than one language, you can just repeat the steps above for each.
 
-## Customization
+## Customize feeds
 
 To list detailed information about this plugin, run `$ octopress ink list feeds`. This will output something like this:
 
@@ -167,12 +167,39 @@ 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.                           |             |
 
-Note: Post excerpts are determined by Jekyll's `excerpt_separator` configuration. It defaults to splitting your
+
+### Feed permalinks
+
+You can set the URL for the feed pages by configuring the `permalink` setting. Here's an example:
+
+```yaml
+permalinks:
+  main-feed: /rss/
+  link-feed: /rss/links/
+  article-feed: /rss/articles/
+```
+
+Now when you run `$ octopress ink list feeds` the pages section will look like this:
+
+```
+pages:                              urls:
+  - article-feed.xml                   /rss/articles/index.xml
+  - link-feed.xml                      /rss/links/index.xml
+  - main-feed.xml                      /rss/index.xml
+```
+
+Note: Multilingual feeds will not show up here. This only shows pages that come with this plugin.
+
+### Excerpted feeds
+
+Post excerpts are determined by Jekyll's `excerpt_separator` configuration. It defaults to splitting your
 post at the first double line-break, `\n\n`. If you want more control over where the excerpt happens on your individual
 posts, You can change that to something like `<!--more-->` and place that comment wherever you like in your post to
 split the content there.
 
+
 ## Contributing
 
 1. Fork it ( https://github.com/octopress/feeds/fork )

data/assets/config.yml

@@ -1,5 +1,3 @@
 count: 20
 excerpts: false         # Feed excerpts post content
 external_links: true    # Linkposts should direct visitors to the linked site
-articles_feed: false    # Add a feed with articles only
-linkposts_feed: false   # Add a feed with linkposts only

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 and plugins.feeds.articles_feed %}{% include feeds:article-feed.xml %}
+{% abort unless site.articles and site.articles.size > 0 %}{% 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 and plugins.feeds.linkposts_feed %}{% include feeds:link-feed.xml %}
+{% abort unless site.linkposts and site.linkposts.size > 0 %}{% include feeds:link-feed.xml %}

data/lib/octopress-feeds/version.rb

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

metadata

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