jekyll-octopod 0.18.2 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e95c321128dfae975297d56250d21c9f7f47183ee0a4e54aaad16dd2541d210
-  data.tar.gz: 7cab5b2868fece52002befdef60aa5a286fdcd87584e004cf06d3462598090f1
+  metadata.gz: bab9d22951437197ea9b85735a898f4c6fe4582ee18eb942f63864cbe842c5b9
+  data.tar.gz: 9dee8614f7de17e484323d2ca79d84be23e798dc953a98abe9c2dfae592be4fb
 SHA512:
-  metadata.gz: 3331337c0ff0ee9b95376ab00899364f7032b549711bf8a6fa4e556c5d61a190fd495e08b4fa73e2847890b4a161eac4614ec6ab0f7a3cb490dc38d509d52836
-  data.tar.gz: 52d377821ee236e2d25e578835e742811a2aa25d93f517a7898f542c4cc23e474a5e3812fae2164c6d8e91d7ab8b893b149a6f1f15268329d74985b1ff8ae4eb
+  metadata.gz: 90483ebdbb7ba04b2dd8c0a5a196f75356224fb482488de2b030ae02ab975f513012ca718bbb52ee6c9404286b019c80a2fc3c509bc5ff7f37f042624be5d77b
+  data.tar.gz: 0fcaa3555178d41f5a30acf9c8fe1254bb59efc19213190e79a59c0b3a6921a61cfee5f29cc82a06287845dd448e0f276bd8aa2714a758e01c0de5a2c33ebb54

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

@@ -9,9 +9,6 @@ subtitle: Static Site Podcast Publishing for Geeks
 description: My super duper cool podcast.
 author: Uncle Octopod
 
-### author_url: This is the URL of a site owned by the author (see https://jsonfeed.org/version/1)
-author_url: "http://your.fancy.hosting/"
-
 email: octopod@example.com
 keywords: [octopod, podcast, magic]
 itunes_categories: [Technology]
@@ -49,10 +46,6 @@ itunes_url: https://itunes.apple.com/at/podcast/myname/id232323
 #  torrent_m4a: http://bitlove.org/example_user/example_podcast_m4a/feed
 #  torrent_mp3: http://bitlove.org/example_user/example_podcast_mp3/feed
 
-### Disqus comments
-disqus_shortname: # Disqus will not be used unless this is set
-disqus_developer: 0 # 1 | 0
-
 ### Isso comments
 use_isso: "no" # "no" | "yes"
 

data/bin/octopod

@@ -407,7 +407,7 @@ if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == '
     now_theme_served = theme_shipped_generic_files + %w[
       podlove-player subscribe-button favicon.ico apple-touch-icon-precomposed.png
       _includes/sidebar.html _includes/post_header.html _includes/post.html _includes/post_line.html
-      _includes/disqus_thread.html _includes/disqus_count.html _includes/isso_thread.html
+      _includes/isso_thread.html
     ]
     found_theme_served = now_theme_served.select { |path| File.exist?(File.join(PWD, path)) }
 
@@ -420,6 +420,23 @@ if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == '
       puts "===== ... done ===== ", ""
     end
 
+    # As of jekyll-octopod 0.19.0/0.20.0, JSON Feed and Disqus support are gone outright - not
+    # moved to the theme gem the way the paths above were, just removed. JSON Feed: no real
+    # podcast client ever consumed it, and a since-fixed bug in this gem's own :after_init hook
+    # meant it silently never even built. Disqus: unused across every site in this gem's own
+    # family (none had disqus_shortname set) and superseded by Isso for self-hosted comments. Any
+    # leftover 'feed.*.json' marker file or local copy of the old disqus includes is now genuinely
+    # dead - nothing generates or serves it any more. Removed the same way theme-served files are
+    # removed above.
+    removed_feature_paths = Dir.glob(File.join(PWD, 'feed.*.json')) +
+      %w[_includes/disqus_thread.html _includes/disqus_count.html]
+        .map { |path| File.join(PWD, path) }.select { |path| File.exist?(path) }
+    unless removed_feature_paths.empty?
+      puts "", "===== Removing files for features that were removed entirely (JSON Feed, Disqus) ====="
+      removed_feature_paths.each { |path| remove_theme_served_path(path) }
+      puts "===== ... done ===== ", ""
+    end
+
     puts "", "===== Pointing Gemfile/_config.yml at jekyll-octopod-bulma ... ====="
     update_gemfile_and_theme_config
     puts "===== ... done ===== ", ""

data/lib/jekyll/octopod_filters.rb

@@ -222,31 +222,6 @@ module Jekyll
       "@#{user}@#{uri.host}"
     end
 
-    # Generates the config for disqus integration
-    # If a page object is given, it generates the config variables only for this
-    # page. Otherwise it generate only the global config variables.
-    #
-    #   {{ site | disqus_config }}
-    #   {{ site | disqus_config:page }}
-    def disqus_config(site, page = nil)
-      if page
-        disqus_vars = {
-          'disqus_identifier'  => page['url'],
-          'disqus_url'         => "#{site['url']}#{page['url']}",
-          'disqus_category_id' => page['disqus_category_id'] || site['disqus_category_id'],
-          'disqus_title'       => j(page['title'] || site['site'])
-        }
-      else
-        disqus_vars = {
-          'disqus_developer'   => site['disqus_developer'],
-          'disqus_shortname'   => site['disqus_shortname']
-        }
-      end
-
-      disqus_vars.delete_if { |_, v| v.nil? }
-      disqus_vars.map { |k, v| "var #{k} = '#{v}';" }.compact.join("\n")
-    end
-
     # Returns the hex-encoded hash value of a given string. The optional
     # second argument defines the length of the returned string.
     #

data/lib/jekyll/update_config.rb

@@ -5,19 +5,14 @@ module Jekyll
       site.config.update(
         'episode_feed_formats' => feeds.map { |f| f.match(/episodes\.(\w{3,4})\.rss/)[1] }
       )
-      jsonfeeds = Dir["feed.{???,????}.json"]
-      site.config.update(
-        'json_feed_formats'    => jsonfeeds.map { |f| f.match(/feed\.(\w{3,4})\.json/)[1] }
-      )
 
-      # These marker files exist only so the scan above can detect which
-      # formats to generate; PagedFeedPageGenerator creates the actual pages
-      # at these exact paths. Excluding them here keeps Jekyll's normal
-      # reader from also turning them into pages, which would otherwise
+      # This marker file exists only so the scan above can detect which formats to generate;
+      # PagedFeedPageGenerator creates the actual pages at these exact paths. Excluding it here
+      # keeps Jekyll's normal reader from also turning it into a page, which would otherwise
       # collide with the generator's output at the same destination.
-      # site.exclude (not site.config['exclude']) is what Reader actually
-      # consults, and it's copied from config before this hook runs.
-      site.exclude += feeds + jsonfeeds
+      # site.exclude (not site.config['exclude']) is what Reader actually consults, and it's
+      # copied from config before this hook runs.
+      site.exclude += feeds
     end
   end
 end

data/lib/octopod/version.rb

@@ -2,8 +2,8 @@ module Jekyll
   class Octopod
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 18
-      TINY  = 2
+      MINOR = 20
+      TINY  = 1
 
       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.18.2
+  version: 0.20.1
 platform: ruby
 authors:
 - Arne Eilermann
@@ -105,6 +105,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- assets/_config.yml
 - assets/_config.yml.sample
 - assets/_posts/2016-03-22-episode0.md
 - assets/_sass/_overrides.scss
@@ -114,9 +115,6 @@ files:
 - assets/episodes/episode0.m4a
 - assets/episodes/episode0.mp3
 - assets/episodes/episode0.ogg
-- assets/feed.m4a.json
-- assets/feed.mp3.json
-- assets/feed.ogg.json
 - assets/general_feed.xml
 - assets/imprint.md
 - assets/index.md

data/assets/feed.m4a.json

@@ -1,5 +0,0 @@
----
-layout: jsonfeed
-format: m4a
----
-{{ content }}

data/assets/feed.mp3.json

@@ -1,5 +0,0 @@
----
-layout: jsonfeed
-format: mp3
----
-{{ content }}

data/assets/feed.ogg.json

@@ -1,5 +0,0 @@
----
-layout: jsonfeed
-format: ogg
----
-{{ content }}