Merge pull request #13 from jekyll/type-specific-layouts

Add support for type-specific layouts

Author: alfredxing

lib/jekyll-archives/archive.rb

@@ -25,10 +25,11 @@ class Archive
     # type  - The type of archive. Can be one of "year", "month", "day", "category", or "tag"
     # posts - The array of posts that belong in this archive.
     def initialize(site, title, type, posts)
-      @site  = site
-      @posts = posts
-      @type  = type
-      @title = title
+      @site   = site
+      @posts  = posts
+      @type   = type
+      @title  = title
+      @config = site.config['jekyll-archives']
 
       # Generate slug if tag or category (taken from jekyll/jekyll/features/support/env.rb)
       if title.is_a? String
@@ -41,7 +42,7 @@ def initialize(site, title, type, posts)
       @name = File.basename(relative_path, @ext)
 
       @data = {
-        "layout" => site.config['jekyll-archives']['layout']
+        "layout" => layout
       }
       @content = ""
     end
@@ -50,7 +51,18 @@ def initialize(site, title, type, posts)
     #
     # Returns the template String.
     def template
-      site.config['jekyll-archives']['permalinks'][type]
+      @config['permalinks'][type]
+    end
+
+    # The layout to use for rendering
+    #
+    # Returns the layout as a String
+    def layout
+      if @config['layouts'] && @config['layouts'][type]
+        @config['layouts'][type]
+      else
+        @config['layout']
+      end
     end
 
     # Returns a hash of URL placeholder names (as symbols) mapping to the
@@ -136,7 +148,7 @@ def relative_path
 
     # Returns the object as a debug String.
     def inspect
-      "#<Jekyll:Archive @type=#{@type.to_s} @title=#{@title}>"
+      "#<Jekyll:Archive @type=#{@type.to_s} @title=#{@title} @data=#{@data.inspect}>"
     end
 
     # Returns the Boolean of whether this Page is HTML or not.

test/test_jekyll_archives.rb

@@ -56,8 +56,7 @@ class TestJekyllArchives < Minitest::Test
           "enabled" => true
         }
       })
-      @site.read
-      @archives = Jekyll::Archives.new(@site.config)
+      @site.process
     end
 
     should "use custom layout" do
@@ -66,6 +65,26 @@ class TestJekyllArchives < Minitest::Test
     end
   end
 
+  context "the jekyll-archives plugin with type-specific layout" do
+    setup do
+      @site = fixture_site({
+        "jekyll-archives" => {
+          "enabled" => true,
+          "layouts" => {
+            "year" => "archive-too"
+          }
+        }
+      })
+      @site.process
+    end
+
+    should "use custom layout for specific type only" do
+      assert_equal "Test too", read_file("/2014/index.html")
+      assert_equal "Test too", read_file("/2013/index.html")
+      assert_equal "Test", read_file("/tag/test-tag/index.html")
+    end
+  end
+
   context "the jekyll-archives plugin with custom permalinks" do
     setup do
       @site = fixture_site({