Bagful of fixed for Jekyll 2.4

fwenzel · Oct 16, 2014 · 9240ea8 · 9240ea8
1 parent 85c8197
commit 9240ea8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/site/_config.yml b/site/_config.yml
@@ -11,8 +11,8 @@ owner:
     github: fwenzel
     flickr: freeed
 
-pygments: true
-markdown: rdiscount
+highlighter: pygments
+markdown: kramdown
 rdiscount:
   extensions: [ footnotes ]
 permalink: /:year/:month/:day/:title/

diff --git a/site/_plugins/base_archive_generator.rb b/site/_plugins/base_archive_generator.rb
@@ -9,8 +9,12 @@ def initialize(site, posts, pager=nil)
       @dir = ''
       @url = @baseurl  # URL without pagination
 
-      @name = "#{@url}index.html"
+      @name = 'index.html'
+      @base = "#{@url}#{@name}"
+
       halt_on_layout_error unless layout_available?
+
+      super @site, @base, @dir, @name
     end
 
     def to_liquid
@@ -74,9 +78,9 @@ def paginate(site, all_posts, pageclass, feedclass, pageargs=[])
       if site.config['paginate'].nil?
         site.pages << pageclass.new(site, all_posts, *pageargs)
       else
-        pages = Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
+        pages = Paginate::Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
         all_posts.each_slice(@site.config['paginate']).with_index do |slice, i|
-          pager = Pager.new(site, i + 1, all_posts, pages)
+          pager = Paginate::Pager.new(site, i + 1, all_posts, pages)
 
           newpage = pageclass.new(site, slice, *pageargs)
           newpage.add_pager(pager)

diff --git a/site/_plugins/tag_archive_generator.rb b/site/_plugins/tag_archive_generator.rb
@@ -21,7 +21,7 @@ def initialize(site, posts, tag)
     end
 
     def data
-      super.deep_merge({
+      Utils.deep_merge_hashes(super, {
         "tag" => @tag,
         "title" => "Posts tagged \"#{@tag}\"",
         "feedurl" => @baseurl + 'feed/'

diff --git a/site/_plugins/yearly_archive_generator.rb b/site/_plugins/yearly_archive_generator.rb
@@ -23,7 +23,7 @@ def initialize(site, posts, year)
     end
 
     def data
-      super.deep_merge({
+      Utils.deep_merge_hashes(super, {
         "year" => @year,
         "title" => @year.to_s,
       })