jekyll-pug 1.5.6 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/jekyll-pug/include-tag.rb +78 -77
- data/lib/jekyll-pug/pug-renderer.rb +147 -134
- data/lib/jekyll-pug.rb +25 -25
- metadata +8 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e09124e6ff118649c9772507b49295fb8f4075729dacd5065b4c058adca265b2
|
|
4
|
+
data.tar.gz: ffccc469ca7a1714c8c9ef67886cd25a367ef6a4f5f2cb59cf65e2af0c96de6d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a420aa825a119b99228d5584c69c196c1658098bf65e65a4906ee3f519b8faeef71553def6a06ec5738292add14d5448e1771e5941670a6b145a4654e10466ae
|
|
7
|
+
data.tar.gz: 758bbc089b3d698e529037b1d39e88355a7e16a9e9f0f42f8803d38086e47f32c1cfac43f1d3ad697ab60b05010b94062e1e2d1716d838836e14272ccc298cd7
|
|
@@ -1,91 +1,92 @@
|
|
|
1
1
|
require 'pug-ruby'
|
|
2
2
|
|
|
3
3
|
module Jekyll
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
# Render the variable if required
|
|
28
|
-
def render_variable(context)
|
|
29
|
-
if @file.match(VARIABLE_SYNTAX)
|
|
30
|
-
partial = context.registers[:site]
|
|
31
|
-
.liquid_renderer
|
|
32
|
-
.file("(variable)")
|
|
33
|
-
.parse(@file)
|
|
34
|
-
partial.render!(context)
|
|
35
|
-
end
|
|
36
|
-
end
|
|
4
|
+
module Tags
|
|
5
|
+
class JekyllPug_IncludeTag < IncludeTag
|
|
6
|
+
def initialize(tag_name, markup, tokens)
|
|
7
|
+
super
|
|
8
|
+
matched = markup.strip.match(VARIABLE_SYNTAX)
|
|
9
|
+
if matched
|
|
10
|
+
@file = matched["variable"].strip
|
|
11
|
+
@params = matched["params"].strip
|
|
12
|
+
else
|
|
13
|
+
@file, @params = markup.strip.split(%r!\s+!, 2)
|
|
14
|
+
end
|
|
15
|
+
# If file does not have an extension...
|
|
16
|
+
if @file !~ /\.\w+$/
|
|
17
|
+
# ...add a .pug
|
|
18
|
+
# "navigation" -> "navigation.pug"
|
|
19
|
+
@file = @file + ".pug"
|
|
20
|
+
@isPug = true
|
|
21
|
+
else
|
|
22
|
+
@isPug = false
|
|
23
|
+
end
|
|
24
|
+
validate_params if @params
|
|
25
|
+
@tag_name = tag_name
|
|
26
|
+
end
|
|
37
27
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
28
|
+
# Render the variable if required
|
|
29
|
+
def render_variable(context)
|
|
30
|
+
if @file.match(VARIABLE_SYNTAX)
|
|
31
|
+
partial = context.registers[:site]
|
|
32
|
+
.liquid_renderer
|
|
33
|
+
.file("(variable)")
|
|
34
|
+
.parse(@file)
|
|
35
|
+
partial.render!(context)
|
|
36
|
+
end
|
|
37
|
+
end
|
|
48
38
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
39
|
+
def locate_include_file(context, file, safe)
|
|
40
|
+
includes_dirs = tag_includes_dirs(context)
|
|
41
|
+
includes_dirs.each do |dir|
|
|
42
|
+
path = File.join(dir.to_s, file.to_s)
|
|
43
|
+
return path if valid_include_file?(path, dir.to_s, safe)
|
|
44
|
+
end
|
|
45
|
+
raise IOError, "Could not locate the included file '#{file}' in any of "\
|
|
46
|
+
"#{includes_dirs}. Ensure it exists in one of those directories and, "\
|
|
47
|
+
"if it is a symlink, does not point outside your site source."
|
|
48
|
+
end
|
|
53
49
|
|
|
54
|
-
|
|
55
|
-
|
|
50
|
+
def render(context)
|
|
51
|
+
site = context.registers[:site]
|
|
52
|
+
file = render_variable(context) || @file
|
|
53
|
+
validate_file_name(file)
|
|
56
54
|
|
|
55
|
+
path = locate_include_file(context, file, site.safe)
|
|
56
|
+
return unless path
|
|
57
57
|
|
|
58
|
-
add_include_to_dependency(site, path, context)
|
|
59
58
|
|
|
60
|
-
|
|
61
|
-
context.stack do
|
|
62
|
-
context["include"] = parse_params(context) if @params
|
|
63
|
-
begin
|
|
64
|
-
partial.render!(context)
|
|
65
|
-
rescue Liquid::Error => e
|
|
66
|
-
e.template_name = path
|
|
67
|
-
e.markup_context = "included " if e.markup_context.nil?
|
|
68
|
-
raise e
|
|
69
|
-
end
|
|
70
|
-
end
|
|
71
|
-
end
|
|
72
|
-
end
|
|
59
|
+
add_include_to_dependency(site, path, context)
|
|
73
60
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
61
|
+
partial = load_cached_partial(path, context)
|
|
62
|
+
context.stack do
|
|
63
|
+
context["include"] = parse_params(context) if @params
|
|
64
|
+
begin
|
|
65
|
+
partial.render!(context)
|
|
66
|
+
rescue Liquid::Error => e
|
|
67
|
+
e.template_name = path
|
|
68
|
+
e.markup_context = "included " if e.markup_context.nil?
|
|
69
|
+
raise e
|
|
70
|
+
end
|
|
71
|
+
end
|
|
72
|
+
end
|
|
73
|
+
end
|
|
78
74
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
75
|
+
class JekyllPug_IncludeRelativeTag < IncludeTag
|
|
76
|
+
def tag_includes_dirs(context)
|
|
77
|
+
Array(page_path(context)).freeze
|
|
78
|
+
end
|
|
79
|
+
|
|
80
|
+
def page_path(context)
|
|
81
|
+
if context.registers[:page].nil?
|
|
82
|
+
context.registers[:site].source
|
|
83
|
+
else
|
|
84
|
+
current_doc_dir = File.dirname(context.registers[:page]["path"])
|
|
85
|
+
context.registers[:site].in_source_dir current_doc_dir
|
|
86
|
+
end
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
end
|
|
89
90
|
end
|
|
90
91
|
|
|
91
92
|
Liquid::Template.register_tag("include", Jekyll::Tags::JekyllPug_IncludeTag)
|
|
@@ -1,160 +1,173 @@
|
|
|
1
1
|
# # # # # # # # # # # #
|
|
2
2
|
# Jekyll-Pug-Renderer #
|
|
3
|
-
# # # # # # # # # # # #
|
|
3
|
+
# # # # # # # # # # # #
|
|
4
4
|
|
|
5
5
|
# Simple function= to print data if debug is true.
|
|
6
6
|
|
|
7
7
|
$jekyll_pug_curFile = ""
|
|
8
8
|
|
|
9
|
+
# Print a debug message
|
|
9
10
|
def jp(string)
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
if $jekyllConfig['jekyll-pug']
|
|
12
|
+
if $jekyllConfig['jekyll-pug']['debug']
|
|
13
|
+
puts "[Jekyll-Pug] " + $jekyll_pug_curFile.to_s + " " + string.to_s
|
|
14
|
+
end
|
|
15
|
+
end
|
|
15
16
|
end
|
|
16
17
|
|
|
18
|
+
# Print a debug message in a fancy way
|
|
17
19
|
def announce(string)
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
if $jekyllConfig['jekyll-pug']
|
|
21
|
+
if $jekyllConfig['jekyll-pug']['debug']
|
|
22
|
+
puts ""
|
|
23
|
+
puts "############################"
|
|
24
|
+
puts "# " + string.to_s
|
|
25
|
+
puts "############################"
|
|
26
|
+
end
|
|
27
|
+
end
|
|
26
28
|
end
|
|
27
29
|
|
|
28
30
|
def create_cache_and_compile(content, cached_file)
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
pug_raw = content
|
|
32
|
+
jp("Compiling.....")
|
|
33
|
+
content = Pug.compile(content, {"filename"=>$PUG_INCLUDES})
|
|
34
|
+
::File.write(cached_file, pug_raw)
|
|
35
|
+
::File.write(cached_file+".html", content)
|
|
36
|
+
return content
|
|
35
37
|
end
|
|
36
38
|
|
|
37
39
|
def create_cache(content, cached_file)
|
|
38
|
-
|
|
40
|
+
::File.write(cached_file, content)
|
|
39
41
|
end
|
|
40
42
|
|
|
41
43
|
module Jekyll
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
# Creating Cache Variables
|
|
52
|
-
cache_dir = ".pug-cache/"
|
|
53
|
-
cached_file = cache_dir + @filename
|
|
54
|
-
cached_file_dir = cached_file.sub(filename_regex, '')
|
|
55
|
-
|
|
56
|
-
# Creating cache directory neccesary (if needed)
|
|
57
|
-
FileUtils.mkdir_p(cached_file_dir) unless ::File.exists?(cached_file_dir)
|
|
58
|
-
|
|
59
|
-
# Loop through Pug includes to determine if any had been modified
|
|
60
|
-
jp("Checking the Pug includes of " + @filename)
|
|
61
|
-
pugIncludeChange = false
|
|
62
|
-
includes_in_file = content.scan(/^\s+include\s[a-zA-Z1-9\/\_\-\.]+/)
|
|
63
|
-
for i in includes_in_file do
|
|
64
|
-
# Remove spaces/tabs in front of code
|
|
65
|
-
include_file = i.sub(/^\s+/, '')
|
|
66
|
-
# Remove include statement to be left with filename
|
|
67
|
-
include_file = include_file.sub(/include\s/, '')
|
|
68
|
-
# If no extension provided, add one
|
|
69
|
-
if include_file.scan(/\.\w+/).length == 0
|
|
70
|
-
include_file = include_file + ".pug"
|
|
71
|
-
end
|
|
72
|
-
jp(" Checking the include " + include_file)
|
|
73
|
-
# Make the include file into an exact path into the user's project
|
|
74
|
-
include_file = $JEKYLLPUG_PROJECT_INCLUDES + "/" + include_file
|
|
75
|
-
# Create the cached location of the include file and its path
|
|
76
|
-
include_cache_file = ".pug-cache/" + include_file.sub(/#{$JEKYLLPUG_PROJECT_SOURCE}/, '')
|
|
77
|
-
include_cache_file_dir = include_cache_file.sub(filename_regex, '')
|
|
78
|
-
# Make a cache folder for this include if not already created
|
|
79
|
-
FileUtils.mkdir_p(include_cache_file_dir) unless ::File.exists?(include_cache_file_dir)
|
|
80
|
-
|
|
81
|
-
# Read the file of the include
|
|
82
|
-
include_content = ::File.read(include_file)
|
|
83
|
-
|
|
84
|
-
# If cached version of include exists
|
|
85
|
-
if ::File.file?(include_cache_file)
|
|
86
|
-
jp(" Cached file of include exists. Checking if modified...")
|
|
87
|
-
cached_include_content = ::File.read(include_cache_file)
|
|
88
|
-
if include_content == cached_include_content
|
|
89
|
-
jp(" The include is identical to the cache. Not recompiling")
|
|
90
|
-
else
|
|
91
|
-
jp(" There has been a change in an include")
|
|
92
|
-
pugIncludeChange = true
|
|
93
|
-
end
|
|
94
|
-
else
|
|
95
|
-
jp(" Cached file of include does not exist. Creating cache file for include...")
|
|
96
|
-
pugIncludeChange = true
|
|
97
|
-
create_cache(include_content, include_cache_file)
|
|
98
|
-
end
|
|
99
|
-
end
|
|
100
|
-
|
|
101
|
-
# If cached pug file exists
|
|
102
|
-
if ::File.file?(cached_file)
|
|
103
|
-
jp("Cached file of " + @filename + " exists! Attempting to use it...")
|
|
104
|
-
cached_file_content = ::File.read(cached_file)
|
|
105
|
-
|
|
106
|
-
# Check if Pug includes have changed.
|
|
107
|
-
# If Pug includes changed, we must recompile
|
|
108
|
-
|
|
109
|
-
# If files are identical
|
|
110
|
-
if content == cached_file_content and not pugIncludeChange
|
|
111
|
-
jp("Cached file of " + @filename + " is identical and includes haven't changed. Using Cached file")
|
|
112
|
-
# If there is a cached HTML file availible
|
|
113
|
-
cached_html_filename = cached_file + ".html"
|
|
114
|
-
if ::File.file?(cached_html_filename)
|
|
115
|
-
content = ::File.read(cached_html_filename)
|
|
116
|
-
else
|
|
117
|
-
jp("The HTML cached file of " + @filename + " does not exist. Can't use cache file right now. Creating it instead.")
|
|
118
|
-
content = create_cache_and_compile(content, cached_file)
|
|
119
|
-
end
|
|
120
|
-
# If not identical (There has been a change)
|
|
121
|
-
else
|
|
122
|
-
jp("There has been a change since last cache. Re-Caching " + @filename + "...")
|
|
123
|
-
content = create_cache_and_compile(content, cached_file)
|
|
124
|
-
end
|
|
125
|
-
else
|
|
126
|
-
jp("No cached file for " + @filename + " availible. Creating one...")
|
|
127
|
-
content = create_cache_and_compile(content, cached_file)
|
|
128
|
-
end
|
|
129
|
-
|
|
130
|
-
end
|
|
131
|
-
if content.lines.first =~ /^$/
|
|
132
|
-
content = content.sub(/^$\n/, "")
|
|
133
|
-
end
|
|
134
|
-
measure_time do
|
|
135
|
-
@template = Liquid::Template.parse(content, :line_numbers => true)
|
|
136
|
-
end
|
|
137
|
-
end
|
|
138
|
-
end
|
|
44
|
+
Convertible.class_eval do
|
|
45
|
+
alias_method :super_render_with_liquid?, :render_with_liquid?
|
|
46
|
+
def render_with_liquid?
|
|
47
|
+
if ext == '.pug'
|
|
48
|
+
return true
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
return super_render_with_liquid?
|
|
139
52
|
end
|
|
53
|
+
end
|
|
140
54
|
end
|
|
141
55
|
|
|
142
|
-
# This section ensures that Pug files are compiled as HTML or PHP.
|
|
143
56
|
module Jekyll
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
57
|
+
class LiquidRenderer
|
|
58
|
+
File.class_eval do
|
|
59
|
+
alias_method :super_parse, :parse
|
|
60
|
+
def parse(content)
|
|
61
|
+
if @filename =~ /\.pug$/
|
|
62
|
+
filename_regex = /[a-zA-Z1-9\s\~\-\.\_\%\#\&\*\{\}\:\?\+\|\<\>\"\']+.\w+$/
|
|
63
|
+
|
|
64
|
+
$jekyll_pug_curFile = @filename.match(filename_regex)
|
|
65
|
+
announce("Processing " + @filename)
|
|
66
|
+
|
|
67
|
+
# Creating Cache Variables
|
|
68
|
+
cache_dir = ".pug-cache/"
|
|
69
|
+
cached_file = cache_dir + @filename
|
|
70
|
+
cached_file_dir = cached_file.sub(filename_regex, '')
|
|
71
|
+
|
|
72
|
+
# Creating cache directory neccesary (if needed)
|
|
73
|
+
FileUtils.mkdir_p(cached_file_dir) unless ::File.exists?(cached_file_dir)
|
|
74
|
+
|
|
75
|
+
# Loop through Pug includes to determine if any had been modified
|
|
76
|
+
jp("Checking the Pug includes of " + @filename)
|
|
77
|
+
pugIncludeChange = false
|
|
78
|
+
includes_in_file = content.scan(/^\s+include\s[a-zA-Z1-9\/\_\-\.]+/)
|
|
79
|
+
for i in includes_in_file do
|
|
80
|
+
# Remove spaces/tabs in front of code
|
|
81
|
+
include_file = i.sub(/^\s+/, '')
|
|
82
|
+
# Remove include statement to be left with filename
|
|
83
|
+
include_file = include_file.sub(/include\s/, '')
|
|
84
|
+
# If no extension provided, add one
|
|
85
|
+
if include_file.scan(/\.\w+/).length == 0
|
|
86
|
+
include_file = include_file + ".pug"
|
|
87
|
+
end
|
|
88
|
+
jp(" Checking the include " + include_file)
|
|
89
|
+
# Make the include file into an exact path into the user's project
|
|
90
|
+
include_file = $JEKYLLPUG_PROJECT_INCLUDES + "/" + include_file
|
|
91
|
+
# Create the cached location of the include file and its path
|
|
92
|
+
include_cache_file = ".pug-cache/" + include_file.sub(/#{$JEKYLLPUG_PROJECT_SOURCE}/, '')
|
|
93
|
+
include_cache_file_dir = include_cache_file.sub(filename_regex, '')
|
|
94
|
+
# Make a cache folder for this include if not already created
|
|
95
|
+
FileUtils.mkdir_p(include_cache_file_dir) unless ::File.exists?(include_cache_file_dir)
|
|
96
|
+
|
|
97
|
+
# Read the file of the include
|
|
98
|
+
include_content = ::File.read(include_file)
|
|
99
|
+
|
|
100
|
+
# If cached version of include exists
|
|
101
|
+
if ::File.file?(include_cache_file)
|
|
102
|
+
jp(" Cached file of include exists. Checking if modified...")
|
|
103
|
+
cached_include_content = ::File.read(include_cache_file)
|
|
104
|
+
if include_content == cached_include_content
|
|
105
|
+
jp(" The include is identical to the cache. Not recompiling")
|
|
106
|
+
else
|
|
107
|
+
jp(" There has been a change in an include")
|
|
108
|
+
pugIncludeChange = true
|
|
109
|
+
end
|
|
110
|
+
else
|
|
111
|
+
jp(" Cached file of include does not exist. Creating cache file for include...")
|
|
112
|
+
pugIncludeChange = true
|
|
113
|
+
create_cache(include_content, include_cache_file)
|
|
114
|
+
end
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
# If cached pug file exists
|
|
118
|
+
if ::File.file?(cached_file)
|
|
119
|
+
jp("Cached file of " + @filename + " exists! Attempting to use it...")
|
|
120
|
+
cached_file_content = ::File.read(cached_file)
|
|
121
|
+
|
|
122
|
+
# Check if Pug includes have changed.
|
|
123
|
+
# If Pug includes changed, we must recompile
|
|
124
|
+
|
|
125
|
+
# If files are identical
|
|
126
|
+
if content == cached_file_content and not pugIncludeChange
|
|
127
|
+
jp("Cached file of " + @filename + " is identical and includes haven't changed. Using Cached file")
|
|
128
|
+
# If there is a cached HTML file availible
|
|
129
|
+
cached_html_filename = cached_file + ".html"
|
|
130
|
+
if ::File.file?(cached_html_filename)
|
|
131
|
+
content = ::File.read(cached_html_filename)
|
|
132
|
+
else
|
|
133
|
+
jp("The HTML cached file of " + @filename + " does not exist. Can't use cache file right now. Creating it instead.")
|
|
134
|
+
content = create_cache_and_compile(content, cached_file)
|
|
135
|
+
end
|
|
136
|
+
# If not identical (There has been a change)
|
|
137
|
+
else
|
|
138
|
+
jp("There has been a change since last cache. Re-Caching " + @filename + "...")
|
|
139
|
+
content = create_cache_and_compile(content, cached_file)
|
|
140
|
+
end
|
|
141
|
+
else
|
|
142
|
+
jp("No cached file for " + @filename + " availible. Creating one...")
|
|
143
|
+
content = create_cache_and_compile(content, cached_file)
|
|
144
|
+
end
|
|
145
|
+
end
|
|
146
|
+
|
|
147
|
+
# if Jekyll::Utils.has_liquid_construct?(content)
|
|
148
|
+
super_parse(content)
|
|
149
|
+
# end
|
|
150
|
+
end
|
|
151
|
+
end
|
|
152
|
+
end
|
|
153
|
+
end
|
|
155
154
|
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
155
|
+
# This section ensures that Pug files are compiled as HTML or PHP.
|
|
156
|
+
module Jekyll
|
|
157
|
+
class PugConverter < Converter
|
|
158
|
+
safe true
|
|
159
|
+
priority :low
|
|
160
|
+
|
|
161
|
+
def matches(ext)
|
|
162
|
+
ext =~ /^\.pug$/i
|
|
163
|
+
end
|
|
164
|
+
|
|
165
|
+
def output_ext(ext)
|
|
166
|
+
$CompileFormat
|
|
167
|
+
end
|
|
168
|
+
|
|
169
|
+
def convert(content)
|
|
170
|
+
return content
|
|
171
|
+
end
|
|
172
|
+
end
|
|
160
173
|
end
|
data/lib/jekyll-pug.rb
CHANGED
|
@@ -8,28 +8,28 @@ $jekyllConfig = Jekyll.configuration({})
|
|
|
8
8
|
$CompileFormat = '.html'
|
|
9
9
|
|
|
10
10
|
if $jekyllConfig['jekyll-pug']
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
11
|
+
if $jekyllConfig['jekyll-pug']['minify']
|
|
12
|
+
# Minify is enabled - pretty disabled
|
|
13
|
+
Pug.config.pretty = false
|
|
14
|
+
else
|
|
15
|
+
# Minify is disabled - pretty enabled
|
|
16
|
+
Pug.config.pretty = true
|
|
17
|
+
end
|
|
18
|
+
if $jekyllConfig['jekyll-pug']['php']
|
|
19
|
+
$CompileFormat = '.php'
|
|
20
|
+
end
|
|
21
|
+
if $jekyllConfig['jekyll-pug']['shipped_version']
|
|
22
|
+
# Minify is enabled - pretty disabled
|
|
23
|
+
Pug.use $jekyllConfig['jekyll-pug']['shipped_version']
|
|
24
|
+
puts "Using shipped Pug version: " + Pug.compiler.version.to_s
|
|
25
|
+
else
|
|
26
|
+
# Minify is disabled - pretty enabled
|
|
27
|
+
puts "Using system Pug version: " + Pug.compiler.version.to_s
|
|
28
|
+
Pug.use :system
|
|
29
|
+
end
|
|
30
30
|
else
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
# Enable pretty by default
|
|
32
|
+
Pug.config.pretty = true
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
# Detect theme/source
|
|
@@ -38,18 +38,18 @@ jekyll_source = $jekyllConfig['source']
|
|
|
38
38
|
|
|
39
39
|
config_source = "" # third condition: no `source:`
|
|
40
40
|
if jekyll_theme
|
|
41
|
-
|
|
41
|
+
config_source = Jekyll::Theme.new(jekyll_theme).root
|
|
42
42
|
elsif jekyll_source
|
|
43
|
-
|
|
43
|
+
config_source = jekyll_source
|
|
44
44
|
end
|
|
45
45
|
|
|
46
|
-
dir
|
|
46
|
+
dir = Dir.pwd
|
|
47
47
|
|
|
48
48
|
# Theme should use absolute path
|
|
49
49
|
$JEKYLLPUG_PROJECT_SOURCE_ABS = config_source
|
|
50
50
|
$JEKYLLPUG_PROJECT_SOURCE = jekyll_theme ? config_source : config_source.sub(/#{dir}/, '')
|
|
51
51
|
$JEKYLLPUG_PROJECT_INCLUDES = File.join($JEKYLLPUG_PROJECT_SOURCE, '_includes/.')
|
|
52
|
-
|
|
52
|
+
.sub(/\/\.$/, '')
|
|
53
53
|
$JEKYLLPUG_PROJECT_INCLUDES = $JEKYLLPUG_PROJECT_INCLUDES.sub(/^\//, '') unless jekyll_theme
|
|
54
54
|
|
|
55
55
|
$PUG_INCLUDES = File.join(config_source, '_includes/.')
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: jekyll-pug
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.6.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Doug Beney
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2022-07-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: jekyll
|
|
@@ -46,7 +46,7 @@ dependencies:
|
|
|
46
46
|
version: '2.0'
|
|
47
47
|
description: Flawlessly use Pug with Jekyll to convert Pug files into HTML
|
|
48
48
|
email:
|
|
49
|
-
-
|
|
49
|
+
- jekyll-pug@dougie.io
|
|
50
50
|
executables: []
|
|
51
51
|
extensions: []
|
|
52
52
|
extra_rdoc_files: []
|
|
@@ -54,11 +54,11 @@ files:
|
|
|
54
54
|
- lib/jekyll-pug.rb
|
|
55
55
|
- lib/jekyll-pug/include-tag.rb
|
|
56
56
|
- lib/jekyll-pug/pug-renderer.rb
|
|
57
|
-
homepage: http://jekyll-pug.dougie.io
|
|
57
|
+
homepage: http://jekyll-pug.dougie.io
|
|
58
58
|
licenses:
|
|
59
59
|
- MIT
|
|
60
60
|
metadata: {}
|
|
61
|
-
post_install_message:
|
|
61
|
+
post_install_message:
|
|
62
62
|
rdoc_options: []
|
|
63
63
|
require_paths:
|
|
64
64
|
- lib
|
|
@@ -73,9 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
73
73
|
- !ruby/object:Gem::Version
|
|
74
74
|
version: '0'
|
|
75
75
|
requirements: []
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
signing_key:
|
|
76
|
+
rubygems_version: 3.3.15
|
|
77
|
+
signing_key:
|
|
79
78
|
specification_version: 4
|
|
80
79
|
summary: Use Pug with Jekyll.
|
|
81
80
|
test_files: []
|