jekyll-octopod 0.9.9 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15279c742776ce7b6c9656ea90def2c7ebccbb9286a0c4bae46aff591270dcd9
-  data.tar.gz: 2592bf80afe7393f38c813e1966859a254b524f1ea8e2d8a02de86e2c93432c3
+  metadata.gz: b7269818a8369249ba866e41eae32e5185151870236d187008b23c2201f0b52c
+  data.tar.gz: 26f2e263a571f7685d9ffe91124405e6ae2e130d17da5badb17e0d89e1157bfb
 SHA512:
-  metadata.gz: 410683612825c799edafa2acb38b94b24c184f4fbad70e0a70312ff6b31bb46b90d8a24b16035d2569bd5b07595886052a39627bb79475556e303f81a7bf33b1
-  data.tar.gz: 822a8c45a2c08a74e60e8254b4cd4d91daaa4e5c97db577e1d09f77e97dec2e3d2ffbd21e6730547b7d83af0d1e603356a5fd7a19b2bdb56f4ed00c95643983c
+  metadata.gz: 7b43b3c1e8c39ed3916325a14a8281dcc0095c3ee7b8d85c8e00a9b7d7af94d5a62b128a4032072a9d1d32f990dff1bd1ab5be36186f12d4a0a35d3df7388550
+  data.tar.gz: a26627d73215bce30e851840512c2f420d13dd52f3533ba98ff77c5f92572e608c52bff971fd51669ada08712fc7ff99db1a754f6581c526d7cd7d1ddfa62832

data/assets/_config.yml

@@ -0,0 +1,47 @@
+# You have to configure this ###################################################
+title: Octopod
+# You should configure this ####################################################
+url: http://localhost:4000
+subtitle: Static Site Podcast Publishing for Geeks
+description: My super duper cool podcast.
+author: Uncle Octopod
+email: octopod@example.com
+keywords: [octopod, podcast, magic]
+itunes_categories: [Technology]
+# additional_feeds:
+#   itunes: http://itunes.apple.com/de/podcast/podcast_name/id42424242
+#   torrent_m4a: http://bitlove.org/example_user/example_podcast_m4a/feed
+#   torrent_mp3: http://bitlove.org/example_user/example_podcast_mp3/feed
+episodes_per_feed_page: 100
+## Rsync Deploy config #########################################################
+### Be sure your public key is listed in your server's ~/.ssh/authorized_keys
+### file.
+ssh_host: user@host.org
+ssh_port: 22
+document_root: /path/to/your/htdocs/
+rsync_delete: true
+# You can configure this #######################################################
+twitter_nick: my_twitter_handle
+language: en
+explicit: 'no'  # 'yes'/'no'/clean
+license: CC BY 4.0
+license_url: https://creativecommons.org/licenses/by/4.0/
+license_image_url: https://i.creativecommons.org/l/by/4.0/88x31.png
+## Flattr ######################################################################
+flattr_uid: # Flattr will not be used unless this is set
+flattr_button: compact # compact | default
+flattr_mode: auto # auto | manual(default)
+flattr_popout:  1 # 1 | 0 (show popout when hovering mouse over button)
+flattr_language: en_GB # available languages - https://api.flattr.com/rest/v2/languages.txt
+flattr_category: audio # available categories - https://api.flattr.com/rest/v2/categories.txt
+## Disqus comments #############################################################
+disqus_shortname: # Disqus will not be used unless this is set
+disqus_developer: 0 # 1 / 0
+## Feed links ###########################################################
+itunes_url: https://itunes.apple.com/at/podcast/myname/id#myid#
+bitlove_url: https://bitlove.org/myaccount
+fyyd_url: https://fyyd.de/podcast/myaccount/myid
+gpodder_url: https://gpodder.net/podcast/mypodcast
+
+gems: [jekyll-octopod]
+theme: jekyll-bootflat

data/assets/_config.yml.sample

@@ -39,6 +39,7 @@ license_image_url: https://i.creativecommons.org/l/by/4.0/88x31.png
 
 ### Feed links, optional
 itunes_url: https://itunes.apple.com/at/podcast/myname/id232323
+# google_play_url: https://playmusic.app.goo.gl/...
 # bitlove_url: https://bitlove.org/myaccount
 # fyyd_url: https://fyyd.de/podcast/myaccount/myid
 # gpodder_url: https://gpodder.net/podcast/mypodcast
@@ -70,3 +71,11 @@ theme: jekyll-bootflat
 plugins:
   - jekyll-octopod
 #  - jekyll-admin
+
+### Links to all domains, expect whitelisted will be rendered with rel="nofollow noopener noreferrer"
+# kramdown:
+#   input: 'NoopenerGFM'
+#   same_tab_domains:
+#     - localhost
+#     - 127.0.0.1
+#     - podcast.your-domain.com

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_megabytes }})</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>
@@ -17,7 +23,7 @@
      class="button btn-primary btn-sm"
      data-url="{{ site.url }}{{post.url }}"
      data-text="{{ post.title }}">
-    <i class="fa fa-twitter"></i> Tweet</a>
+    <i class="fab fa-twitter"></i> Tweet</a>
   {% unless page.url == '/index.html' %}{% include disqus_thread.html %}{% endunless %}
   {% unless page.url == '/index.html' %}{% include isso_thread.html %}{% endunless %}
   <hr>

data/assets/_includes/sidebar.html

@@ -65,7 +65,10 @@
 
 <ol type="i">
   {% if site.itunes_url %}
-    <li>in Apple-<a href="{{ site.itunes_url }}"><i class="fa fa-apple"></i> Itunes</a></li>
+    <li>in Apple-<a href="{{ site.itunes_url }}"><i class="fab fa-apple"></i> Itunes</a></li>
+  {% endif %}
+  {% if site.google_play_url %}
+    <li>in <a href="{{ site.itunes_url }}"><i class="fab fa-apple"></i>Google Play</a></li>
   {% endif %}
   {% if site.bitlove_url %}
     <li>as Torrents at <a href="{{ site.bitlove_url }}"><img src="https://bitlove.org/static/favicon.png"/> Bitlove</a></li>
@@ -107,6 +110,6 @@
   <a href="https://twitter.com/{{ site.twitter_nick }}"
      class="button btn-primary btn-sm"
      data-show-count="false">
-    <i class="fa fa-twitter"></i>Follow @{{ site.twitter_nick }}
+    <i class="fab fa-twitter"></i>Follow @{{ site.twitter_nick }}
   </a>
 {% endif %}

data/assets/_layouts/default.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ site.language }}">
 <head>
-  <meta charset="utf-8">
+  <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <title>{{ site.title }} - {{ page.title | otherwise:site.subtitle }}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -12,6 +12,7 @@
   <link rel="alternate" type="application/atom+xml" href="{{ site.url }}/general_feed.xml" title="General Site Atom Feed (No Podcast Metadata!)" />
   {{ site | episode_feeds_html }}
 
+  <link href='/assets/css/ubuntu.css' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" type="text/css" href="{{ site.url }}/assets/css/main.css">
 
   <script type='text/javascript' src="{{ site.url }}/assets/js/jquery.min.js"></script>

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/_layouts/with_twitter_card.html

@@ -12,6 +12,7 @@
   <link rel="alternate" type="application/atom+xml" href="{{ site.url }}/general_feed.xml" title="General Site Atom Feed (No Podcast Metadata!)" />
   {{ site | episode_feeds_html }}
 
+  <link href='/assets/css/ubuntu.css' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" type="text/css" href="{{ site.url }}/assets/css/main.css">
 
   <script type='text/javascript' src="{{ site.url }}/assets/js/jquery.min.js"></script>
@@ -60,7 +61,7 @@
           </ul>
           <form class="navbar-form navbar-right" action="https://google.com/search" method="get" role="search">
             <div class="form-group">
-              <input type="text" class="form-control" placeholder="search item">
+              <input type="text" name="q" class="form-control" placeholder="search item" value="">
               <input type="hidden" name="q" value="site:{{ site.url | host_from_url }}" />
             </div>
             <button type="submit" class="btn btn-default">Search</button>

data/assets/general_feed.xml

@@ -22,7 +22,17 @@ 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 %}
+          <link rel="enclosure" 
+                type="{{ file.first | mime_type }}" 
+                length="{{ file.last | file_size }}" 
+                href="{{ site.url }}/episodes/{{ file.last }}"/>    
+        {% endif %}
       {% endfor %}
       {{ site | flattr_atom:post }}
     </entry>

data/lib/jekyll-octopod.rb

@@ -10,3 +10,4 @@ require "jekyll/static_file"
 require "jekyll/podigee_player_tag"
 require "jekyll/date_de"
 require "octopod/version"
+require "kramdown/parser/noopener_gfm"

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,24 @@ module Jekyll
       File.size(path)
     end
 
+    # Returns the size of a given file in bytes by looking into the front matter
+    # The sizes should be in 
+    # filesize:
+    #   mp3: 4242
+    # ...
+    #
+    #   {{ "example.m4a" | size_by_format: "mp3" }} => 4242
+    def size_by_format(page, format)
+      page["filesize"][format]
+    end
+
+    # Converts a size in Bytes to Megabytes
+    #
+    #   {{ 123456 | in_megabytes }} => 0.1 MB
+    def in_megabytes(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/kramdown/parser/noopener_gfm.rb

@@ -0,0 +1,20 @@
+class Kramdown::Parser::NoopenerGFM < Kramdown::Parser::GFM
+  SAFE_OPTS = { "target" => "_blank", "rel"=>"nofollow noopener noreferrer" }.freeze
+
+  def initialize(source, options)
+    super
+    @same_tab_domains = options.fetch(:same_tab_domains, [])
+  end
+
+  def update_elements(element)
+    if element.type == :a && \
+       element.attr.respond_to?(:[]) && \
+       (href = element.attr['href']) && \
+       URI::DEFAULT_PARSER.regexp[:ABS_URI].match(href) && \
+       !@same_tab_domains.include?(URI::parse(href).host)
+
+      element.attr.merge!(SAFE_OPTS)
+    end
+    super
+  end
+end

data/lib/octopod/version.rb

@@ -3,7 +3,7 @@ module Jekyll
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 9
-      TINY  = 9
+      TINY  = 14
 
       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.9
+  version: 0.9.14
 platform: ruby
 authors:
 - Arne Eilermann
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -31,34 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: jekyll-bootflat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +92,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- assets/_config.yml
 - assets/_config.yml.sample
 - assets/_includes/disqus_count.html
 - assets/_includes/disqus_thread.html
@@ -306,6 +301,7 @@ files:
 - lib/jekyll/podigee_player_tag.rb
 - lib/jekyll/static_file.rb
 - lib/jekyll/update_config.rb
+- lib/kramdown/parser/noopener_gfm.rb
 - lib/octopod/version.rb
 homepage: https://github.com/haslinger/jekyll-octopod
 licenses:
@@ -326,8 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: jekyll-
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Podcasting Publishing Extension for Jekyll