jekyll-octopod 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9289c490f1a440ed7971c14c1cdfabbc17a034cdd396d36e464b489bc4a8a718
-  data.tar.gz: efd5f19905034f9ff861e426b50036b735af36b62e5e0859963ea94fe6640ff9
+  metadata.gz: f36ab4f125eedb8ab2944b68ae35060b6e38fa3ee40c3a3f9b5000dfd35ed045
+  data.tar.gz: 2f4c2dd4e4303815081c4dcc3c567e6bb2f1bc7c5bee40546c642d03ee0ef775
 SHA512:
-  metadata.gz: 69687c854cb7a116de5d57db2e56d4f541c50f946a68b5e43a487bdc65f328ace80f8f5598d77370e8eb57766452b5361b1d2434e2152abde7f26c989bac3832
-  data.tar.gz: '08beb893b83dc7d0a315a327cb6eba8fdd00579daa88d2420204a1993a158a10e1d1feafe5b3db76d2abb8468d667a085bbc1096f1cdd280762241bf3d06511d'
+  metadata.gz: 245b40715a94b7cc887d1b57b67cf57eb8c7307caca1f6d2fc44579e47174a2e25f9401bbf0f96da0a32e58c8f0cd0f76e0f4d8fd5f48026a189e503ef65b062
+  data.tar.gz: 153407bde19114e7a120122df243d0288abb438d5bf24c2db17f7de3b7eb2f843309f75a100cfbc099c1d7f098e52ec4058112ea061147b9babd180434e4cc76

data/assets/_includes/post.html

@@ -8,7 +8,13 @@
   {{ post.content }}
     {% if post.audio %}
       {% for file in post.audio %}
-      <a class="btn btn-info" href="{{ site | download_url_with_fallback }}/{{ file.last }}">Download .{{ file.first }} ({{ file.last | file_size:'./' | string_of_size }})</a>
+        {% if post.filesize %}
+          <a class="btn btn-info" 
+          href="{{ site | download_url_with_fallback }}/{{ file.last }}">Download .{{ file.first }} ({{ post | size_by_format: file.first | in_kilobytes }})</a>
+        {% else %}
+          <a class="btn btn-info" 
+            href="{{ site | download_url_with_fallback }}/{{ file.last }}">Download .{{ file.first }} ({{ file.last | file_size:'./' | string_of_size }})</a>
+        {% endif %}
       {% endfor %}
     {% endif %}
   <hr>

data/assets/_layouts/feed.xml

@@ -45,15 +45,15 @@ layout: null
     {% for category in site.itunes_categories %}
     <itunes:category text="{{ category | xml_escape }}" />
     {% endfor %}
-    {% if site.download_url == "" or site.download_url == nil %}
+    {%- if site.download_url == "" or site.download_url == nil -%}
       {% assign download_url = site.url | append: '/episodes' %}
-    {% else %}
+    {%- else -%}
       {% assign download_url = site.download_url %}
     {% endif %}
-    {% for post in site.posts %}
-      {% if post.audio[page.format] %}
-        {% assign check = forloop.index0 | divided_by:site.episodes_per_feed_page | plus: 1 %}
-        {% if check == page.page_number %}
+    {%- for post in site.posts -%}
+      {%- if post.audio[page.format] -%}
+        {%- assign check = forloop.index0 | divided_by:site.episodes_per_feed_page | plus: 1 -%}
+        {%- if check == page.page_number -%}
           <item>
             <title>{{ post.title }} - {{ post.subtitle }}</title>
             <link>{{ site.url }}{{ post.url }}</link>
@@ -67,7 +67,15 @@ layout: null
             <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>
             {% assign url = download_url | append: '/' | append: post.audio[page.format] %}
-            <enclosure url="{{ url }}" length="{{ post.audio | audio:page.format | file_size }}" type="{{ page.format | mime_type }}" />
+            {%- if post.filesize -%}
+              <enclosure url="{{ url }}" 
+                         length="{{ post | size_by_format: page.format }}" 
+                         type="{{ page.format | mime_type }}" />
+            {%- else -%}
+              <enclosure url="{{ url }}" 
+                         length="{{ post.audio | audio:page.format | file_size }}" 
+                         type="{{ page.format | mime_type }}" />
+            {% endif %}
             <itunes:keywords>{{ post.tags }}</itunes:keywords>
             <itunes:subtitle>{{ post.subtitle }}</itunes:subtitle>
             <itunes:summary>{{ post.summary }}</itunes:summary>
@@ -75,33 +83,33 @@ layout: null
             <itunes:explicit>{{ post.explicit | otherwise:site.explicit }}</itunes:explicit>
             <itunes:duration>{{ post.duration }}</itunes:duration>
             {{ site | flattr_rss:post }}
-            {% if post.chapters %}
+            {%- if post.chapters -%}
             <psc:chapters version="1.1" xmlns:psc="http://podlove.org/simple-chapters">
-              {% for chapter in post.chapters %}
+              {%- for chapter in post.chapters -%}
               <psc:chapter start="{{ chapter | split_chapter:'start' }}" title="{{ chapter | split_chapter:'title' }}" />
               {% endfor %}
             </psc:chapters>
-            {% endif %}
-            {% if post.contributors %}
-              {% for contributor in post.contributors %}
+            {%- 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 %}
+              {%- 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 %}
+            {%- endif -%}
           </item>
-        {% endif %}
-      {% endif %}
-    {% endfor %}
+        {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   </channel>
 </rss>

data/assets/_layouts/jsonfeed.json

@@ -34,7 +34,11 @@ layout: null
     "attachments": [
       {"url": "{{ url }}",
        "mime_type": "audio/mpeg",
+       {%- if post.filesize -%}
+       "size_in_bytes": "{{ post | size_by_format: page.format }}"
+       {%- else -%}
        "size_in_bytes": "{{ post.audio | audio:mp3 | file_size }}"
+       {%- endif -%}
       }
     ],{% endif %}
     "date_published": "{{ post.date | date_to_xmlschema }}",

data/assets/general_feed.xml

@@ -22,7 +22,19 @@ layout: null
       <id>{{ site.url }}{{ post.id }}</id>
       <content type="html">{{ post.content | xml_escape }}</content>
       {% for file in post.audio %}
-        <link rel="enclosure" type="{{ file.first | mime_type }}" length="{{ file.last | file_size }}" href="{{ site.url }}/episodes/{{ file.last }}"/>
+        {% if post.filesize %}
+          <link rel="enclosure" 
+                type="{{ file.first | mime_type }}" 
+                length="{{ post.filesize[file.first] }}" 
+                href="{{ site.url }}/episodes/{{ file.last }}"/> 
+        {% else %}
+        {% comment %}
+          <link rel="enclosure" 
+                type="{{ file.first | mime_type }}" 
+                length="{{ file.last | file_size }}" 
+                href="{{ site.url }}/episodes/{{ file.last }}"/>    
+                {% endcomment %}    
+        {% endif %}
       {% endfor %}
       {{ site | flattr_atom:post }}
     </entry>

data/lib/jekyll/octopod_filters.rb

@@ -64,7 +64,6 @@ module Jekyll
       end
     end
 
-
     # Returns the audio-type of a given hash. Is no key as second parameter given, it
     # trys first "mp3", than "m4a" and than it will return a more or less random
     # value.
@@ -103,6 +102,14 @@ module Jekyll
       File.size(path)
     end
 
+    def size_by_format(page, format)
+      page["filesize"][format]
+    end
+
+    def in_kilobytes(size_in_bytes)
+      (size_in_bytes / 1024.0 / 1024.0).round(2).to_s + " MB"
+    end
+
     # Returns a slug based on the id of a given page.
     #
     #   {{ page | slug }} => '2012_10_02_octopod'

data/lib/octopod/version.rb

@@ -3,7 +3,7 @@ module Jekyll
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 9
-      TINY  = 12
+      TINY  = 13
 
       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.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Arne Eilermann
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -322,8 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: jekyll-
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Podcasting Publishing Extension for Jekyll