jekyll-octopod 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac0d253b5505030539f591b0c88d5b07869a37a
-  data.tar.gz: c818a7dd2045899cc4f66ad66ea0ae04dd380c1a
+  metadata.gz: f93d294895f219298797b838ce4d8b9866d42844
+  data.tar.gz: b26cbfe53b8d3bb911b630bd9758b0c19cbdbce5
 SHA512:
-  metadata.gz: 163cfe28813c3fc699026ba14818979c231ce8bcf7d919165450726cd78b2c24fb2ed9d46b3159d76a6c16b045f7f2386d3073dc26f1779c7849d189924cb6dc
-  data.tar.gz: dc2e310590a51b73e2bc4f700e8602a82f0c2075873defbb43c9d79283d53950ea3ffb4335a69500418a0ec40810c4f06122f5183779c4a8cd796060355acdcf
+  metadata.gz: b6c30d936573312abd52438365597fa0737df102a78b0a717cb6bc376cf165ec7589a573281ff79485ebfa25729ea65fd2a0225adf555f0ace3eed0be842b2b1
+  data.tar.gz: 1cdf43e92c8f8b61f4bc0bd644e6e9b2ad58f0da69fb9219d907be4d2b31f8b89b71c84594dd5b399926238c204087e0fc881317033c22c195eb33ef131cc120

data/assets/_layouts/feed.xml

@@ -1,26 +1,34 @@
 ---
 layout: null
 ---
-<?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
+<?xml version="1.0"
+      encoding="UTF-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom"
+     xmlns:bitlove="http://bitlove.org"
+     xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
+     xmlns:content="http://purl.org/rss/1.0/modules/content/"
+     xmlns:psc="http://podlove.org/simple-chapters"
+     version="2.0">
+
   <channel>
     <title>{{ site.title }}</title>
     <link>{{ site.url }}</link>
     <atom:link href="{{ site.url }}/episodes.{{ page.format }}.rss{{page.myself}}" rel="self" type="application/rss+xml" title="{{ page.format }} Episode RSS-Feed"/>
     <atom:link href="{{ site.url }}/episodes.{{ page.format }}.rss" rel="first" type="application/rss+xml" />
-    <atom:link href="{{ site.url }}/episodes.{{ page.format }}.rss{{page.last}}" rel="last" type="application/rss+xml" />
-    {% if page.next %}<atom:link href="{{ site.url }}/episodes.{{ page.format }}.rss{{page.next}}" rel="next" type="application/rss+xml" />{% endif %}
-    {% if page.prev %}<atom:link href="{{ site.url }}/episodes.{{ page.format }}.rss{{page.prev}}" rel="prev" type="application/rss+xml" />{% endif %}
+    <atom:link href="{{ site.url }}/episodes{{page.last}}.{{ page.format }}.rss" rel="last" type="application/rss+xml" />
+    {% if page.next %}<atom:link href="{{ site.url }}/episodes{{page.next}}.{{ page.format }}.rss" rel="next" type="application/rss+xml" />{% endif %}
+    {% if page.prev %}<atom:link href="{{ site.url }}/episodes{{page.prev}}.{{ page.format }}.rss" rel="prev" type="application/rss+xml" />{% endif %}
 
     {{ site | episode_feeds_rss:page.format }}
     <description>{{ site.description | markdownify | strip_html }}</description>
     <lastBuildDate>{{ site.time | time_to_rssschema }}</lastBuildDate>
     <language>{{ site.language }}</language>
+    <generator>Jekyll-Octopod {{ site | version_string }}</generator>
 
     <itunes:summary>{{ site.description | markdownify | strip_html }}</itunes:summary>
     <itunes:author>{{ site.author }}</itunes:author>
     <itunes:explicit>{{ site.explicit }}</itunes:explicit>
-    <itunes:image href="{{ site.url | http_only }}/img/logo-itunes.jpg" />
+    <itunes:image href="{{ site.url }}/img/logo-itunes.jpg" />
     <itunes:owner>
       <itunes:name>{{ site.author }}</itunes:name>
       <itunes:email>{{ site.email }}</itunes:email>
@@ -53,7 +61,8 @@ layout: null
             <guid isPermaLink="false">{{ site.url }}{{ post.url }}</guid>
             <description><![CDATA[{{ post.content | expand_urls: site.url | cdata_escape | remove_script_and_audio }}]]></description>
             <content:encoded><![CDATA[{{ post.content | expand_urls: site.url | cdata_escape | remove_script_and_audio }}]]></content:encoded>
-            <enclosure url="{{ site.url | http_only }}/episodes/{{ post.audio | audio:page.format }}" length="{{ post.audio | audio:page.format | file_size }}" type="{{ page.format | mime_type }}" />
+            {% assign url = site.url | append: '/episodes/' | append: post.audio[page.format] %}
+            <enclosure url="{{ url }}" length="{{ post.audio | audio:page.format | file_size }}" type="{{ page.format | mime_type }}" guid="{{ url | sha1:32}}" />
             <itunes:keywords>{{ post.tags }}</itunes:keywords>
             <itunes:subtitle>{{ post.subtitle }}</itunes:subtitle>
             <itunes:summary>{{ post.summary }}</itunes:summary>
@@ -68,6 +77,23 @@ layout: null
               {% endfor %}
             </psc:chapters>
             {% endif %}
+            {% if post.contributors %}
+              {% for contributor in post.contributors %}
+              <atom:contributor>
+                <atom:name>{{ contributor.name}}</atom:name>
+                <atom:uri>{{ contributor.uri}}</atom:uri>
+                <atom:email>{{ contributor.email}}</atom:email>
+              <atom:contributor>
+              {% endfor %}
+            {% endif %}
+            {% if post.image %}
+              <itunes:image href="{{ site.url }}/img/{{post.image}}" />
+              <image>
+                <title>{{ post.image_title }}</title>
+                <url>{{ site.url }}/img/{{post.image}}</url>
+                <link>{{ site.url }}</link>
+              </image>
+            {% endif %}
           </item>
         {% endif %}
       {% endif %}

data/lib/jekyll-octopod.rb

@@ -1,6 +1,7 @@
 require "jekyll/flattr_filters"
 require "jekyll/octopod_filters"
 require "jekyll/paged_feed_page"
+require "jekyll/paged_feed_page_generator"
 require "jekyll/podcast_player_page"
 require "jekyll/podcast_player_page_generator"
 require "jekyll/update_config"

data/lib/jekyll/octopod_filters.rb

@@ -33,10 +33,6 @@ module Jekyll
       input.gsub(/<audio.*audio>/m, '').gsub(/<script.*script>/m, '')
     end
 
-    def http_only(input)
-      input.gsub(/https/,"http")
-    end
-
     # Formats a Time to be RSS compatible like "Wed, 15 Jun 2005 19:00:00 GMT"
     #
     #   {{ site.time | time_to_rssschema }}
@@ -298,6 +294,10 @@ module Jekyll
       }.join("\n")
     end
 
+    # Prints out current version
+    def version_string(site)
+      Jekyll::Octopod::VERSION::STRING
+    end
   end
 end
 

data/lib/jekyll/paged_feed_page_generator.rb

@@ -0,0 +1,20 @@
+module Jekyll
+  class PagedFeedPageGenerator < Generator
+    safe true
+
+    def generate(site)
+      pages_total = (site.posts.docs.count.to_f / site.config["episodes_per_feed_page"]).ceil
+
+      site.config["episode_feed_formats"].each do |page_format|
+        name = "episodes." + page_format + ".rss"
+        page = PagedFeedPage.new(site, site.source, ".", name, 1, pages_total, page_format)
+        site.pages << page
+        (1..pages_total).each do |page_number|
+          name = "episodes" + page_number.to_s + "." + page_format + ".rss"
+          page = PagedFeedPage.new(site, site.source, ".", name, page_number, pages_total, page_format)
+          site.pages << page
+        end
+      end
+    end
+  end
+end

data/lib/octopod/version.rb

@@ -3,7 +3,7 @@ module Jekyll
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 8
+      TINY  = 9
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-octopod
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Arne Eilermann
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -133,6 +133,7 @@ files:
 - lib/jekyll/flattr_filters.rb
 - lib/jekyll/octopod_filters.rb
 - lib/jekyll/paged_feed_page.rb
+- lib/jekyll/paged_feed_page_generator.rb
 - lib/jekyll/podcast_player_page.rb
 - lib/jekyll/podcast_player_page_generator.rb
 - lib/jekyll/podigee_player_tag.rb