mirror of
				https://github.com/gohugoio/hugo.git
				synced 2024-05-11 05:54:58 +00:00 
			
		
		
		
	Make Page an interface
The main motivation of this commit is to add a `page.Page` interface to replace the very file-oriented `hugolib.Page` struct. This is all a preparation step for issue #5074, "pages from other data sources". But this also fixes a set of annoying limitations, especially related to custom output formats, and shortcodes. Most notable changes: * The inner content of shortcodes using the `{{%` as the outer-most delimiter will now be sent to the content renderer, e.g. Blackfriday. This means that any markdown will partake in the global ToC and footnote context etc. * The Custom Output formats are now "fully virtualized". This removes many of the current limitations. * The taxonomy list type now has a reference to the `Page` object. This improves the taxonomy template `.Title` situation and make common template constructs much simpler. See #5074 Fixes #5763 Fixes #5758 Fixes #5090 Fixes #5204 Fixes #4695 Fixes #5607 Fixes #5707 Fixes #5719 Fixes #3113 Fixes #5706 Fixes #5767 Fixes #5723 Fixes #5769 Fixes #5770 Fixes #5771 Fixes #5759 Fixes #5776 Fixes #5777 Fixes #5778
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
// Copyright 2018 The Hugo Authors. All rights reserved.
 | 
			
		||||
// Copyright 2019 The Hugo Authors. All rights reserved.
 | 
			
		||||
//
 | 
			
		||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
// you may not use this file except in compliance with the License.
 | 
			
		||||
@@ -62,7 +62,7 @@ func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
 | 
			
		||||
	_, fs := newTestCfg()
 | 
			
		||||
	n := newNewSiteCmd()
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 0777))
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, n.doNewSite(fs, basepath, false))
 | 
			
		||||
}
 | 
			
		||||
@@ -72,7 +72,7 @@ func TestDoNewSite_error_base_exists(t *testing.T) {
 | 
			
		||||
	_, fs := newTestCfg()
 | 
			
		||||
	n := newNewSiteCmd()
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 0777))
 | 
			
		||||
	_, err := fs.Source.Create(filepath.Join(basepath, "foo"))
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	// Since the directory already exists and isn't empty, expect an error
 | 
			
		||||
@@ -85,7 +85,7 @@ func TestDoNewSite_force_empty_dir(t *testing.T) {
 | 
			
		||||
	_, fs := newTestCfg()
 | 
			
		||||
	n := newNewSiteCmd()
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 0777))
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, n.doNewSite(fs, basepath, true))
 | 
			
		||||
 | 
			
		||||
@@ -99,7 +99,7 @@ func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
 | 
			
		||||
 | 
			
		||||
	contentPath := filepath.Join(basepath, "content")
 | 
			
		||||
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(contentPath, 777))
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(contentPath, 0777))
 | 
			
		||||
	require.Error(t, n.doNewSite(fs, basepath, true))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -109,7 +109,7 @@ func TestDoNewSite_error_force_config_inside_exists(t *testing.T) {
 | 
			
		||||
	n := newNewSiteCmd()
 | 
			
		||||
 | 
			
		||||
	configPath := filepath.Join(basepath, "config.toml")
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
 | 
			
		||||
	require.NoError(t, fs.Source.MkdirAll(basepath, 0777))
 | 
			
		||||
	_, err := fs.Source.Create(configPath)
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user