jekyll 3.6.0 → 3.6.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of jekyll might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.rubocop.yml +11 -3
- data/lib/jekyll.rb +2 -2
- data/lib/jekyll/commands/doctor.rb +1 -1
- data/lib/jekyll/commands/serve/servlet.rb +1 -1
- data/lib/jekyll/configuration.rb +0 -1
- data/lib/jekyll/converters/markdown.rb +2 -2
- data/lib/jekyll/converters/markdown/kramdown_parser.rb +2 -0
- data/lib/jekyll/convertible.rb +0 -1
- data/lib/jekyll/document.rb +0 -1
- data/lib/jekyll/drops/collection_drop.rb +0 -1
- data/lib/jekyll/drops/document_drop.rb +0 -1
- data/lib/jekyll/drops/drop.rb +0 -1
- data/lib/jekyll/drops/excerpt_drop.rb +0 -1
- data/lib/jekyll/drops/jekyll_drop.rb +0 -1
- data/lib/jekyll/drops/site_drop.rb +0 -1
- data/lib/jekyll/drops/unified_payload_drop.rb +0 -1
- data/lib/jekyll/drops/url_drop.rb +0 -1
- data/lib/jekyll/reader.rb +1 -2
- data/lib/jekyll/readers/collection_reader.rb +1 -1
- data/lib/jekyll/renderer.rb +0 -1
- data/lib/jekyll/site.rb +7 -8
- data/lib/jekyll/tags/highlight.rb +4 -4
- data/lib/jekyll/tags/include.rb +4 -5
- data/lib/jekyll/tags/link.rb +2 -2
- data/lib/jekyll/tags/post_url.rb +4 -4
- data/lib/jekyll/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: da4a384123184e24eac3e77cca8dfe0ddc86c55c
|
4
|
+
data.tar.gz: 1b50d6473eae20b98d00816f179e1a244463c68f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1521cccd09c634740f50581b5263a437b51df9f2c3d008aa80cea2cc94c3b09968ab9e96b686c50cbe7e9fbc3c92707e18d5c0525f2a5a6553912d9da6b2e2de
|
7
|
+
data.tar.gz: 7df670b70cb204ad179f07e111c707f365fae94d9ff3ae14b5bf4daa820fc84e70f99281a9e153a74829890e6eafb9ad7e4b4d422f7c4123b0cc88d3cc06e988
|
data/.rubocop.yml
CHANGED
@@ -21,7 +21,7 @@ Layout/EmptyLinesAroundAccessModifier:
|
|
21
21
|
Layout/EmptyLinesAroundModuleBody:
|
22
22
|
Enabled: false
|
23
23
|
Layout/EndOfLine:
|
24
|
-
EnforcedStyle:
|
24
|
+
EnforcedStyle: native
|
25
25
|
Layout/ExtraSpacing:
|
26
26
|
AllowForAlignment: true
|
27
27
|
Layout/FirstParameterIndentation:
|
@@ -44,10 +44,14 @@ Layout/SpaceInsideBrackets:
|
|
44
44
|
Enabled: false
|
45
45
|
Lint/EndAlignment:
|
46
46
|
Severity: error
|
47
|
+
Lint/RescueWithoutErrorClass:
|
48
|
+
Enabled: false
|
47
49
|
Lint/UnreachableCode:
|
48
50
|
Severity: error
|
49
51
|
Lint/UselessAccessModifier:
|
50
52
|
Enabled: false
|
53
|
+
Lint/Void:
|
54
|
+
Enabled: false
|
51
55
|
Metrics/AbcSize:
|
52
56
|
Max: 21
|
53
57
|
Metrics/BlockLength:
|
@@ -82,6 +86,10 @@ Metrics/ParameterLists:
|
|
82
86
|
Max: 4
|
83
87
|
Metrics/PerceivedComplexity:
|
84
88
|
Max: 8
|
89
|
+
Naming/FileName:
|
90
|
+
Enabled: false
|
91
|
+
Naming/HeredocDelimiterNaming:
|
92
|
+
Enabled: false
|
85
93
|
Security/MarshalLoad:
|
86
94
|
Exclude:
|
87
95
|
- !ruby/regexp /test\/.*.rb$/
|
@@ -109,8 +117,8 @@ Style/Documentation:
|
|
109
117
|
- !ruby/regexp /features\/.*.rb$/
|
110
118
|
Style/DoubleNegation:
|
111
119
|
Enabled: false
|
112
|
-
Style/
|
113
|
-
|
120
|
+
Style/Encoding:
|
121
|
+
EnforcedStyle: when_needed
|
114
122
|
Style/GuardClause:
|
115
123
|
Enabled: false
|
116
124
|
Style/HashSyntax:
|
data/lib/jekyll.rb
CHANGED
@@ -119,7 +119,7 @@ module Jekyll
|
|
119
119
|
# timezone - the IANA Time Zone
|
120
120
|
#
|
121
121
|
# Returns nothing
|
122
|
-
# rubocop:disable
|
122
|
+
# rubocop:disable Naming/AccessorMethodName
|
123
123
|
def set_timezone(timezone)
|
124
124
|
ENV["TZ"] = if Utils::Platforms.really_windows?
|
125
125
|
Utils::WinTZ.calculate(timezone)
|
@@ -127,7 +127,7 @@ module Jekyll
|
|
127
127
|
timezone
|
128
128
|
end
|
129
129
|
end
|
130
|
-
# rubocop:enable
|
130
|
+
# rubocop:enable Naming/AccessorMethodName
|
131
131
|
|
132
132
|
# Public: Fetch the logger instance for this Jekyll process.
|
133
133
|
#
|
@@ -86,7 +86,7 @@ module Jekyll
|
|
86
86
|
def urls_only_differ_by_case(site)
|
87
87
|
urls_only_differ_by_case = false
|
88
88
|
urls = case_insensitive_urls(site.pages + site.docs_to_write, site.dest)
|
89
|
-
urls.
|
89
|
+
urls.each_value do |real_urls|
|
90
90
|
next unless real_urls.uniq.size > 1
|
91
91
|
urls_only_differ_by_case = true
|
92
92
|
Jekyll.logger.warn "Warning:", "The following URLs only differ" \
|
data/lib/jekyll/configuration.rb
CHANGED
@@ -27,7 +27,7 @@ module Jekyll
|
|
27
27
|
# Rubocop does not allow reader methods to have names starting with `get_`
|
28
28
|
# To ensure compatibility, this check has been disabled on this method
|
29
29
|
#
|
30
|
-
# rubocop:disable
|
30
|
+
# rubocop:disable Naming/AccessorMethodName
|
31
31
|
def get_processor
|
32
32
|
case @config["markdown"].downcase
|
33
33
|
when "redcarpet" then return RedcarpetParser.new(@config)
|
@@ -37,7 +37,7 @@ module Jekyll
|
|
37
37
|
custom_processor
|
38
38
|
end
|
39
39
|
end
|
40
|
-
# rubocop:enable
|
40
|
+
# rubocop:enable Naming/AccessorMethodName
|
41
41
|
|
42
42
|
# Public: Provides you with a list of processors, the ones we
|
43
43
|
# support internally and the ones that you have provided to us (if you
|
@@ -42,12 +42,14 @@ module Jekyll
|
|
42
42
|
end
|
43
43
|
|
44
44
|
private
|
45
|
+
# rubocop:disable Performance/HashEachMethods
|
45
46
|
def make_accessible(hash = @config)
|
46
47
|
hash.keys.each do |key|
|
47
48
|
hash[key.to_sym] = hash[key]
|
48
49
|
make_accessible(hash[key]) if hash[key].is_a?(Hash)
|
49
50
|
end
|
50
51
|
end
|
52
|
+
# rubocop:enable Performance/HashEachMethods
|
51
53
|
|
52
54
|
# config[kramdown][syntax_higlighter] >
|
53
55
|
# config[kramdown][enable_coderay] >
|
data/lib/jekyll/convertible.rb
CHANGED
data/lib/jekyll/document.rb
CHANGED
data/lib/jekyll/drops/drop.rb
CHANGED
data/lib/jekyll/reader.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: UTF-8
|
2
1
|
# frozen_string_literal: true
|
3
2
|
|
4
3
|
require "csv"
|
@@ -25,7 +24,7 @@ module Jekyll
|
|
25
24
|
|
26
25
|
# Sorts posts, pages, and static files.
|
27
26
|
def sort_files!
|
28
|
-
site.collections.
|
27
|
+
site.collections.each_value { |c| c.docs.sort! }
|
29
28
|
site.pages.sort_by!(&:name)
|
30
29
|
site.static_files.sort_by!(&:relative_path)
|
31
30
|
end
|
data/lib/jekyll/renderer.rb
CHANGED
data/lib/jekyll/site.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: UTF-8
|
2
1
|
# frozen_string_literal: true
|
3
2
|
|
4
3
|
require "csv"
|
@@ -85,11 +84,11 @@ module Jekyll
|
|
85
84
|
#
|
86
85
|
# Returns nothing
|
87
86
|
def reset
|
88
|
-
if config["time"]
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
87
|
+
self.time = if config["time"]
|
88
|
+
Utils.parse_date(config["time"].to_s, "Invalid time in _config.yml.")
|
89
|
+
else
|
90
|
+
Time.now
|
91
|
+
end
|
93
92
|
self.layouts = {}
|
94
93
|
self.pages = []
|
95
94
|
self.static_files = []
|
@@ -238,7 +237,7 @@ module Jekyll
|
|
238
237
|
posts.docs.each do |p|
|
239
238
|
p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr]
|
240
239
|
end
|
241
|
-
hash.
|
240
|
+
hash.each_value { |posts| posts.sort!.reverse! }
|
242
241
|
hash
|
243
242
|
end
|
244
243
|
|
@@ -449,7 +448,7 @@ module Jekyll
|
|
449
448
|
|
450
449
|
private
|
451
450
|
def render_docs(payload)
|
452
|
-
collections.
|
451
|
+
collections.each_value do |collection|
|
453
452
|
collection.docs.each do |document|
|
454
453
|
if regenerator.regenerate?(document)
|
455
454
|
document.output = Jekyll::Renderer.new(self, document, payload).run
|
@@ -18,13 +18,13 @@ module Jekyll
|
|
18
18
|
@lang = Regexp.last_match(1).downcase
|
19
19
|
@highlight_options = parse_options(Regexp.last_match(2))
|
20
20
|
else
|
21
|
-
raise SyntaxError, <<-
|
21
|
+
raise SyntaxError, <<-MSG
|
22
22
|
Syntax Error in tag 'highlight' while parsing the following markup:
|
23
23
|
|
24
24
|
#{markup}
|
25
25
|
|
26
26
|
Valid syntax: highlight <lang> [linenos]
|
27
|
-
|
27
|
+
MSG
|
28
28
|
end
|
29
29
|
end
|
30
30
|
|
@@ -95,14 +95,14 @@ eos
|
|
95
95
|
)
|
96
96
|
|
97
97
|
if highlighted_code.nil?
|
98
|
-
Jekyll.logger.error
|
98
|
+
Jekyll.logger.error <<-MSG
|
99
99
|
There was an error highlighting your code:
|
100
100
|
|
101
101
|
#{code}
|
102
102
|
|
103
103
|
While attempting to convert the above code, Pygments.rb returned an unacceptable value.
|
104
104
|
This is usually a timeout problem solved by running `jekyll build` again.
|
105
|
-
|
105
|
+
MSG
|
106
106
|
raise ArgumentError, "Pygments.rb returned an unacceptable value "\
|
107
107
|
"when attempting to highlight some code."
|
108
108
|
end
|
data/lib/jekyll/tags/include.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: UTF-8
|
2
1
|
# frozen_string_literal: true
|
3
2
|
|
4
3
|
module Jekyll
|
@@ -61,7 +60,7 @@ module Jekyll
|
|
61
60
|
|
62
61
|
def validate_file_name(file)
|
63
62
|
if file !~ %r!^[a-zA-Z0-9_/\.-]+$! || file =~ %r!\./! || file =~ %r!/\.!
|
64
|
-
raise ArgumentError, <<-
|
63
|
+
raise ArgumentError, <<-MSG
|
65
64
|
Invalid syntax for include tag. File contains invalid characters or sequences:
|
66
65
|
|
67
66
|
#{file}
|
@@ -70,14 +69,14 @@ Valid syntax:
|
|
70
69
|
|
71
70
|
#{syntax_example}
|
72
71
|
|
73
|
-
|
72
|
+
MSG
|
74
73
|
end
|
75
74
|
end
|
76
75
|
|
77
76
|
def validate_params
|
78
77
|
full_valid_syntax = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!
|
79
78
|
unless @params =~ full_valid_syntax
|
80
|
-
raise ArgumentError, <<-
|
79
|
+
raise ArgumentError, <<-MSG
|
81
80
|
Invalid syntax for include tag:
|
82
81
|
|
83
82
|
#{@params}
|
@@ -86,7 +85,7 @@ Valid syntax:
|
|
86
85
|
|
87
86
|
#{syntax_example}
|
88
87
|
|
89
|
-
|
88
|
+
MSG
|
90
89
|
end
|
91
90
|
end
|
92
91
|
|
data/lib/jekyll/tags/link.rb
CHANGED
@@ -24,11 +24,11 @@ module Jekyll
|
|
24
24
|
return item.url if item.relative_path == "/#{@relative_path}"
|
25
25
|
end
|
26
26
|
|
27
|
-
raise ArgumentError,
|
27
|
+
raise ArgumentError, <<-MSG
|
28
28
|
Could not find document '#{@relative_path}' in tag '#{self.class.tag_name}'.
|
29
29
|
|
30
30
|
Make sure the document exists and the path is correct.
|
31
|
-
|
31
|
+
MSG
|
32
32
|
end
|
33
33
|
end
|
34
34
|
end
|
data/lib/jekyll/tags/post_url.rb
CHANGED
@@ -60,13 +60,13 @@ module Jekyll
|
|
60
60
|
begin
|
61
61
|
@post = PostComparer.new(@orig_post)
|
62
62
|
rescue => e
|
63
|
-
raise Jekyll::Errors::PostURLError, <<-
|
63
|
+
raise Jekyll::Errors::PostURLError, <<-MSG
|
64
64
|
Could not parse name of post "#{@orig_post}" in tag 'post_url'.
|
65
65
|
|
66
66
|
Make sure the post exists and the name is correct.
|
67
67
|
|
68
68
|
#{e.class}: #{e.message}
|
69
|
-
|
69
|
+
MSG
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
@@ -90,11 +90,11 @@ eos
|
|
90
90
|
return p.url
|
91
91
|
end
|
92
92
|
|
93
|
-
raise Jekyll::Errors::PostURLError, <<-
|
93
|
+
raise Jekyll::Errors::PostURLError, <<-MSG
|
94
94
|
Could not find post "#{@orig_post}" in tag 'post_url'.
|
95
95
|
|
96
96
|
Make sure the post exists and the name is correct.
|
97
|
-
|
97
|
+
MSG
|
98
98
|
end
|
99
99
|
end
|
100
100
|
end
|
data/lib/jekyll/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.6.
|
4
|
+
version: 3.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tom Preston-Werner
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-10-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: addressable
|
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
290
290
|
version: '0'
|
291
291
|
requirements: []
|
292
292
|
rubyforge_project:
|
293
|
-
rubygems_version: 2.6.
|
293
|
+
rubygems_version: 2.6.8
|
294
294
|
signing_key:
|
295
295
|
specification_version: 2
|
296
296
|
summary: A simple, blog aware, static site generator.
|